Commit 037212d2 authored by 高建强's avatar 高建强

item:稳压泵启停状态图接口剔除iotCode为空

parent 28465f81
...@@ -220,15 +220,12 @@ public class EmergencyServiceImpl implements IEmergencyService { ...@@ -220,15 +220,12 @@ public class EmergencyServiceImpl implements IEmergencyService {
List<Integer> yList = new ArrayList<>(); List<Integer> yList = new ArrayList<>();
String name = x.get("name").toString(); String name = x.get("name").toString();
yMap.put("name", name); yMap.put("name", name);
String iotCode = x.get("iotCode").toString(); Object iotCode = x.get("iotCode");
String prefix = null; String prefix = null;
String suffix = null; String suffix = null;
if (iotCode.length() > 8) { if (x.get("iotCode") != null && iotCode.toString().length() > 8) {
prefix = iotCode.substring(0, 8); prefix = iotCode.toString().substring(0, 8);
suffix = iotCode.substring(8); suffix = iotCode.toString().substring(8);
} else {
throw new BadRequest("装备物联编码错误,请确认!");
}
ResponseModel responseModel = null; ResponseModel responseModel = null;
try { try {
responseModel = iotFeign.selectList(appKey, product, token, startTime, endTime, prefix, suffix, fieldKey); responseModel = iotFeign.selectList(appKey, product, token, startTime, endTime, prefix, suffix, fieldKey);
...@@ -258,6 +255,7 @@ public class EmergencyServiceImpl implements IEmergencyService { ...@@ -258,6 +255,7 @@ public class EmergencyServiceImpl implements IEmergencyService {
} }
yMap.put("data", yList); yMap.put("data", yList);
yData.add(yMap); yData.add(yMap);
}
}); });
map.put("xData", timeList); map.put("xData", timeList);
map.put("yData", yData); map.put("yData", yData);
......
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