9/14

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

@@ -20,4 +20,5 @@ public class RiskMessagesLog extends EntityWithId {
     private String projectSid;
     private String orderDate;
     private String riskSid;
+    private String state;
 }

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

@@ -23,4 +23,5 @@ public class RiskMessagesLogDto implements Dto {
     private String projectSid;
     private String orderDate;
     private String riskSid;
+    private String state;
 }

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

@@ -4,7 +4,7 @@
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.supervise.report.api.imgmessageslog.ImgMessagesLogVo">
-        select l.*,o.state as oState from message_push_log l left join message_openid o on o.messageSid=l.sid <where> ${ew.sqlSegment} </where>
+        select l.* from img_messages_log l left join img_message_user o on o.messageSid=l.sid <where> ${ew.sqlSegment} </where>
     </select>
     <select id="getImgMessagesLog" resultType="com.yxt.supervise.report.api.imgmessageslog.ImgMessagesLogVo">
         SELECT

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

@@ -104,14 +104,15 @@ public class ImgMessagesLogService extends MybatisBaseService<ImgMessagesLogMapp
         QueryWrapper<ImgMessagesLog> qw = new QueryWrapper<>();
         System.out.println(query.getState());
         qw.eq("o.openId",sysUser.getAppletOpenid());
-          if(StringUtils.isNotNull(query.getState())){
-            if(query.getState().equals("2")){}
-            else if(query.getState().equals("0")){
-                qw.eq("o.state",0);
-            }else if(query.getState().equals("1")){
-                qw.eq("o.state",1);
-            }
-        }
+//          if(StringUtils.isNotNull(query.getState())){
+//            if(query.getState().equals("2")){}
+//            else if(query.getState().equals("0")){
+//                qw.eq("o.state",0);
+//            }else if(query.getState().equals("1")){
+//                qw.eq("o.state",1);
+//            }
+//        }
+        qw.orderByDesc("messageTime");
         IPage<ImgMessagesLogVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<ImgMessagesLogVo> p = PagerUtil.pageToVo(pagging, null);
         return p;

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/messagetype/MessageTypeService.java

