9/9

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

@@ -103,7 +103,7 @@ public class SuperviseWxMessSender {
     public static RespMessReturn secureSend(List<String> tousers, String projectSid,String riskSid, String projectName,String messSid, String reportTime) {
         RespMessReturn respMessReturn=new RespMessReturn();
         String orderDate = reportTime.substring(0, 10);
-        String pagepath ="pages/index/DeviceException"+"?sid="+messSid;
+        String pagepath ="";
         HashMap<String, String> data = new HashMap<>();
         data.put("thing3", projectName);
         data.put("thing2", "设备名");

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

@@ -27,10 +27,10 @@ public class WxMessage {
         mp_template_msg.put("template_id", template_id);// 模板Id
         mp_template_msg.put("url", "");         // 点击模板信息跳转地址
 
-        Map<String, String> miniprogram = new HashMap<>();
+//        Map<String, String> miniprogram = new HashMap<>();
-        miniprogram.put("appid", WxConfig.MP_APPID);
+//        miniprogram.put("appid", WxConfig.MP_APPID);
-        miniprogram.put("pagepath", pagepath);
+//        miniprogram.put("pagepath", pagepath);
-        mp_template_msg.put("miniprogram", miniprogram);
+//        mp_template_msg.put("miniprogram", miniprogram);
 
         Map<String, TemplateDataValue> sendData = new HashMap<>();
         data.forEach((key, val) -> {

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

@@ -136,6 +136,7 @@ public class RiskAlarmService extends MybatisBaseService<RiskAlarmMapper, RiskAl
             riskAlarm.setTriggerTime(new Date());
             riskAlarm.setSid(UUID.randomUUID().toString());
             riskAlarm.setTreatmentTime(new Date());
+            riskAlarm.setCount(1);
             riskAlarm.setContent(dto.getDevices().toString());
             RiskAlarmVo riskAlarmVo = baseMapper.getRiskAlarm(dto.getSid(),"030404");
             //判断是否要通知
@@ -180,7 +181,6 @@ public class RiskAlarmService extends MybatisBaseService<RiskAlarmMapper, RiskAl
                 riskAlarm.setSid(UUID.randomUUID().toString());
                 riskAlarm.setTreatmentTime(new Date());
                 riskAlarm.setContent(dto.getDeviceImages().toString());
-                riskAlarm.setCount(1);
                 RiskAlarmVo riskAlarmVo = baseMapper.getRiskAlarm(dto.getSid(),"030405");
                 determine(riskAlarmVo,riskAlarm,dto.getSid(),"030405");
             }
@@ -198,7 +198,7 @@ public class RiskAlarmService extends MybatisBaseService<RiskAlarmMapper, RiskAl
         if (null == risk) {
             baseMapper.insert(riskAlarm);
         } else {
-            if(risk.getCount()>=2){
+            if(risk.getCount()>=1){
                 return true;
             }else {
                 risk.setCount(risk.getCount() + 1);
@@ -211,11 +211,6 @@ public class RiskAlarmService extends MybatisBaseService<RiskAlarmMapper, RiskAl
         if (null == riskAlarmVo) {
             baseMapper.insert(riskAlarm);
 
-//            if(type.equals("030404")){
-//                ThreadUtil.execute(()->{
-//                    wechatFeign.shMessage(shSid,riskAlarm.getSid());
-//                });
-//            }else
             if(type.equals("030405")){
                 ThreadUtil.execute(()->{
                     wechatFeign.shImgMessage(shSid,riskAlarm.getSid());
@@ -228,28 +223,39 @@ public class RiskAlarmService extends MybatisBaseService<RiskAlarmMapper, RiskAl
         }else{
             Date newDate;
             if(type.equals("030404")){
-                RiskAlarm risk = baseMapper.getRiskAlarmByState("030404", riskAlarm.getPositionSid(), "1");
+                RiskAlarm risk = baseMapper.getRiskAlarmByState("030404", riskAlarm.getPositionSid(), "0");
+                if(null==risk){
+//                    boolean d=deviceDetermine(riskAlarm);
+//                    if(d==true){
+                    baseMapper.insert(riskAlarm);
+                        ThreadUtil.execute(()->{
+                            wechatFeign.shMessage(shSid,riskAlarmVo.getSid());
+                        });
+//                    }
+                    return true;
+                }
                 newDate = addHour(risk.getCreateTime(), 4);
             }else {
                 newDate = addHour(riskAlarmVo.getCreateTime(), 4);
             }
             if (newDate.before(new Date())) {
                 if(type.equals("030404")){
-                    boolean d=deviceDetermine(riskAlarm);
+//                    boolean d=deviceDetermine(riskAlarm);
-                    if(d==true){
+//                    if(d==true){
+                    baseMapper.insert(riskAlarm);
                         ThreadUtil.execute(()->{
-                            wechatFeign.shMessage(shSid,riskAlarm.getSid());
+                            wechatFeign.shMessage(shSid,riskAlarmVo.getSid());
                         });
-                    }
+//                    }
                 }else if(type.equals("030405")){
                     baseMapper.insert(riskAlarm);
                     ThreadUtil.execute(()->{
-                        wechatFeign.shImgMessage(shSid,riskAlarm.getSid());
+                        wechatFeign.shImgMessage(shSid,riskAlarmVo.getSid());
                     });
                 }else if (type.equals("030406")){
                     baseMapper.insert(riskAlarm);
                     ThreadUtil.execute(()->{
-                        wechatFeign.sysErrMessage(riskAlarm.getSid());
+                        wechatFeign.sysErrMessage(riskAlarmVo.getSid());
                     });
                 }
             }