监控预警

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageslog/ImgMessagesLogMapper.java

@@ -20,6 +20,6 @@ public interface ImgMessagesLogMapper extends BaseMapper<ImgMessagesLog> {
     @Select("select count(o.id) from message_push_log l left join message_openid o on o.messageSid=l.sid  where o.openId=#{openid} and o.state=#{state}")
    int getAllByUserSid(@Param("openid") String openid,@Param("state")String state);
     IPage<ImgMessagesLogVo> selectPageVo(IPage<ImgMessagesLog> page, @Param(Constants.WRAPPER) Wrapper<ImgMessagesLog> qw);
-    @Select("select * from risk_messages_log where sid =#{sid} order by messageTime desc limit 1")
+    @Select("select * from img_messages_log where sid =#{sid} order by messageTime desc limit 1")
     ImgMessagesLogVo getMessageBySid(@Param("sid") String sid);
 }

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageslog/ImgMessagesLogService.java

@@ -59,12 +59,7 @@ public class ImgMessagesLogService extends MybatisBaseService<ImgMessagesLogMapp
         ImgMessagesLogVo vo= baseMapper.getMessageBySid(sid);
         RiskAlarm riskAlarm=rmsMapper.getRiskByMessSid(vo.getRiskSid());
         vo.setShName(riskAlarm.getPositionName());
-        String [] split=riskAlarm.getRemarks().split(",");
-        List<String> list=new ArrayList<>();
-        for (String u:split){
-            list.add(u);
-        }
-        vo.setDevices(list);
+        vo.setText(riskAlarm.getContent());
         return rb.success().setData(vo);
 
     }

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

@@ -76,10 +76,11 @@ public class SuperviseWxMessSender {
 //        String pagepath = jgsjzl_pagepath.replace("ORDER_DATE", orderDate).replace("PROJECT_SID", projectSid);?
         String pagepath ="pages/index/DeviceException"+"?sid"+messSid;
         HashMap<String, String> data = new HashMap<>();
-        data.put("time1", reportTime);
+        data.put("thing2", projectName);
         String thing2 = projectName +"监控设备异常";
-        data.put("thing2", maxLength20(thing2));
-        data.put("thing3", sender);
+        data.put("thing3", maxLength20(thing2));
+        data.put("time4", reportTime);
+        data.put("thing5", "监控设备异常");
 //        String thing2 =   projectName;
 //        data.put("thing4",  maxLength20(thing2));
 //        data.put("const2", reportTime);
@@ -87,7 +88,7 @@ public class SuperviseWxMessSender {
 //        data.put("character_string5", "");
 //        data.put("time1", reportTime);
         for(String touser:tousers){
-            respMessReturn = WxMessage.sendMessage(jgsjzl_template_id, touser, pagepath, data);
+            respMessReturn = WxMessage.sendMessage("xwFrrZ4gkdWXu0fB4l2S5yYU91PEu6gBg9FbtdS3G4A", touser, pagepath, data);
         }
         RiskMessagesLogDto logDto=new RiskMessagesLogDto();
         logDto.setContent(data);
@@ -112,10 +113,11 @@ public class SuperviseWxMessSender {
         String pagepath = "";
 //        String pagepath = "";
         HashMap<String, String> data = new HashMap<>();
-        data.put("time1", reportTime);
-        String thing2 = projectName+"图片对比异常";
-        data.put("thing2", maxLength20(thing2));
-        data.put("thing3", sender);
+        data.put("thing2", projectName);
+        String thing2 = projectName+"图片比对异常";
+        data.put("thing3", maxLength20(thing2));
+        data.put("time4", reportTime);
+        data.put("thing5", "图片比对异常");
 //        String thing2 =   projectName;
 //        data.put("thing4",  maxLength20(thing2));
 //        data.put("const2", reportTime);
@@ -123,7 +125,7 @@ public class SuperviseWxMessSender {
 //        data.put("character_string5", "");
 //        data.put("time1", reportTime);
         for(String touser:tousers){
-            respMessReturn = WxMessage.sendMessage(jgsjzl_template_id, touser, pagepath, data);
+            respMessReturn = WxMessage.sendMessage("xwFrrZ4gkdWXu0fB4l2S5yYU91PEu6gBg9FbtdS3G4A", touser, pagepath, data);
         }
         ImgMessagesLogDto logDto=new ImgMessagesLogDto();
         logDto.setContent(data);

yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarm/DeviceImages.java

@@ -2,6 +2,9 @@ package com.supervise.rms.api.riskalarm;
 
 import lombok.Data;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * @author wangpengfei
  * @date 2023/9/3 15:27
@@ -14,24 +17,15 @@ public class DeviceImages {
     private String similarity;
     private String startImage;
     private String startTime;
-
-    public String getEndImage() {
-        String end="https://supervise.yxtsoft.com/downfile/monitor/"+endImage;
-        this.endImage=end;
-        return endImage;
-    }
-
-    public void setEndImage(String endImage) {
-        this.endImage = endImage;
-    }
-
-    public String getStartImage() {
-        String start="https://supervise.yxtsoft.com/downfile/monitor/"+startImage;
-        this.startImage=start;
-        return startImage;
-    }
-
-    public void setStartImage(String startImage) {
-        this.startImage = startImage;
-    }
+//    String yuming="https://supervise.yxtsoft.com/downfile/monitor/";
+//    public String getEndImage() {
+//        String end=yuming+endImage;
+//        this.endImage = end;
+//        return endImage;
+//    }
+//    public String getStartImage() {
+//        String start=yuming+startImage;
+//        this.startImage = start;
+//        return startImage;
+//    }
 }

yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarm/RiskAlarmService.java

@@ -162,6 +162,11 @@ public class RiskAlarmService extends MybatisBaseService<RiskAlarmMapper, RiskAl
         Integer s = 0;
         RiskAlarm riskAlarm = new RiskAlarm();
         BeanUtil.copyProperties(dto, riskAlarm);
+        dto.getDeviceImages();
+        for(DeviceImages deviceImages:dto.getDeviceImages()){
+            deviceImages.setEndImage("https://supervise.yxtsoft.com/downfile/monitor/"+deviceImages.getEndImage());
+            deviceImages.setStartImage("https://supervise.yxtsoft.com/downfile/monitor/"+deviceImages.getStartImage());
+        }
         for(DeviceImages deviceImages:dto.getDeviceImages()){
             Integer sim=Integer.valueOf(deviceImages.getSimilarity().replace("%",""));
             if(sim<90){