Commit 2c68c6a6 authored by tianyiming's avatar tianyiming

单个稳压泵指标展示和状态修改

parent 516cb67e
...@@ -136,7 +136,7 @@ public class SupervisionVideoServiceImpl extends ServiceImpl<SupervisionVideoMap ...@@ -136,7 +136,7 @@ public class SupervisionVideoServiceImpl extends ServiceImpl<SupervisionVideoMap
if (!ObjectUtils.isEmpty(stateMap)) { if (!ObjectUtils.isEmpty(stateMap)) {
try { try {
//如果当前指标为启动,并且指标值为true,计算启动时长 //如果当前指标为启动,并且指标值为true,计算启动时长
if(PressurePumpRelateEnum.START.getDesc().contains(stateMap.get("equipment_index_name")) && PressurePumpRelateEnum.IOT_INDEX_VALUE_FALSE.getValue().contains(stateMap.get("equipment_index_name"))){ if(PressurePumpRelateEnum.START.getDesc().contains(stateMap.get("equipment_index_name")) && PressurePumpRelateEnum.IOT_INDEX_VALUE_TRUE.getValue().contains(stateMap.get("value"))){
update_date = sdf.parse(stateMap.get("update_date")).getTime(); update_date = sdf.parse(stateMap.get("update_date")).getTime();
long res = nowDateTime - update_date; long res = nowDateTime - update_date;
long diffMinute = res / 1000 / 60; long diffMinute = res / 1000 / 60;
...@@ -144,7 +144,11 @@ public class SupervisionVideoServiceImpl extends ServiceImpl<SupervisionVideoMap ...@@ -144,7 +144,11 @@ public class SupervisionVideoServiceImpl extends ServiceImpl<SupervisionVideoMap
time = false; time = false;
} }
} }
item.put("equipment_index_name", stateMap.get("equipment_index_name")); if(PressurePumpRelateEnum.START.getDesc().contains(stateMap.get("equipment_index_name")) && PressurePumpRelateEnum.IOT_INDEX_VALUE_FALSE.getValue().contains(stateMap.get("value"))){
item.put("equipment_index_name", PressurePumpRelateEnum.STOP.getDesc());
} else {
item.put("equipment_index_name", stateMap.get("equipment_index_name"));
}
item.put("update_time", stateMap.get("update_date")); item.put("update_time", stateMap.get("update_date"));
} catch (ParseException e) { } catch (ParseException e) {
throw new BadRequest("稳压泵最新指标时间转换失败!"); throw new BadRequest("稳压泵最新指标时间转换失败!");
......
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