Commit 35bae294 authored by 高建强's avatar 高建强

item:iot参数同步修改

parent bd2d3fb2
...@@ -44,6 +44,7 @@ public interface IotFeign { ...@@ -44,6 +44,7 @@ public interface IotFeign {
@RequestHeader("product") String product, @RequestHeader("product") String product,
@RequestHeader("token") String token, @RequestHeader("token") String token,
@RequestParam(value = "measurement") String measurement, @RequestParam(value = "measurement") String measurement,
@RequestParam( required = false, value = "deviceName") String deviceName,
@RequestParam(value = "timeStart") String beginDate, @RequestParam(value = "timeStart") String beginDate,
@RequestParam(value = "timeEnd") String endDate, @RequestParam(value = "timeEnd") String endDate,
@RequestParam("FHS_PressurePump_Start") String key, @RequestParam("FHS_PressurePump_Start") String key,
......
...@@ -236,7 +236,7 @@ public class EmergencyServiceImpl implements IEmergencyService { ...@@ -236,7 +236,7 @@ public class EmergencyServiceImpl implements IEmergencyService {
if (x.get("iotCode") != null && iotCode.toString().length() > 8) { if (x.get("iotCode") != null && iotCode.toString().length() > 8) {
prefix = iotCode.toString().substring(0, 8); prefix = iotCode.toString().substring(0, 8);
try { try {
ResponseModel responseModel = iotFeign.selectListNew(appKey, product, token, prefix, startTime, endTime, null, pressurePumpStart); ResponseModel responseModel = iotFeign.selectListNew(appKey, product, token, prefix, null, startTime, endTime, null, pressurePumpStart);
if (200 == responseModel.getStatus()) { if (200 == responseModel.getStatus()) {
String json = JSON.toJSONString(responseModel.getResult()); String json = JSON.toJSONString(responseModel.getResult());
List<Map<String, String>> dataList = (List<Map<String, String>>) JSONArray.parse(json); List<Map<String, String>> dataList = (List<Map<String, String>>) JSONArray.parse(json);
...@@ -360,7 +360,7 @@ public class EmergencyServiceImpl implements IEmergencyService { ...@@ -360,7 +360,7 @@ public class EmergencyServiceImpl implements IEmergencyService {
// 停泵前的前5分钟,判断管网压力状态 // 停泵前的前5分钟,判断管网压力状态
try { try {
String stop5BeforeTime = DateUtils.convertDateToString(DateUtils.dateAddMinutes(DateUtils.convertStrToDate(intervalTime, "yyyy-MM-dd HH:mm:ss"), -5), "yyyy-MM-dd HH:mm:ss"); String stop5BeforeTime = DateUtils.convertDateToString(DateUtils.dateAddMinutes(DateUtils.convertStrToDate(intervalTime, "yyyy-MM-dd HH:mm:ss"), -5), "yyyy-MM-dd HH:mm:ss");
ResponseModel pipeResponseModel = iotFeign.selectListNew(appKey, product, token, prefix, stop5BeforeTime, intervalTime, null, "FHS_PipePressureDetector_PipePressure"); ResponseModel pipeResponseModel = iotFeign.selectListNew(appKey, product, token, prefix, null, stop5BeforeTime, intervalTime, null, "FHS_PipePressureDetector_PipePressure");
if (200 == pipeResponseModel.getStatus()) { if (200 == pipeResponseModel.getStatus()) {
String pipeJson = JSON.toJSONString(pipeResponseModel.getResult()); String pipeJson = JSON.toJSONString(pipeResponseModel.getResult());
List<Map<String, String>> pipeDataList = (List<Map<String, String>>) JSONArray.parse(pipeJson); List<Map<String, String>> pipeDataList = (List<Map<String, String>>) JSONArray.parse(pipeJson);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment