11/9

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

@@ -20,4 +20,5 @@ public class ImgMessagesLog extends EntityWithId {
     private String projectSid;
     private String orderDate;
     private String riskSid;
+    private String positionName;//风险位置
 }

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

@@ -23,4 +23,5 @@ public class ImgMessagesLogDto implements Dto {
     private String projectSid;
     private String orderDate;
     private String riskSid;
+    private String positionName;// 风险位置
 }

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

@@ -21,4 +21,5 @@ public class RiskMessagesLog extends EntityWithId {
     private String orderDate;
     private String riskSid;
     private String state;
+    private String positionName;//风险位置
 }

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

@@ -24,4 +24,6 @@ public class RiskMessagesLogDto implements Dto {
     private String orderDate;
     private String riskSid;
     private String state;
+    private String positionName;//风险位置
+
 }

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

@@ -1,6 +1,7 @@
 package com.yxt.supervise.report.api.riskmessageslog;
 
 import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -11,4 +12,10 @@ import lombok.Data;
 public class RiskMessagesLogQuery implements Query {
     private String userSid;
     private String state;//0未读  1 已读 2全部
+    @ApiModelProperty("开始时间")
+    private String startDate;
+    @ApiModelProperty("结束时间")
+    private String endDate;
+    private String shName;//仓库名称
+
 }

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

