9/13

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

@@ -3,6 +3,7 @@ package com.yxt.supervise.report.api.imgmessageslog;
 import com.yxt.common.core.vo.Vo;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -26,13 +27,29 @@ public class ImgMessagesLogVo implements Vo {
     private String shSid;
     private List<String> devices;
     private String text;
+    List<Linkers> linkers;
+    private Integer count;
+    private List<String> message;
 
+    public List<String> getMessage() {
+        List<String> l=new ArrayList<>();
+        String[] keyValuePairs = content.split("[{;,}]");
+        for (String pair : keyValuePairs) {
+            // 按照等号拆分键和值
+            String[] keyValue = pair.split("=");
+            if (keyValue.length == 2) {
+                String key = keyValue[0].trim();
+                String value = keyValue[1].trim();
+                l.add(value);
+            }
+        }
+        this.message=l;
+        return message;
+    }
 
     public Map<String, String> getMap() {
         Map<String, String> strMap = new HashMap<>();
-
         String[] keyValuePairs = content.split("[{;,}]");
-
         for (String pair : keyValuePairs) {
             // 按照等号拆分键和值
             String[] keyValue = pair.split("=");

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

@@ -0,0 +1,13 @@
+package com.yxt.supervise.report.api.imgmessageslog;
+
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/9/12 15:28
+ */
+@Data
+public class Linkers {
+    String name;
+    String mobile;
+}

yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/messagepushlog/MessagePushLogVo.java

@@ -3,7 +3,9 @@ package com.yxt.supervise.report.api.messagepushlog;
 import com.yxt.common.core.vo.Vo;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -20,6 +22,24 @@ public class MessagePushLogVo implements Vo {
     //消息状态
     private String oState;
     private Map<String,String> map;
+    private Integer count;
+    private List<String> message;
+
+    public List<String> getMessage() {
+        List<String> l=new ArrayList<>();
+        String[] keyValuePairs = content.split("[{;,}]");
+        for (String pair : keyValuePairs) {
+            // 按照等号拆分键和值
+            String[] keyValue = pair.split("=");
+            if (keyValue.length == 2) {
+                String key = keyValue[0].trim();
+                String value = keyValue[1].trim();
+                l.add(value);
+            }
+        }
+        this.message=l;
+        return message;
+    }
 
 
     public Map<String, String> getMap() {

yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/messagetype/MessageType.java

@@ -0,0 +1,21 @@
+package com.yxt.supervise.report.api.messagetype;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.EntityWithId;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/27 9:56
+ */
+@ApiModel(value = "消息推送日志", description = "消息推送日志")
+@TableName("message_push_log")
+@Data
+public class MessageType {
+    private String id;
+    private String sid;
+    private String icon;
+    private String name;
+    private String code;
+}

yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/messagetype/MessageTypeDto.java

@@ -0,0 +1,20 @@
+package com.yxt.supervise.report.api.messagetype;
+
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/27 9:56
+ */
+@Data
+public class MessageTypeDto implements Dto {
+    private String id;
+    private String sid;
+    private String icon;
+    private String name;
+    private String code;
+}

yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/messagetype/MessageTypeQuery.java

@@ -0,0 +1,14 @@
+package com.yxt.supervise.report.api.messagetype;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/27 10:07
+ */
+@Data
+public class MessageTypeQuery implements Query {
+    private String wxCode;
+    private String userSid;
+}

yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/messagetype/MessageTypeVo.java

@@ -0,0 +1,24 @@
+package com.yxt.supervise.report.api.messagetype;
+
+import com.yxt.common.core.vo.Vo;
+import com.yxt.supervise.report.api.imgmessageslog.ImgMessagesLogVo;
+import com.yxt.supervise.report.api.messagepushlog.MessagePushLogVo;
+import com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLogVo;
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/27 9:57
+ */
+@Data
+public class MessageTypeVo implements Vo {
+    private String id;
+    private String sid;
+    private String icon;//图标
+    private String name;//标题名
+    private String code;//  消息code
+    private Object messageLogs; //数据消息
+}

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

@@ -1,8 +1,10 @@
 package com.yxt.supervise.report.api.riskmessageslog;
 
 import com.yxt.common.core.vo.Vo;
+import com.yxt.supervise.report.api.imgmessageslog.Linkers;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -25,7 +27,27 @@ public class RiskMessagesLogVo implements Vo {
     private String shName;
     private List<String> devices;
     private String text;
+    List<Linkers> linkers;
+    private String shSid;
+    private Integer count;
+    private List<String> message;
+    private String type;
 
+    public List<String> getMessage() {
+        List<String> l=new ArrayList<>();
+        String[] keyValuePairs = content.split("[{;,}]");
+        for (String pair : keyValuePairs) {
+            // 按照等号拆分键和值
+            String[] keyValue = pair.split("=");
+            if (keyValue.length == 2) {
+                String key = keyValue[0].trim();
+                String value = keyValue[1].trim();
+                l.add(value);
+            }
+        }
+        this.message=l;
+        return message;
+    }
 
     public Map<String, String> getMap() {
         Map<String, String> strMap = new HashMap<>();

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

@@ -24,4 +24,8 @@ public interface ImgMessagesLogMapper extends BaseMapper<ImgMessagesLog> {
     ImgMessagesLogVo getMessageBySid(@Param("sid") String sid);
     @Select("select sid from img_messages_log  order by messageTime desc limit 1")
     String getImgRiskByCode ();
+    @Select("select * from img_messages_log order by messageTime desc limit 1")
+    ImgMessagesLogVo getMessage();
+    @Select("select count(*) from img_messages_log i left join img_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/imgmessageslog/ImgMessagesLogService.java

@@ -11,19 +11,16 @@ 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;
-import com.yxt.supervise.report.api.imgmessageslog.ImgMessagesLog;
+import com.yxt.supervise.report.api.imgmessageslog.*;
-import com.yxt.supervise.report.api.imgmessageslog.ImgMessagesLogDto;
-import com.yxt.supervise.report.api.imgmessageslog.ImgMessagesLogQuery;
-import com.yxt.supervise.report.api.imgmessageslog.ImgMessagesLogVo;
 import com.yxt.supervise.report.api.imgmessageuser.ImgMessageUser;
 import com.yxt.supervise.report.api.messageopenid.MessageOpenid;
-import com.yxt.supervise.report.api.riskmessageuser.RiskMessageUser;
 import com.yxt.supervise.report.biz.imgmessageuser.ImgMessageUserService;
 import com.yxt.supervise.report.biz.messageopenid.MessageOpenidService;
 import com.yxt.supervise.report.biz.projectdaily.ProjectDailyRest;
 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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
@@ -48,6 +45,8 @@ public class ImgMessagesLogService extends MybatisBaseService<ImgMessagesLogMapp
     ProjectDailyRest projectDailyRest;
     @Autowired
     ImgMessageUserService imgMessageUserService;
+    @Autowired
+    WarehouseMapper warehouseMapper;
     public ResultBean save(ImgMessagesLogDto dto) {
         //删除同天同项目消息
         baseMapper.delete(new QueryWrapper<ImgMessagesLog>().eq("projectSid",dto.getProjectSid()).eq("orderDate",dto.getOrderDate()));
@@ -73,6 +72,16 @@ public class ImgMessagesLogService extends MybatisBaseService<ImgMessagesLogMapp
         vo.setShName(riskAlarm.getPositionName());
         vo.setText(riskAlarm.getContent());
         vo.setShSid(riskAlarm.getPositionSid());
+        List<Linkers> list=warehouseMapper.listBySid(vo.getShSid());
+        Linkers linkers=new Linkers();
+        Linkers linkers1=new Linkers();
+        linkers1.setMobile("22222222222");
+        linkers.setMobile("11111111111");
+        linkers.setName("张三");
+        linkers1.setName("李四");
+        list.add(linkers);
+        list.add(linkers1);
+        vo.setLinkers(list);
         ResultBean<JSONObject> rbJsonObject = projectDailyRest.wxLogin(wxCode, APP_ID, SECRET);
         JSONObject jsonObject = rbJsonObject.getData();
         String openid = jsonObject.get("openid").toString();

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/messagepushlog/MessagePushLogMapper.java

@@ -23,6 +23,8 @@ import java.util.List;
 @Mapper
 public interface MessagePushLogMapper extends BaseMapper<MessagePushLog> {
     @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);
+   Integer getCountByUser(@Param("openid") String openid,@Param("state")String state);
     IPage<MessagePushLogVo> selectPageVo(IPage<MessagePushLog> page, @Param(Constants.WRAPPER) Wrapper<MessagePushLog> qw);
+    @Select("select * from message_push_log order by messageTime desc limit 1")
+    MessagePushLogVo getMessage();
 }

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/messagepushlog/MessagePushLogService.java

@@ -157,8 +157,8 @@ public class MessagePushLogService extends MybatisBaseService<MessagePushLogMapp
         Map<String,Object> map=new HashMap<>();
 //        String openid=systemMapper.getAppletOpenidByUsersid(userSid);
         SysUser sysUser=systemMapper.getAppletOpenidByUsersid(userSid);
-        int pendingMessages=baseMapper.getAllByUserSid(sysUser.getAppletOpenid(),"0");
+        int pendingMessages=baseMapper.getCountByUser(sysUser.getAppletOpenid(),"0");
-        int readMessage=baseMapper.getAllByUserSid(sysUser.getAppletOpenid(),"1");
+        int readMessage=baseMapper.getCountByUser(sysUser.getAppletOpenid(),"1");
         List<String> list = new ArrayList<>();
         list.add("【一级风险】");
         list.add("【二级风险】");

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

@@ -0,0 +1,26 @@
+package com.yxt.supervise.report.biz.messagetype;
+
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.supervise.report.api.messagetype.MessageType;
+import com.yxt.supervise.report.api.messagetype.MessageTypeVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/27 9:56
+ */
+@Mapper
+public interface MessageTypeMapper extends BaseMapper<MessageType> {
+    @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);
+    @Select("select * from message_type")
+    List<MessageTypeVo> listAll();
+}

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

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.supervise.report.biz.messagetype.MessageTypeMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.supervise.report.api.messagetype.MessageTypeVo">
+        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>
+    <select id="getMessageType" resultType="com.yxt.supervise.report.api.messagetype.MessageTypeVo">
+        SELECT
+            *
+        FROM
+        report_sales_day_log
+        <where> ${ew.sqlSegment} </where>
+    </select>
+    <select id="getLogByOrderDate" resultType="com.yxt.supervise.report.api.messagetype.MessageTypeVo">
+        SELECT
+        *
+        FROM
+        report_sales_day_log
+        where
+            orderDate=#{orderDate}
+    </select>
+
+    <select id="getAllMessageType" resultType="com.yxt.supervise.report.api.messagetype.MessageTypeVo">
+        SELECT
+        *
+        FROM
+        report_sales_day_store
+        <where> ${ew.sqlSegment} </where>
+    </select>
+</mapper>

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

@@ -0,0 +1,40 @@
+package com.yxt.supervise.report.biz.messagetype;
+
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.supervise.report.api.messagetype.MessageTypeDto;
+import com.yxt.supervise.report.api.messagetype.MessageTypeQuery;
+import com.yxt.supervise.report.api.messagetype.MessageTypeVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/27 9:56
+ */
+@RestController
+@RequestMapping("/MessageType")
+public class MessageTypeRest {
+
+    @Autowired
+    MessageTypeService MessageTypeService;
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody MessageTypeDto dto){
+        return MessageTypeService.save(dto);
+    }
+    @PostMapping("/list")
+    public ResultBean list(@RequestBody MessageTypeQuery pq){
+        ResultBean rb = ResultBean.fireFail();
+        List<MessageTypeVo> pv = MessageTypeService.listAll(pq);
+        return rb.success().setData(pv);
+    }
+
+
+
+
+
+}

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

@@ -0,0 +1,116 @@
+package com.yxt.supervise.report.biz.messagetype;
+
+
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSONObject;
+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.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.supervise.report.api.imgmessageslog.ImgMessagesLog;
+import com.yxt.supervise.report.api.imgmessageslog.ImgMessagesLogDto;
+import com.yxt.supervise.report.api.imgmessageslog.ImgMessagesLogVo;
+import com.yxt.supervise.report.api.imgmessageuser.ImgMessageUser;
+import com.yxt.supervise.report.api.messageopenid.MessageOpenid;
+import com.yxt.supervise.report.api.messagepushlog.MessagePushLog;
+import com.yxt.supervise.report.api.messagepushlog.MessagePushLogVo;
+import com.yxt.supervise.report.api.messagetype.MessageType;
+import com.yxt.supervise.report.api.messagetype.MessageTypeDto;
+import com.yxt.supervise.report.api.messagetype.MessageTypeQuery;
+import com.yxt.supervise.report.api.messagetype.MessageTypeVo;
+import com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLog;
+import com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLogDto;
+import com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLogVo;
+import com.yxt.supervise.report.api.riskmessageuser.RiskMessageUser;
+import com.yxt.supervise.report.api.systemriskmessageslog.SystemRiskMessagesLog;
+import com.yxt.supervise.report.api.systemriskmessageslog.SystemRiskMessagesLogDto;
+import com.yxt.supervise.report.api.systemriskmessageuser.SystemRiskMessageUser;
+import com.yxt.supervise.report.biz.imgmessageslog.ImgMessagesLogMapper;
+import com.yxt.supervise.report.biz.imgmessageslog.ImgMessagesLogService;
+import com.yxt.supervise.report.biz.imgmessageuser.ImgMessageUserService;
+import com.yxt.supervise.report.biz.messageopenid.MessageOpenidService;
+import com.yxt.supervise.report.biz.messagepushlog.MessagePushLogMapper;
+import com.yxt.supervise.report.biz.projectdaily.ProjectDailyRest;
+import com.yxt.supervise.report.biz.riskmessageslog.RiskMessagesLogMapper;
+import com.yxt.supervise.report.biz.riskmessageslog.RiskMessagesLogService;
+import com.yxt.supervise.report.biz.riskmessageuser.RiskMessageUserService;
+import com.yxt.supervise.report.biz.systemriskmessageslog.SystemRiskMessagesLogService;
+import com.yxt.supervise.report.biz.systemriskmessageuser.SystemRiskMessageUserService;
+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 org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/27 9:56
+ */
+@Service
+public class MessageTypeService extends MybatisBaseService<MessageTypeMapper, MessageType> {
+    @Autowired
+    ImgMessagesLogMapper imgMessagesLogMapper;
+    @Autowired
+    RiskMessagesLogMapper riskMessagesLogMapper;
+    @Autowired
+    MessagePushLogMapper messagePushLogMapper;
+    @Autowired
+    com.yxt.supervise.report.ds.system.systemMapper systemMapper;
+    @Autowired
+    ProjectDailyRest projectDailyRest;
+    @Autowired
+    RmsMapper rmsMapper;
+
+    public ResultBean save(MessageTypeDto dto) {
+        //删除同天同项目消息
+//        baseMapper.delete(new QueryWrapper<MessageType>().eq("projectSid",dto.getProjectSid()).eq("orderDate",dto.getOrderDate()));
+        ResultBean rb=new ResultBean();
+        MessageType entity=new MessageType();
+        BeanUtil.copyProperties(dto, entity, "id");
+        entity.setSid(UUID.randomUUID().toString());
+        baseMapper.insert(entity);
+        return rb.success().setMsg("保存成功");
+
+    }
+    public List<MessageTypeVo> listAll(MessageTypeQuery query) {
+        ResultBean rb=new ResultBean();
+        String openId="";
+        if (org.apache.commons.lang3.StringUtils.isNoneBlank(query.getUserSid())) {
+            SysUser sysUser = systemMapper.getAppletOpenidByUsersid(query.getUserSid());
+            openId=sysUser.getAppletOpenid();
+        } else if (org.apache.commons.lang3.StringUtils.isNoneBlank(query.getWxCode())) {
+            ResultBean<JSONObject> rbJsonObject = projectDailyRest.wxLogin(query.getWxCode(), "APP_ID", "SECRET");
+            JSONObject jsonObject = rbJsonObject.getData();
+            openId = jsonObject.get("openid").toString();
+        }
+        List<MessageTypeVo> pagging = baseMapper.listAll();
+        for(MessageTypeVo messageTypeVo:pagging){
+            if(messageTypeVo.getCode().equals("1001")){
+                ImgMessagesLogVo imgMessagesLogVo=imgMessagesLogMapper.getMessage();
+                messageTypeVo.setMessageLogs(imgMessagesLogVo);
+                imgMessagesLogVo.setCount(imgMessagesLogMapper.getMessageCount(openId));
+            }else if(messageTypeVo.getCode().equals("1002")){
+                MessagePushLogVo messagePushLogVo= messagePushLogMapper.getMessage();
+                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));
+            }
+        }
+        return pagging;
+    }
+
+
+
+
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/projectdaily/ProjectDailyRest.java

@@ -164,7 +164,7 @@ public class ProjectDailyRest {
 
     public ResultBean<JSONObject> wxLogin(String jsCode, String appid, String secret) {
         ResultBean rb = new ResultBean();
-        String url = WX_URL_LOGIN.replace("APPID", appid).replace("SECRET", secret).replace("JSCODE", jsCode).replace("authorization_code", "authorization_code");
+        String url = WX_URL_LOGIN.replace("APPID", APP_ID).replace("SECRET", SECRET).replace("JSCODE", jsCode).replace("authorization_code", "authorization_code");
         RestTemplate restTemplate = new RestTemplate();
         ResponseEntity<String> forEntity = restTemplate.getForEntity(url, String.class);
         JSONObject jsonObject = JSONObject.parseObject(forEntity.getBody());

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

@@ -22,4 +22,8 @@ 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")
+    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/RiskMessagesLogService.java

@@ -11,6 +11,7 @@ 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;
+import com.yxt.supervise.report.api.imgmessageslog.Linkers;
 import com.yxt.supervise.report.api.imgmessageuser.ImgMessageUser;
 import com.yxt.supervise.report.api.messageopenid.MessageOpenid;
 import com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLog;
@@ -24,6 +25,7 @@ import com.yxt.supervise.report.biz.riskmessageuser.RiskMessageUserService;
 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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -47,6 +49,8 @@ public class RiskMessagesLogService extends MybatisBaseService<RiskMessagesLogMa
     ProjectDailyRest projectDailyRest;
     @Autowired
     RiskMessageUserService riskMessageUserService;
+    @Autowired
+    WarehouseMapper warehouseMapper;
     public ResultBean save(RiskMessagesLogDto dto) {
         //删除同天同项目消息
         baseMapper.delete(new QueryWrapper<RiskMessagesLog>().eq("projectSid",dto.getProjectSid()).eq("orderDate",dto.getOrderDate()));
@@ -71,6 +75,16 @@ public class RiskMessagesLogService extends MybatisBaseService<RiskMessagesLogMa
         RiskMessagesLogVo vo= baseMapper.getMessageBySid(riskAlarm.getSid());
         vo.setShName(riskAlarm.getPositionName());
         vo.setText(riskAlarm.getContent());
+        List<Linkers> list=warehouseMapper.listBySid(vo.getShSid());
+        Linkers linkers=new Linkers();
+        Linkers linkers1=new Linkers();
+        linkers1.setMobile("22222222222");
+        linkers.setMobile("11111111111");
+        linkers.setName("张三");
+        linkers1.setName("李四");
+        list.add(linkers);
+        list.add(linkers1);
+        vo.setLinkers(list);
         ResultBean<JSONObject> rbJsonObject = projectDailyRest.wxLogin(wxCode, APP_ID, SECRET);
         JSONObject jsonObject = rbJsonObject.getData();
         String openid = jsonObject.get("openid").toString();

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatRest.java

@@ -478,7 +478,7 @@ public class WechatRest {
         System.out.println(r);
     }
     @GetMapping("/sysErrMessage")
-    public void sysErrMessage(@RequestParam("riskSid") String riskSid){
+    public void sysErrMessage(@RequestParam("shSid")String shSid,@RequestParam("riskSid") String riskSid){
         //String messSid=imgMessagesLogMapper.getImgRiskByCode();
         RespMessReturn r=new RespMessReturn();
         //List<UserProject> user= crmMapper.users(shSid);
@@ -509,12 +509,12 @@ public class WechatRest {
 //                }
 //            }
 //        }
-        //String projectSid=crmMapper.ProjectSidByshSid(shSid);
+        String projectSid=crmMapper.ProjectSidByshSid(shSid);
-        //String name=warehouseMapper.getNameBySid(shSid);
+        String name=warehouseMapper.getNameBySid(shSid);
         SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         // 公众号的模板id(也有相应的接口可以查询到)
         //sendVerificationCode(name,mobiles,"030405");
-        r= SuperviseWxMessSender.sysErrSend(openIds,riskSid,riskSid,ft.format(new Date()));
+        r= SuperviseWxMessSender.sysErrSend(openIds,riskSid,name,shSid,riskSid,ft.format(new Date()));
         System.out.println(r);
     }
     public ResultBean sendVerificationCode(String shName, List<String> users,String type) {

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

@@ -69,4 +69,5 @@ public class RiskAlarm {
     @ApiModelProperty("风险类别名称")
     private String typeName;
     private String content;
+    private String zt;
 }

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

@@ -11,7 +11,15 @@ import java.util.List;
 @DS("rms")
 @Mapper
 public interface RmsMapper extends BaseMapper<RiskAlarm> {
-    @Select("select * from risk_alarm where sid =#{sid}")
+    @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}")
     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/ds/warehouse/WarehouseMapper.java

@@ -2,8 +2,8 @@ package com.yxt.supervise.report.ds.warehouse;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.supervise.report.api.imgmessageslog.Linkers;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -22,4 +22,6 @@ public interface WarehouseMapper extends BaseMapper<StoreHouse> {
     List<ProdStock> listStock(String sid);
     @Select("select name from sh_storehouse where sid=#{sid}")
     String getNameBySid(String sid);
+    @Select("select linker_name as name ,linker_phone as mobile from sh_storehouse where sid=#{sid}")
+    List<Linkers> listBySid(String sid);
 }

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

@@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 
@@ -142,10 +143,10 @@ public class SuperviseWxMessSender {
         });
         return respMessReturn;
     }
-    public static RespMessReturn sysErrSend(List<String> tousers,String riskSid, String messSid,String reportTime) {
+    public static RespMessReturn sysErrSend(List<String> tousers,String name,String shSid,String riskSid, String messSid,String reportTime) {
         RespMessReturn respMessReturn=new RespMessReturn();
         String orderDate = reportTime.substring(0, 10);
-        String pagepath ="pages/index/GoodsException"+"?sid="+messSid;
+        String pagepath ="pages/index/SystemFailure"+"?name="+name+"&"+"date="+reportTime+"&shSid="+shSid;
         HashMap<String, String> data = new HashMap<>();
         data.put("thing2", "系统异常");
         data.put("thing3", "监管平台");

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

@@ -72,4 +72,5 @@ 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,6 +121,7 @@ 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(()->{
@@ -140,6 +141,7 @@ public class RiskAlarmService extends MybatisBaseService<RiskAlarmMapper, RiskAl
             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");
@@ -183,6 +185,7 @@ 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");
             }
@@ -219,7 +222,7 @@ public class RiskAlarmService extends MybatisBaseService<RiskAlarmMapper, RiskAl
                 });
             }else if (type.equals("030406")){
                 ThreadUtil.execute(()->{
-                    wechatFeign.sysErrMessage(riskAlarm.getSid());
+                    wechatFeign.sysErrMessage(shSid,riskAlarm.getSid());
                 });
             }
         }else{
@@ -257,7 +260,7 @@ public class RiskAlarmService extends MybatisBaseService<RiskAlarmMapper, RiskAl
                 }else if (type.equals("030406")){
                     baseMapper.insert(riskAlarm);
                     ThreadUtil.execute(()->{
-                        wechatFeign.sysErrMessage(riskAlarmVo.getSid());
+                        wechatFeign.sysErrMessage(shSid,riskAlarmVo.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,6 +74,7 @@ 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");

yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/feign/report/WechatFeign.java

@@ -20,7 +20,7 @@ public interface WechatFeign {
     @GetMapping("/shImgMessage")
     public void shImgMessage(@RequestParam("shSid") String shSid,@RequestParam("riskSid") String riskSid);
     @GetMapping("/sysErrMessage")
-    public void sysErrMessage(@RequestParam("riskSid") String riskSid);
+    public void sysErrMessage(@RequestParam("shSid") String shSid,@RequestParam("riskSid") String riskSid);
     @GetMapping("/secureMessage")
     public void secureMessage(@RequestParam("shSid") String shSid,@RequestParam("riskSid") String riskSid);
 }