高危用户

src/main/java/com/zhili/dashboard/service/impl/AlarmMsgServiceImpl.java

@@ -1169,14 +1169,14 @@ public class AlarmMsgServiceImpl extends ServiceImpl<AlarmMsgMapper, AlarmMsg> i
             param.setInterfaceName("设备基本信息");
             param.setCondition("date_info <= DATE_ADD(now(), INTERVAL -" + interval + " DAY) and id>" + maxId + " order by id ");
             param.setTableName("algo_all_fault_info_ing");
-            param.setFields("id,sn,fault_code,start_time,end_time,fault_advice");
+            param.setFields("id,sn,fault_code,start_time,end_time,fault_advice,update_by");
 
             TableInfoParam paramDone = new TableInfoParam();
             paramDone.setSignature(SIGNATURE);
             paramDone.setInterfaceName("设备基本信息");
             paramDone.setCondition("date_info <= DATE_ADD(now(), INTERVAL -" + interval + " DAY) and id>" + maxId + " order by id ");
             paramDone.setTableName("algo_all_fault_info_done");
-            paramDone.setFields("id,sn,fault_code,start_time,end_time,fault_advice");
+            paramDone.setFields("id,sn,fault_code,start_time,end_time,fault_advice,update_by");
 
             futures.add(getBatteryMsg(openApiUrl + BATTERY_URL, JSON.toJSONString(param)));
             futures.add(getBatteryMsg(openApiUrl + BATTERY_URL, JSON.toJSONString(paramDone)));
@@ -1246,6 +1246,9 @@ public class AlarmMsgServiceImpl extends ServiceImpl<AlarmMsgMapper, AlarmMsg> i
                             alarmMsg.setFaultStatus(0);
                             alarmMsg.setSid(o.getId());
                             alarmMsg.setType(1);
+                            if (alarmMsg.getFaultLevel() != null && alarmMsg.getFaultLevel() > 3) {
+                                alarmMsg.setUpdateBy(o.getUpdateBy());
+                            }
                             alarmMsgList.add(alarmMsg);
                         }
                     });
@@ -1326,7 +1329,9 @@ public class AlarmMsgServiceImpl extends ServiceImpl<AlarmMsgMapper, AlarmMsg> i
                             alarmMsg.setFaultStatus(0);
                             LocalDateTime finishTime = DateUtil.Timestamp2LocalDateTime(o.getEndTime().getTime() + interval * 24 * 60 * 60 * 1000L);
                             alarmMsg.setFinishTime(finishTime);
-
+                            if (alarmMsg.getFaultLevel() != null && alarmMsg.getFaultLevel() > 3) {
+                                alarmMsg.setUpdateBy(o.getUpdateBy());
+                            }
                             alarmMsg.setSid(o.getId());
                             alarmMsgList.add(alarmMsg);
                         }

src/main/resources/mapper/AlarmMsgMapper.xml

@@ -117,7 +117,7 @@
         SELECT b.id,
         a.province
         FROM (SELECT sn, id FROM t_alarm_msg t WHERE is_delete = 0 AND t.fault_status = 0) b
-        INNER JOIN (SELECT sn, province FROM t_device d WHERE is_delete=0  and province is not null
+        INNER JOIN (SELECT sn, province FROM t_device d WHERE is_delete=0 and province is not null
         <if test="province != null and province!=''">
             AND d.province = #{province}
         </if>
@@ -131,7 +131,7 @@
         SELECT count(1) AS quantity,
         province AS item
         FROM t_device
-        WHERE is_delete = 0  and province is not null
+        WHERE is_delete = 0 and province is not null
         <if test="province != null and province!=''">
             AND province = #{province}
         </if>
@@ -168,7 +168,7 @@
         SELECT count(1) AS quantity,
         scene AS item
         FROM t_device
-        WHERE is_delete = 0 and scene  is not null
+        WHERE is_delete = 0 and scene is not null
         <if test="province != null and province!=''">
             AND province = #{province}
         </if>
@@ -176,7 +176,7 @@
     </select>
 
     <select id="getInterval" resultType="Long">
-        SELECT TIMESTAMPDIFF(DAY , max(fault_time), NOW()) AS num
+        SELECT IFNULL(TIMESTAMPDIFF(DAY , max(fault_time), NOW()), 0) AS num
         FROM t_alarm_msg
         where fault_level = 5
           and is_delete = 0 limit 1
@@ -214,7 +214,7 @@
         group by item
     </select>
 
-<!--    and am.fault_time &gt;= DATE_ADD(now(), INTERVAL -1 DAY )-->
+    <!--    and am.fault_time &gt;= DATE_ADD(now(), INTERVAL -1 DAY )-->
     <select id="getBatteryMap" resultType="Map">
         SELECT am.fault_level, d.longitude, d.latitude
         FROM t_device d