@@ -34,10 +34,15 @@ public class RiskMessagesLogVo implements Vo {
     private List<String> message;
     private String type;
     private TemplateMessageVo templateMessageVo;
+    private TemplateMessageVos templateMessageVos;
+    private String isImg;
+    private String riskLevel="二级风险";
     //{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();
+        //{time4=2023-09-14 17:17:35, thing8=中通樊家屯仓, thing2=东北角的摄像头,111,22,33}
+        //{thing3=中通樊家屯仓, thing2=东北角的摄像头,111,22,33, time5=2023-09-14 17:18:00}
         if(StrUtil.isNotEmpty(type)){
             if(type.equals("设备离线")){
                 vo.setTime(map.get("time4"));
@@ -51,6 +56,10 @@ public class RiskMessagesLogVo implements Vo {
             }else if(type.equals("系统异常解除")){
                 vo.setTime(map.get("time5"));
                 vo.setShName("环境监控已正常推送数据");
+            }else if(type.equals("图片对比异常")){
+                //{thing3=瀚川商贸仓库, thing4=图片对比异常, time5=2023-11-06 05:04:08}
+                vo.setTime(map.get("time5"));
+                vo.setShName(map.get("thing3"));
             }
         }
         this.templateMessageVo=vo;

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

@@ -69,6 +69,9 @@ public class ImgMessagesLogService extends MybatisBaseService<ImgMessagesLogMapp
     public ResultBean getMessageBySid(String sid,String wxCode) {
         ResultBean rb=new ResultBean();
         RiskAlarm riskAlarm=rmsMapper.getRiskByMessSid(sid);
+        if(null==riskAlarm){
+            return rb.setMsg("没有此预警");
+        }
         ImgMessagesLogVo vo= baseMapper.getMessageBySid(riskAlarm.getSid());
         vo.setShName(riskAlarm.getPositionName());
         vo.setText(riskAlarm.getContent());
@@ -104,7 +107,7 @@ public class ImgMessagesLogService extends MybatisBaseService<ImgMessagesLogMapp
         IPage<ImgMessagesLog> page = PagerUtil.queryToPage(pq);
         QueryWrapper<ImgMessagesLog> qw = new QueryWrapper<>();
         System.out.println(query.getState());
-        qw.eq("o.openId",sysUser.getAppletOpenid());
+        qw.eq("o.openId",sysUser.getOpenId());
 //          if(StringUtils.isNotNull(query.getState())){
 //            if(query.getState().equals("2")){}
 //            else if(query.getState().equals("0")){
@@ -119,12 +122,5 @@ public class ImgMessagesLogService extends MybatisBaseService<ImgMessagesLogMapp
         return p;
     }
 
-    /**
-     * 定时查询未查看消息的人
-     */
-    @Scheduled(cron = "0 0 3 * * ?")
-    public void build(){
-        baseMapper.selectList(new QueryWrapper<ImgMessagesLog>());
-    }
 
 }

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

@@ -20,6 +20,7 @@ public interface RiskMessagesLogMapper extends BaseMapper<RiskMessagesLog> {
     @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<RiskMessagesLogVo> selectPageVo(IPage<RiskMessagesLog> page, @Param(Constants.WRAPPER) Wrapper<RiskMessagesLog> qw);
+    IPage<RiskMessagesLogVo> selectPageAllRisk(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 '设备离线解除' when '3' then '系统异常' when '4' then '系统异常解除' end  as type  from risk_messages_log order by messageTime desc limit 1")

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

@@ -6,6 +6,44 @@
     <select id="selectPageVo" resultType="com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLogVo">
         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="selectPageAllRisk" resultType="com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLogVo">
+        SELECT
+        l.*,
+        CASE
+        l.state
+        WHEN '1' THEN '设备离线'
+        WHEN '2' THEN '设备离线解除'
+        WHEN '3' THEN '系统异常'
+        WHEN '4' THEN '系统异常解除'
+        END AS type,
+        CASE
+        l.state
+        WHEN '1' THEN '1'
+        WHEN '2' THEN '1'
+        WHEN '3' THEN '1'
+        WHEN '4' THEN '1'
+        END AS isImg
+        FROM
+        risk_messages_log l
+        LEFT JOIN risk_message_user o ON o.messageSid = l.sid
+        <where> ${ew.sqlSegment} </where>
+        UNION
+        SELECT
+        l.*,
+        CASE
+        l.state
+        WHEN '1' THEN '图片对比异常'
+        END AS type,
+        CASE
+        l.state
+        WHEN '1' THEN 2
+        END AS isImg
+        FROM
+        img_messages_log l
+        LEFT JOIN img_message_user o ON o.messageSid = l.sid
+        <where> ${ew.sqlSegment} </where>
+        order by messageTime desc
+    </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/RiskMessagesLogRest.java

@@ -30,6 +30,13 @@ public class RiskMessagesLogRest {
         PagerVo<RiskMessagesLogVo> pv = RiskMessagesLogService.listPage(pq);
         return rb.success().setData(pv);
     }
+    @PostMapping("/listAllRisk")
+    public ResultBean listAllRisk(@RequestBody PagerQuery<RiskMessagesLogQuery> pq){
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<RiskMessagesLogVo> pv = RiskMessagesLogService.listAllRisk(pq);
+        return rb.success().setData(pv);
+    }
+
     @GetMapping("/getMessageBySid/{sid}/{wxCode}")
     public ResultBean getMessageBySid(@PathVariable("sid") String sid,@PathVariable("wxCode") String wxCode ){
         return RiskMessagesLogService.getMessageBySid(sid,wxCode);

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

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
-import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -24,6 +23,7 @@ import com.yxt.supervise.report.ds.rms.RiskAlarm;
 import com.yxt.supervise.report.ds.rms.RmsMapper;
 import com.yxt.supervise.report.ds.system.SysUser;
 import com.yxt.supervise.report.ds.warehouse.WarehouseMapper;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -104,10 +104,40 @@ public class RiskMessagesLogService extends MybatisBaseService<RiskMessagesLogMa
         IPage<RiskMessagesLog> page = PagerUtil.queryToPage(pq);
         QueryWrapper<RiskMessagesLog> qw = new QueryWrapper<>();
         System.out.println(query.getState());
-        qw.eq("o.openId",sysUser.getAppletOpenid());
+        qw.eq("o.openId",sysUser.getOpenId());
         qw.orderByDesc("messageTime");
         IPage<RiskMessagesLogVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<RiskMessagesLogVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
+
+    public PagerVo<RiskMessagesLogVo> listAllRisk(PagerQuery<RiskMessagesLogQuery> pq) {
+        ResultBean rb=new ResultBean();
+        RiskMessagesLogQuery query = pq.getParams();
+//        String openid=systemMapper.getAppletOpenidByUsersid(query.getUserSid());
+        SysUser sysUser=systemMapper.getAppletOpenidByUsersid(query.getUserSid());
+        IPage<RiskMessagesLog> page = PagerUtil.queryToPage(pq);
+        QueryWrapper<RiskMessagesLog> qw = new QueryWrapper<>();
+        System.out.println(query.getState());
+        qw.eq("o.openId",sysUser.getOpenId());
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getStartDate())) {
+            qw.ge("STR_TO_DATE(messageTime,'%Y-%m-%d')", query.getStartDate());
+        }
+        if (StringUtils.isNotBlank(query.getEndDate())) {
+            qw.le("STR_TO_DATE(messageTime,'%Y-%m-%d')", query.getEndDate());
+        }
+        if (StringUtils.isNotBlank(query.getShName())) {
+            qw.like("positionName", query.getShName());
+        }
+//        qw.orderByDesc("messageTime");
+        IPage<RiskMessagesLogVo> pagging = baseMapper.selectPageAllRisk(page, qw);
+        for(RiskMessagesLogVo r:pagging.getRecords()){
+            RiskAlarm riskAlarm=rmsMapper.getRiskByMessSid(r.getRiskSid());
+            List<Linkers>linkers=warehouseMapper.listBySid(riskAlarm.getPositionSid());
+            r.setShSid(riskAlarm.getPositionSid());
+            r.setLinkers(linkers);
+        }
+        PagerVo<RiskMessagesLogVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
 }

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java

@@ -54,4 +54,6 @@ public interface CrmMapper extends BaseMapper<ProjectInfo> {
     @Select("select p.*,e.enterpriseName as enterpriseName from project_account p left join enterprise_information e on e.sid =p.enterpriseSid " +
             "where projectSid=#{projectSid} ")
     List<ProjectAccountVo> getAccountByProjectSid(@Param("projectSid")String projectSid);
+    @Select("select * from project_information")
+    List<ProjectInfo> getProjects();
 }

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

@@ -93,6 +93,7 @@ public class SuperviseWxMessSender {
         logDto.setOrderDate(orderDate);
         logDto.setRiskSid(riskSid);
         logDto.setState("1");
+        logDto.setPositionName(shName);
         ThreadUtil.execute(() -> {
             try {
                 superviseWxMessSender.messagePushLogService.riskSave(logDto);
@@ -122,6 +123,7 @@ public class SuperviseWxMessSender {
         logDto.setOrderDate(orderDate);
         logDto.setRiskSid(riskSid);
         logDto.setState("2");
+        logDto.setPositionName(projectName);
         ThreadUtil.execute(() -> {
             try {
                 superviseWxMessSender.messagePushLogService.riskSave(logDto);
@@ -151,6 +153,7 @@ public class SuperviseWxMessSender {
         logDto.setProjectSid(projectSid);
         logDto.setOrderDate(orderDate);
         logDto.setRiskSid(riskSid);
+        logDto.setPositionName(projectName);
         ThreadUtil.execute(() -> {
             try {
                 superviseWxMessSender.messagePushLogService.riskImgSave(logDto);