9/15

yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/riskmessageslog/RiskMessagesLogVo.java

@@ -32,6 +32,27 @@ public class RiskMessagesLogVo implements Vo {
     private Integer count;
     private List<String> message;
     private String type;
+    private TemplateMessageVo templateMessageVo;
+    //{time4=2023-09-14 17:17:35, thing8=中通樊家屯仓, thing2=东北角的摄像头,111,22,33}
+    //{thing3=中通樊家屯仓, thing2=东北角的摄像头,111,22,33, time5=2023-09-14 17:18:00}
+    public TemplateMessageVo getTemplateMessageVo() {
+        TemplateMessageVo vo=new TemplateMessageVo();
+        if(type.equals("设备离线")){
+            vo.setTime(map.get("time4"));
+            vo.setShName(map.get("thing8"));
+        }else if(type.equals("设备离线解除")){
+            vo.setTime(map.get("time5"));
+            vo.setShName(map.get("thing3"));
+        }else if(type.equals("系统异常")){
+            vo.setTime(map.get("time4"));
+            vo.setShName("环境监控未向平台推送数据");
+        }else if(type.equals("系统异常解除")){
+            vo.setTime(map.get("time5"));
+            vo.setShName("环境监控已正常推送数据");
+        }
+        this.templateMessageVo=vo;
+        return templateMessageVo;
+    }
 
     public List<String> getMessage() {
         List<String> l=new ArrayList<>();

yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/riskmessageslog/TemplateMessageVo.java

@@ -0,0 +1,13 @@
+package com.yxt.supervise.report.api.riskmessageslog;
+
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/9/15 8:54
+ */
+@Data
+public class TemplateMessageVo {
+    private  String shName;
+    private String time;
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogMapper.java

@@ -22,7 +22,7 @@ public interface RiskMessagesLogMapper extends BaseMapper<RiskMessagesLog> {
     IPage<RiskMessagesLogVo> selectPageVo(IPage<RiskMessagesLog> page, @Param(Constants.WRAPPER) Wrapper<RiskMessagesLog> qw);
     @Select("select * from risk_messages_log where riskSid =#{sid} order by messageTime desc limit 1")
     RiskMessagesLogVo getMessageBySid(@Param("sid") String sid);
-    @Select("select *,case state when '1' then '设备离线' when '2' then '设备离线解除' end  as type  from risk_messages_log order by messageTime desc limit 1")
+    @Select("select *,case state when '1' then '设备离线' when '2' then '设备离线解除' when '3' then '系统异常' when '4' then '系统异常解除' end  as type  from risk_messages_log order by messageTime desc limit 1")
     RiskMessagesLogVo getMessage();
     @Select("select count(*) from risk_messages_log i left join risk_message_user m on m.messageSid=i.sid where m.state='0' and m.openId =#{openId}")
     Integer getMessageCount(@Param("openId") String openId);

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogMapper.xml

@@ -4,7 +4,7 @@
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLogVo">
-        select l.*,case l.state when '1' then '设备离线' when '2' then '设备离线解除' end as type from risk_messages_log l left join risk_message_user o on o.messageSid=l.sid <where> ${ew.sqlSegment} </where>
+        select l.*,case l.state when '1' then '设备离线' when '2' then '设备离线解除' when '3' then '系统异常' when '4' then '系统异常解除' end as type from risk_messages_log l left join risk_message_user o on o.messageSid=l.sid <where> ${ew.sqlSegment} </where>
     </select>
     <select id="getRiskMessagesLog" resultType="com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLogVo">
         SELECT

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogService.java

@@ -14,10 +14,7 @@ import com.yxt.common.core.vo.PagerVo;
 import com.yxt.supervise.report.api.imgmessageslog.Linkers;
 import com.yxt.supervise.report.api.imgmessageuser.ImgMessageUser;
 import com.yxt.supervise.report.api.messageopenid.MessageOpenid;
-import com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLog;
+import com.yxt.supervise.report.api.riskmessageslog.*;
-import com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLogDto;
-import com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLogQuery;
-import com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLogVo;
 import com.yxt.supervise.report.api.riskmessageuser.RiskMessageUser;
 import com.yxt.supervise.report.biz.messageopenid.MessageOpenidService;
 import com.yxt.supervise.report.biz.projectdaily.ProjectDailyRest;

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/wx/SuperviseWxMessSender.java

@@ -173,7 +173,7 @@ public class SuperviseWxMessSender {
         for(String touser:tousers){
             respMessReturn = WxMessage.sendMessage("Q0Bii6glb1Q4oihQQckAOZrEkzQzXPrjca6oiozcrc4", touser, pagepath, data);
         }
-        SystemRiskMessagesLogDto logDto=new SystemRiskMessagesLogDto();
+        RiskMessagesLogDto logDto=new RiskMessagesLogDto();
         logDto.setContent(data);
         logDto.setMessageTime(reportTime);
         logDto.setPagepath(pagepath);
@@ -181,9 +181,10 @@ public class SuperviseWxMessSender {
         //logDto.setProjectSid(projectSid);
         logDto.setOrderDate(orderDate);
         logDto.setRiskSid(riskSid);
+        logDto.setState("3");
         ThreadUtil.execute(() -> {
             try {
-                superviseWxMessSender.messagePushLogService.systemRiskSave(logDto);
+                superviseWxMessSender.messagePushLogService.riskSave(logDto);
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }