Skip to content

A
amos-boot-biz
Commit 9e69600c authored by zhangsen's avatar zhangsen
Browse files
Options

监盘总览 稳压泵模块同步plan6代码

parent aa7cca28
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 26 deletions
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/SupervisionConfigureController.java
View file @ 9e69600c
...@@ -385,6 +385,7 @@ public class SupervisionConfigureController extends AbstractBaseController { ...@@ -385,6 +385,7 @@ public class SupervisionConfigureController extends AbstractBaseController {
Date stopDate = null; Date stopDate = null;
if (ObjectUtils.isEmpty(item.get("start")) && ObjectUtils.isEmpty(item.get("stop"))) { if (ObjectUtils.isEmpty(item.get("start")) && ObjectUtils.isEmpty(item.get("stop"))) {
item.put("equipment_index_name", "无信号"); item.put("equipment_index_name", "无信号");
item.put("update_time", false);
} else { } else {
if (!ObjectUtils.isEmpty(item.get("start"))) { if (!ObjectUtils.isEmpty(item.get("start"))) {
startTime = item.get("start").toString().substring(0, 19).replace("T", " "); startTime = item.get("start").toString().substring(0, 19).replace("T", " ");
...@@ -404,35 +405,19 @@ public class SupervisionConfigureController extends AbstractBaseController { ...@@ -404,35 +405,19 @@ public class SupervisionConfigureController extends AbstractBaseController {
} else { } else {
item.put("stopTime", 0); item.put("stopTime", 0);
} }
if (!"0".equals(item.get("startTime"))) { if (start_time - stop_time > 0) {
if ("0".equals(item.get("stopTime"))) { long res = nowDateTime - start_time;
long res = nowDateTime - start_time; long diffMinute = res / 1000 / 60;
long diffMinute = res / 1000 / 60; if (diffMinute > 5) {
if (diffMinute > 5) { time = false;
time = false;
}
item.put("upTime", diffMinute);
item.put("equipment_index_name", "启动");
item.put("update_time", startDate);
} else {
String startOrStop = start_time - stop_time > 0 ? "start" : " stop";
if ("start".equals(startOrStop)) {
long res = nowDateTime - start_time;
long diffMinute = res / 1000 / 60;
if (diffMinute > 5) {
time = false;
}
item.put("upTime", diffMinute);
item.put("equipment_index_name", "启动");
item.put("update_time", startDate);
} else {
item.put("upTime", 0);
item.put("equipment_index_name", "停止");
item.put("update_time", stopDate);
}
} }
item.put("upTime", diffMinute);
item.put("equipment_index_name", "启动");
item.put("update_time", startDate);
} else { } else {
item.put("upTime", 0); item.put("upTime", 0);
item.put("equipment_index_name", "停止");
item.put("update_time", stopDate);
} }
} }
item.put("stateDesc", Integer.parseInt(String.valueOf(item.get("isAlarm"))) == 0 && time ? "正常" : "异常"); item.put("stateDesc", Integer.parseInt(String.valueOf(item.get("isAlarm"))) == 0 && time ? "正常" : "异常");
......
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