From 7cbf1129c9890a9a1156e225a928f85ce3b47634 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Sun, 3 Sep 2023 21:28:40 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E6=8E=A7=E9=A2=84=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../imgmessageslog/ImgMessagesLogMapper.java | 2 +- .../imgmessageslog/ImgMessagesLogService.java | 7 +--- .../report/wx/SuperviseWxMessSender.java | 20 ++++++----- .../rms/api/riskalarm/DeviceImages.java | 34 ++++++++----------- .../rms/biz/riskalarm/RiskAlarmService.java | 5 +++ 5 files changed, 32 insertions(+), 36 deletions(-) diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageslog/ImgMessagesLogMapper.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageslog/ImgMessagesLogMapper.java index 99951528..1cdaebb6 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageslog/ImgMessagesLogMapper.java +++ b/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 { @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 selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper 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); } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageslog/ImgMessagesLogService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageslog/ImgMessagesLogService.java index 8ef980d7..6c8d20ba 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageslog/ImgMessagesLogService.java +++ b/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 list=new ArrayList<>(); - for (String u:split){ - list.add(u); - } - vo.setDevices(list); + vo.setText(riskAlarm.getContent()); return rb.success().setData(vo); } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/wx/SuperviseWxMessSender.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/wx/SuperviseWxMessSender.java index 5f4dcc17..7c4e2ded 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/wx/SuperviseWxMessSender.java +++ b/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 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 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); diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarm/DeviceImages.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarm/DeviceImages.java index 206c2749..8160593f 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarm/DeviceImages.java +++ b/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; +// } } diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarm/RiskAlarmService.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarm/RiskAlarmService.java index 3095647d..58c57545 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarm/RiskAlarmService.java +++ b/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