@@ -93,18 +93,16 @@ public class MessageTypeService extends MybatisBaseService<MessageTypeMapper, Me
         for(MessageTypeVo messageTypeVo:pagging){
             if(messageTypeVo.getCode().equals("1001")){
                 ImgMessagesLogVo imgMessagesLogVo=imgMessagesLogMapper.getMessage();
-                messageTypeVo.setMessageLogs(imgMessagesLogVo);
                 imgMessagesLogVo.setCount(imgMessagesLogMapper.getMessageCount(openId));
+                messageTypeVo.setMessageLogs(imgMessagesLogVo);
             }else if(messageTypeVo.getCode().equals("1002")){
                 MessagePushLogVo messagePushLogVo= messagePushLogMapper.getMessage();
+                messagePushLogVo.setCount(messagePushLogMapper.getCountByUser(openId, "0"));
                 messageTypeVo.setMessageLogs(messagePushLogVo);
-                messagePushLogVo.setCount(messagePushLogMapper.getCountByUser(query.getUserSid(), "0"));
             }else if(messageTypeVo.getCode().equals("1003")){
                 RiskMessagesLogVo riskMessagesLogVo=riskMessagesLogMapper.getMessage();
-                RiskAlarm riskAlarm=rmsMapper.getRiskByMessSid(riskMessagesLogVo.getRiskSid());
-                messageTypeVo.setMessageLogs(riskMessagesLogVo);
-                riskMessagesLogVo.setType(riskAlarm.getZt());
                 riskMessagesLogVo.setCount(riskMessagesLogMapper.getMessageCount(openId));
+                messageTypeVo.setMessageLogs(riskMessagesLogVo);
             }
         }
         return pagging;

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 * from risk_messages_log order by messageTime desc limit 1")
+    @Select("select *,case state when '1' then '设备离线' when '2' 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.*,o.state as oState from message_push_log l left join message_openid o on o.messageSid=l.sid <where> ${ew.sqlSegment} </where>
+        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>
     <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

@@ -82,8 +82,8 @@ public class RiskMessagesLogService extends MybatisBaseService<RiskMessagesLogMa
         linkers.setMobile("11111111111");
         linkers.setName("张三");
         linkers1.setName("李四");
-        list.add(linkers);
-        list.add(linkers1);
+//        list.add(linkers);
+//        list.add(linkers1);
         vo.setLinkers(list);
         ResultBean<JSONObject> rbJsonObject = projectDailyRest.wxLogin(wxCode, APP_ID, SECRET);
         JSONObject jsonObject = rbJsonObject.getData();
@@ -107,14 +107,7 @@ public class RiskMessagesLogService extends MybatisBaseService<RiskMessagesLogMa
         QueryWrapper<RiskMessagesLog> qw = new QueryWrapper<>();
         System.out.println(query.getState());
         qw.eq("o.openId",sysUser.getAppletOpenid());
-          if(StringUtils.isNotNull(query.getState())){
-            if(query.getState().equals("2")){}
-            else if(query.getState().equals("0")){
-                qw.eq("o.state",0);
-            }else if(query.getState().equals("1")){
-                qw.eq("o.state",1);
-            }
-        }
+        qw.orderByDesc("messageTime");
         IPage<RiskMessagesLogVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<RiskMessagesLogVo> p = PagerUtil.pageToVo(pagging, null);
         return p;

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/rms/RmsMapper.java

@@ -11,15 +11,7 @@ import java.util.List;
 @DS("rms")
 @Mapper
 public interface RmsMapper extends BaseMapper<RiskAlarm> {
-    @Select("select *,CASE\n" +
-            "\t\ttype \n" +
-            "\t\tWHEN '1' THEN\n" +
-            "\t\t'设备离线' \n" +
-            "\t\tWHEN '2' THEN\n" +
-            "\t\t'设备离线解除' \n" +
-            "\t\tWHEN '3' THEN\n" +
-            "\t\t'系统异常' \n" +
-            "\tEND AS zt  from risk_alarm where sid =#{sid}")
+    @Select("select *  from risk_alarm where sid =#{sid}")
     RiskAlarm getRiskByMessSid (@Param("sid")String sid );
     @Select("select * from risk_messages_log  order by messageTime desc limit 1")
     RiskAlarm getRiskByCode ();

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

@@ -92,6 +92,7 @@ public class SuperviseWxMessSender {
         logDto.setProjectSid(projectSid);
         logDto.setOrderDate(orderDate);
         logDto.setRiskSid(riskSid);
+        logDto.setState("1");
         ThreadUtil.execute(() -> {
             try {
                 superviseWxMessSender.messagePushLogService.riskSave(logDto);
@@ -112,6 +113,23 @@ public class SuperviseWxMessSender {
         for(String touser:tousers){
             respMessReturn = WxMessage.sendMessage("A1u0HdEegfdJl3_MndronKahtvwkAa5IFDSy2NRHu8U", touser, pagepath, data);
         }
+        System.out.println("增加消息");
+        RiskMessagesLogDto logDto=new RiskMessagesLogDto();
+        logDto.setContent(data);
+        logDto.setMessageTime(reportTime);
+        logDto.setPagepath(pagepath);
+        logDto.setMessageOpenids(tousers);
+        logDto.setProjectSid(projectSid);
+        logDto.setOrderDate(orderDate);
+        logDto.setRiskSid(riskSid);
+        logDto.setState("2");
+        ThreadUtil.execute(() -> {
+            try {
+                superviseWxMessSender.messagePushLogService.riskSave(logDto);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        });
         return respMessReturn;
     }
 

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

@@ -71,6 +71,4 @@ public class RiskAlarm {
     //内容
     private String content;
     private String state;
-    private int count;
-    private String type;
 }

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

@@ -121,7 +121,6 @@ public class RiskAlarmService extends MybatisBaseService<RiskAlarmMapper, RiskAl
             if(riskAlarm1.size()>0){
                 for(RiskAlarm riskAlarm2:riskAlarm1){
                     riskAlarm2.setState("1");
-                    riskAlarm2.setType("2");
                     baseMapper.updateById(riskAlarm2);
                 }
                 ThreadUtil.execute(()->{
@@ -139,9 +138,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());
-            riskAlarm.setType("1");
             RiskAlarmVo riskAlarmVo = baseMapper.getRiskAlarm(dto.getSid(),"030404");
             //判断是否要通知
             determine(riskAlarmVo,riskAlarm,dto.getSid(),"030404");
@@ -185,7 +182,6 @@ public class RiskAlarmService extends MybatisBaseService<RiskAlarmMapper, RiskAl
                 riskAlarm.setSid(UUID.randomUUID().toString());
                 riskAlarm.setTreatmentTime(new Date());
                 riskAlarm.setContent(dto.getDeviceImages().toString());
-                riskAlarm.setType("3");
                 RiskAlarmVo riskAlarmVo = baseMapper.getRiskAlarm(dto.getSid(),"030405");
                 determine(riskAlarmVo,riskAlarm,dto.getSid(),"030405");
             }
@@ -198,25 +194,39 @@ public class RiskAlarmService extends MybatisBaseService<RiskAlarmMapper, RiskAl
      * @param riskAlarm
      * @return
      */
-    public boolean deviceDetermine(RiskAlarm riskAlarm) {
-        RiskAlarm risk = baseMapper.getRiskAlarmByState("030404", riskAlarm.getPositionSid(), "0");
-        if (null == risk) {
-            baseMapper.insert(riskAlarm);
-        } else {
-            if(risk.getCount()>=1){
-                return true;
-            }else {
-                risk.setCount(risk.getCount() + 1);
-                baseMapper.updateById(risk);
-            }
-        }
-        return false;
-    }
+//    public boolean deviceDetermine(RiskAlarm riskAlarm) {
+//        RiskAlarm risk = baseMapper.getRiskAlarmByState("030404", riskAlarm.getPositionSid(), "0");
+//        if (null == risk) {
+//            baseMapper.insert(riskAlarm);
+//        } else {
+//            if(risk.getCount()>=1){
+//                return true;
+//            }else {
+//                risk.setCount(risk.getCount() + 1);
+//                baseMapper.updateById(risk);
+//            }
+//        }
+//        return false;
+//    }
+
+    /**
+     *
+     * @param riskAlarmVo 查询已存在的
+     * @param riskAlarm  要新增的
+     * @param shSid  仓库sid
+     * @param type
+     * @return
+     */
     public boolean determine(RiskAlarmVo riskAlarmVo,RiskAlarm riskAlarm,String shSid,String type) {
         if (null == riskAlarmVo) {
             baseMapper.insert(riskAlarm);
 
             if(type.equals("030405")){
+                ThreadUtil.execute(()->{
+                    wechatFeign.shMessage(shSid,riskAlarm.getSid());
+                });
+            }
+            else if(type.equals("030405")){
                 ThreadUtil.execute(()->{
                     wechatFeign.shImgMessage(shSid,riskAlarm.getSid());
                 });
@@ -234,7 +244,7 @@ public class RiskAlarmService extends MybatisBaseService<RiskAlarmMapper, RiskAl
 //                    if(d==true){
                     baseMapper.insert(riskAlarm);
                         ThreadUtil.execute(()->{
-                            wechatFeign.shMessage(shSid,riskAlarmVo.getSid());
+                            wechatFeign.shMessage(shSid,riskAlarm.getSid());
                         });
 //                    }
                     return true;
@@ -249,18 +259,18 @@ public class RiskAlarmService extends MybatisBaseService<RiskAlarmMapper, RiskAl
 //                    if(d==true){
                     baseMapper.insert(riskAlarm);
                         ThreadUtil.execute(()->{
-                            wechatFeign.shMessage(shSid,riskAlarmVo.getSid());
+                            wechatFeign.shMessage(shSid,riskAlarm.getSid());
                         });
 //                    }
                 }else if(type.equals("030405")){
                     baseMapper.insert(riskAlarm);
                     ThreadUtil.execute(()->{
-                        wechatFeign.shImgMessage(shSid,riskAlarmVo.getSid());
+                        wechatFeign.shImgMessage(shSid,riskAlarm.getSid());
                     });
                 }else if (type.equals("030406")){
                     baseMapper.insert(riskAlarm);
                     ThreadUtil.execute(()->{
-                        wechatFeign.sysErrMessage(shSid,riskAlarmVo.getSid());
+                        wechatFeign.sysErrMessage(shSid,riskAlarm.getSid());
                     });
                 }
             }

yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskrecord/RiskRecordService.java

@@ -53,7 +53,7 @@ public class RiskRecordService extends MybatisBaseService<RiskRecordMapper, Risk
     /**
      * 定时查询推送情况
      */
-//    @Scheduled(cron = "57 * * * * ?")
+    @Scheduled(cron = "57 * * * * ?")
     public void build() throws InterruptedException {
         //Thread.sleep(58000);
         System.out.println("查询推送情况");
@@ -74,7 +74,6 @@ public class RiskRecordService extends MybatisBaseService<RiskRecordMapper, Risk
             riskAlarm.setTriggerTime(new Date());
             riskAlarm.setSid(UUID.randomUUID().toString());
             riskAlarm.setTreatmentTime(new Date());
-            riskAlarm.setType("3");
             //riskAlarm.setContent(dto.getDevices().toString());
             RiskAlarmVo riskAlarmVo = riskAlarmMapper.getRiskAlarmByCode("030406");
             riskAlarmService.determine(riskAlarmVo,riskAlarm,"","030406");