直流中心bug修改

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/SupervisionConfigureController.java

@@ -387,6 +387,7 @@ public class SupervisionConfigureController extends AbstractBaseController {
             Date stopDate = null;
             if (ObjectUtils.isEmpty(item.get("start")) && ObjectUtils.isEmpty(item.get("stop"))) {
                 item.put("equipment_index_name", "无信号");
+                item.put("update_time", false);
             } else {
                 if (!ObjectUtils.isEmpty(item.get("start"))) {
                     startTime = item.get("start").toString().substring(0, 19).replace("T", " ");
@@ -406,35 +407,19 @@ public class SupervisionConfigureController extends AbstractBaseController {
                 } else {
                     item.put("stopTime", 0);
                 }
-                if (!"0".equals(item.get("startTime"))) {
-                    if ("0".equals(item.get("stopTime"))) {
-                        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 {
-                        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);
-                        }
+                if (start_time -  stop_time > 0) {
+                    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("stateDesc", Integer.parseInt(String.valueOf(item.get("isAlarm"))) == 0 && time ? "正常" : "异常");

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmMapper.xml

@@ -284,7 +284,7 @@
 	        wlesal.equipment_specific_name as equipmentSpecificName,
             wlesal.location,
             wlesal.station_code AS stationCode,
-            wlesal.biz_org_name AS stationName
+            wlesal.station_name AS stationName
         FROM wl_equipment_specific_alarm_log wlesal
         <where>
             wlesal.clean_time IS NULL
@@ -1520,7 +1520,7 @@
                 SELECT
                     fs.`name`,
                     fs.`code`,
-                    IFNULL( sum( wesi.`status` ), 0 ) AS countAlarmTotal
+                    IFNULL( sum( wesi.`frequency` ), 0 ) AS countAlarmTotal
                 FROM
                     idx_biz_station_info fs
                         LEFT JOIN wl_equipment_specific_alarm wesi ON wesi.station_code = fs.`code`