监控预警

yxt/yxt-common/yxt-common-base/src/main/java/com/yxt/common/base/utils/MsgWs.java

@@ -12,7 +12,7 @@ import javax.xml.namespace.QName;
  * @description 发送短信调用接口
  */
 public class MsgWs {
-	 private static  String msgSign="【计量业务应用平台】";
+	 private static  String msgSign="【云仓贷后】";
 //	    private static  String msgtitle="河北省计量业务应用平台提醒：";
 	public static String MSG_NEWPWD="用户，您好！您的新密码为：";
     public static String MSG_VERIFY = "用户，您好！您注册的单位已审核通过，管理员的密码为：";

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/storehouseproject/StoreHouseProjectMapper.java

@@ -17,6 +17,8 @@ import java.util.List;
 public interface StoreHouseProjectMapper extends BaseMapper<StoreHouseProject> {
     @Select("select * from storehouse_project where projectSid=#{sid}")
     List<StoreHouseProjectVo> selectStoreBySid(@Param("sid")String sid);
+    @Select("select * from storehouse_project where shSid=#{sid}")
+    StoreHouseProjectVo selectProjectByshSid(@Param("sid")String sid);
     @Select("select shSid from storehouse_project")
     List<String> getAllShSid();
 }

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/storehouseproject/StoreHouseProjectRest.java

@@ -41,4 +41,11 @@ public class StoreHouseProjectRest {
         List<StoreHouseProjectVo>list= storeHouseProjectService.selectStoreBySid(sid);
         return rb.success().setData(list);
     }
+    @ApiOperation("根据仓库sid查询项目信息")
+    @PostMapping("/selectProjectByshSid/{sid}")
+    public ResultBean<StoreHouseProjectVo> selectProjectByshSid(@PathVariable("sid")String sid){
+        ResultBean rb = ResultBean.fireFail();
+        StoreHouseProjectVo  list= storeHouseProjectService.selectProjectByshSid(sid);
+        return rb.success().setData(list);
+    }
 }

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/storehouseproject/StoreHouseProjectService.java

@@ -77,6 +77,11 @@ public class StoreHouseProjectService extends MybatisBaseService<StoreHouseProje
         }
         return pagging;
     }
+    public StoreHouseProjectVo selectProjectByshSid(String sid) {
+        StoreHouseProjectVo pagging = baseMapper.selectProjectByshSid(sid);
+        return pagging;
+    }
+
     public List<String> getAllShSid() {
         List<String> pagging = baseMapper.getAllShSid();
         return pagging;

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectMapper.java

@@ -20,5 +20,6 @@ public interface UserProjectMapper extends BaseMapper<UserProject> {
     IPage<UserProjectVo> selectPageVo(IPage<UserProject> page, @Param(Constants.WRAPPER) Wrapper<UserProject> qw);
     List<UserProjectVo> userProjectList();
     List<UserProjectVo> getUserProjectBySid( @Param("projectSid") String projectSid,@Param("userType")String userType);
+    List<String> getUsersByprojectSid( @Param("projectSid") String projectSid);
 
 }

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectMapper.xml

@@ -19,4 +19,7 @@
     <select id="getUserProjectBySid" resultType="com.yxt.supervise.crm.api.userproject.UserProjectVo">
         SELECT * FROM user_project WHERE projectSid=#{projectSid} and userType=#{userType}
     </select>
+    <select id="getUsersByprojectSid" resultType="com.yxt.supervise.crm.api.userproject.UserProjectVo">
+        SELECT userSid FROM user_project WHERE projectSid=#{projectSid}
+    </select>
 </mapper>

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectRest.java

@@ -52,7 +52,7 @@ public class UserProjectRest {
     public ResultBean update(@RequestBody UserProjectDto dto) {
         return UserProjectService.update(dto);
     }
-    @ApiOperation("根据项目sid查询")
+    @ApiOperation("根据项目sid查询不同类人")
     @GetMapping("/getUserProjectBySid/{projectSid}")
     public ResultBean getWarehouse(@PathVariable String projectSid){
         ResultBean rb = ResultBean.fireFail();
@@ -74,6 +74,11 @@ public class UserProjectRest {
         return UserProjectService.delete(sid);
     }
 
-
+    @ApiOperation("根据项目sid查询")
+    @GetMapping("/getUsersByprojectSid")
+    public ResultBean<List<String>> getUsersByprojectSid(@RequestParam("projectSid") String projectSid){
+        ResultBean rb = ResultBean.fireFail();
+        return UserProjectService.getUsersByprojectSid(projectSid);
+    }
 
 }

yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectService.java

@@ -81,6 +81,12 @@ public class UserProjectService extends MybatisBaseService<UserProjectMapper, Us
         map.put("users",users);
         return rb.success().setData(map);
     }
+    public ResultBean<List<String>> getUsersByprojectSid(String projectSid){
+        ResultBean rb=new ResultBean();
+        List<String> banks=baseMapper.getUsersByprojectSid(projectSid);
+        return rb.success().setData(banks);
+    }
+
     public ResultBean delete(String sid) {
         ResultBean rb=new ResultBean();
         baseMapper.delete(new QueryWrapper<UserProject>().eq("sid",sid));

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

@@ -0,0 +1,23 @@
+package com.yxt.supervise.report.api.imgmessageslog;
+
+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("risk_messages_log")
+@Data
+public class ImgMessagesLog extends EntityWithId {
+    private String sid;
+    private String messageTime;
+    private String pagepath;
+    private String content;
+    private String projectSid;
+    private String orderDate;
+    private String riskSid;
+}

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

@@ -0,0 +1,26 @@
+package com.yxt.supervise.report.api.imgmessageslog;
+
+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 ImgMessagesLogDto implements Dto {
+    private String id;
+    private String sid;
+    private String messageTime;
+    private String pagepath;
+    //private Map<String, Template> content;
+    private Map<String, String> content;
+    private List<String> messageOpenids;
+    private String openid;//小程序openid
+    private String projectSid;
+    private String orderDate;
+    private String riskSid;
+}

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

@@ -0,0 +1,14 @@
+package com.yxt.supervise.report.api.imgmessageslog;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/27 10:07
+ */
+@Data
+public class ImgMessagesLogQuery implements Query {
+    private String userSid;
+    private String state;//0未读  1 已读 2全部
+}

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

@@ -0,0 +1,47 @@
+package com.yxt.supervise.report.api.imgmessageslog;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/27 9:57
+ */
+@Data
+public class ImgMessagesLogVo implements Vo {
+    private String id;
+    private String sid;
+    private String messageTime;
+    private String pagepath;
+    private String content;
+    //消息状态
+    private String oState;
+    private Map<String,String> map;
+    private String riskSid;
+    private String shName;
+    private List<String> devices;
+    private String text;
+
+
+    public Map<String, String> getMap() {
+        Map<String, String> strMap = new HashMap<>();
+
+        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();
+                strMap.put(key, value);
+            }
+        }
+        this.map = strMap;
+        return map;
+    }
+}

yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/imgmessageuser/ImgMessageUser.java

@@ -0,0 +1,20 @@
+package com.yxt.supervise.report.api.imgmessageuser;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/27 10:34
+ */
+@ApiModel(value = "消息用户微信openid关联", description = "消息用户微信openid关联")
+@TableName("risk_message_user")
+@Data
+public class ImgMessageUser {
+    private String id;
+    private String sid;
+    private String messageSid;
+    private String openId;
+    private String state;
+}

yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/imgmessageuser/ImgMessageUserDto.java

@@ -0,0 +1,17 @@
+package com.yxt.supervise.report.api.imgmessageuser;
+
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/27 10:34
+ */
+@Data
+public class ImgMessageUserDto implements Dto {
+    private String id;
+    private String sid;
+    private String messageSid;
+    private String openId;
+    private String state;
+}

yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/imgmessageuser/ImgMessageUserQuery.java

@@ -0,0 +1,17 @@
+package com.yxt.supervise.report.api.imgmessageuser;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/27 10:35
+ */
+@Data
+public class ImgMessageUserQuery implements Query {
+    private String id;
+    private String sid;
+    private String messageSid;
+    private String openId;
+    private String state;
+}

yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/imgmessageuser/ImgMessageUserVo.java

@@ -0,0 +1,17 @@
+package com.yxt.supervise.report.api.imgmessageuser;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/27 10:35
+ */
+@Data
+public class ImgMessageUserVo implements Vo {
+    private String id;
+    private String sid;
+    private String messageSid;
+    private String openId;
+    private String state;
+}

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

@@ -0,0 +1,23 @@
+package com.yxt.supervise.report.api.riskmessageslog;
+
+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("risk_messages_log")
+@Data
+public class RiskMessagesLog extends EntityWithId {
+    private String sid;
+    private String messageTime;
+    private String pagepath;
+    private String content;
+    private String projectSid;
+    private String orderDate;
+    private String riskSid;
+}

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

@@ -0,0 +1,26 @@
+package com.yxt.supervise.report.api.riskmessageslog;
+
+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 RiskMessagesLogDto implements Dto {
+    private String id;
+    private String sid;
+    private String messageTime;
+    private String pagepath;
+    //private Map<String, Template> content;
+    private Map<String, String> content;
+    private List<String> messageOpenids;
+    private String openid;//小程序openid
+    private String projectSid;
+    private String orderDate;
+    private String riskSid;
+}

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

@@ -0,0 +1,14 @@
+package com.yxt.supervise.report.api.riskmessageslog;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/27 10:07
+ */
+@Data
+public class RiskMessagesLogQuery implements Query {
+    private String userSid;
+    private String state;//0未读  1 已读 2全部
+}

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

@@ -0,0 +1,47 @@
+package com.yxt.supervise.report.api.riskmessageslog;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/27 9:57
+ */
+@Data
+public class RiskMessagesLogVo implements Vo {
+    private String id;
+    private String sid;
+    private String messageTime;
+    private String pagepath;
+    private String content;
+    //消息状态
+    private String oState;
+    private Map<String,String> map;
+    private String riskSid;
+    private String shName;
+    private List<String> devices;
+    private String text;
+
+
+    public Map<String, String> getMap() {
+        Map<String, String> strMap = new HashMap<>();
+
+        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();
+                strMap.put(key, value);
+            }
+        }
+        this.map = strMap;
+        return map;
+    }
+}

yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/riskmessageuser/RiskMessageUser.java

@@ -0,0 +1,20 @@
+package com.yxt.supervise.report.api.riskmessageuser;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/27 10:34
+ */
+@ApiModel(value = "消息用户微信openid关联", description = "消息用户微信openid关联")
+@TableName("risk_message_user")
+@Data
+public class RiskMessageUser {
+    private String id;
+    private String sid;
+    private String messageSid;
+    private String openId;
+    private String state;
+}

yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/riskmessageuser/RiskMessageUserDto.java

@@ -0,0 +1,17 @@
+package com.yxt.supervise.report.api.riskmessageuser;
+
+import com.yxt.common.core.dto.Dto;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/27 10:34
+ */
+@Data
+public class RiskMessageUserDto implements Dto {
+    private String id;
+    private String sid;
+    private String messageSid;
+    private String openId;
+    private String state;
+}

yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/riskmessageuser/RiskMessageUserQuery.java

@@ -0,0 +1,17 @@
+package com.yxt.supervise.report.api.riskmessageuser;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/27 10:35
+ */
+@Data
+public class RiskMessageUserQuery implements Query {
+    private String id;
+    private String sid;
+    private String messageSid;
+    private String openId;
+    private String state;
+}

yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/riskmessageuser/RiskMessageUserVo.java

@@ -0,0 +1,17 @@
+package com.yxt.supervise.report.api.riskmessageuser;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/27 10:35
+ */
+@Data
+public class RiskMessageUserVo implements Vo {
+    private String id;
+    private String sid;
+    private String messageSid;
+    private String openId;
+    private String state;
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreport/CsmCashReportRest.java

@@ -12,7 +12,7 @@ import com.yxt.supervise.report.api.csmcashreport.CsmCashReportVo;
 import com.yxt.supervise.report.api.csmcashreportcashedtoday.CsmCashReportCashedTodayVo;
 import com.yxt.supervise.report.api.csmcashreportsalesyesterday.CsmCashReportSalesYesterdayVo;
 import com.yxt.supervise.report.api.reportsalesdaystore.ReportSalesDayStoreDto;
-import com.yxt.supervise.report.biz.csmcashlog.CsmCashLogService;
+//import com.yxt.supervise.report.biz.csmcashlog.CsmCashLogService;
 import com.yxt.supervise.report.biz.csmcashreportcashedtoday.CsmCashReportCashedTodayService;
 import com.yxt.supervise.report.biz.csmcashreportsalesyesterday.CsmCashReportSalesYesterdayService;
 import com.yxt.supervise.report.biz.wechat.WechatRest;
@@ -45,8 +45,8 @@ public class CsmCashReportRest {
     CsmCashReportCashedTodayService csmCashReportCashedTodayService;
     @Autowired
     CsmCashReportSalesYesterdayService csmCashReportSalesYesterdayService;
-    @Autowired
+//    @Autowired
-    CsmCashLogService csmCashLogService;
+//    CsmCashLogService csmCashLogService;
     @Autowired
     WechatRest wechatRest;
 

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

@@ -0,0 +1,25 @@
+package com.yxt.supervise.report.biz.imgmessageslog;
+
+
+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.imgmessageslog.ImgMessagesLog;
+import com.yxt.supervise.report.api.imgmessageslog.ImgMessagesLogVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/27 9:56
+ */
+@Mapper
+public interface ImgMessagesLogMapper extends BaseMapper<ImgMessagesLog> {
+    @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<ImgMessagesLogVo> selectPageVo(IPage<ImgMessagesLog> page, @Param(Constants.WRAPPER) Wrapper<ImgMessagesLog> qw);
+    @Select("select * from risk_messages_log where sid =#{sid} order by messageTime desc limit 1")
+    ImgMessagesLogVo getMessageBySid(@Param("sid") String sid);
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageslog/ImgMessagesLogMapper.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.imgmessageslog.ImgMessagesLogMapper">
+    <!--    <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>
+    <select id="getImgMessagesLog" resultType="com.yxt.supervise.report.api.imgmessageslog.ImgMessagesLogVo">
+        SELECT
+            *
+        FROM
+        report_sales_day_log
+        <where> ${ew.sqlSegment} </where>
+    </select>
+    <select id="getLogByOrderDate" resultType="com.yxt.supervise.report.api.imgmessageslog.ImgMessagesLogVo">
+        SELECT
+        *
+        FROM
+        report_sales_day_log
+        where
+            orderDate=#{orderDate}
+    </select>
+
+    <select id="getAllImgMessagesLog" resultType="com.yxt.supervise.report.api.imgmessageslog.ImgMessagesLogVo">
+        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/imgmessageslog/ImgMessagesLogRest.java

@@ -0,0 +1,54 @@
+package com.yxt.supervise.report.biz.imgmessageslog;
+
+
+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.ImgMessagesLogDto;
+import com.yxt.supervise.report.api.imgmessageslog.ImgMessagesLogQuery;
+import com.yxt.supervise.report.api.imgmessageslog.ImgMessagesLogVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/27 9:56
+ */
+@RestController
+@RequestMapping("/ImgMessagesLog")
+public class ImgMessagesLogRest {
+
+    @Autowired
+    ImgMessagesLogService ImgMessagesLogService;
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody ImgMessagesLogDto dto){
+        return ImgMessagesLogService.save(dto);
+    }
+    @PostMapping("/listPage")
+    public ResultBean listPage(@RequestBody PagerQuery<ImgMessagesLogQuery> pq){
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<ImgMessagesLogVo> pv = ImgMessagesLogService.listPage(pq);
+        return rb.success().setData(pv);
+    }
+    @GetMapping("/getMessageBySid/{sid}")
+    public ResultBean getMessageBySid(@PathVariable("sid") String sid ){
+        return ImgMessagesLogService.getMessageBySid(sid);
+    }
+    /**
+     * 查询待阅 已阅消息数量
+     * @param userSid
+     * @return
+     */
+    @GetMapping("/numberOfJobs/{userSid}")
+    public ResultBean numberOfJobs(@PathVariable("userSid")String userSid){
+        return ImgMessagesLogService.numberOfJobs(userSid);
+    }
+
+    @PostMapping("/changeState")
+    public ResultBean changeState(@RequestBody PagerQuery<ImgMessagesLogQuery> pq){
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<ImgMessagesLogVo> pv = ImgMessagesLogService.listPage(pq);
+        return rb.success().setData(pv);
+    }
+
+}

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

@@ -0,0 +1,125 @@
+package com.yxt.supervise.report.biz.imgmessageslog;
+
+
+import cn.hutool.core.bean.BeanUtil;
+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;
+import com.yxt.supervise.report.api.imgmessageslog.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.messageopenid.MessageOpenid;
+import com.yxt.supervise.report.biz.messageopenid.MessageOpenidService;
+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.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/27 9:56
+ */
+@Service
+public class ImgMessagesLogService extends MybatisBaseService<ImgMessagesLogMapper, ImgMessagesLog> {
+    @Autowired
+    MessageOpenidService messageOpenidService;
+    @Autowired
+    com.yxt.supervise.report.ds.system.systemMapper systemMapper;
+    @Autowired
+    RmsMapper rmsMapper;
+    public ResultBean save(ImgMessagesLogDto dto) {
+        //删除同天同项目消息
+        baseMapper.delete(new QueryWrapper<ImgMessagesLog>().eq("projectSid",dto.getProjectSid()).eq("orderDate",dto.getOrderDate()));
+        ResultBean rb=new ResultBean();
+        ImgMessagesLog entity=new ImgMessagesLog();
+        BeanUtil.copyProperties(dto, entity, "id");
+        entity.setSid(UUID.randomUUID().toString());
+        baseMapper.insert(entity);
+        for(String openid:dto.getMessageOpenids()){
+            MessageOpenid messageOpenid=new MessageOpenid();
+            messageOpenid.setOpenId(openid);
+            messageOpenid.setMessageSid(entity.getSid());
+            messageOpenid.setSid(UUID.randomUUID().toString());
+            messageOpenidService.save(messageOpenid);
+        }
+        return rb.success().setMsg("保存成功");
+
+    }
+    public ResultBean getMessageBySid(String sid) {
+        ResultBean rb=new ResultBean();
+        ImgMessagesLogVo vo= baseMapper.getMessageBySid(sid);
+        RiskAlarm riskAlarm=rmsMapper.getRiskByMessSid(vo.getRiskSid());
+        vo.setShName(riskAlarm.getPositionName());
+        String [] split=riskAlarm.getRemarks().split(",");
+        List<String> list=new ArrayList<>();
+        for (String u:split){
+            list.add(u);
+        }
+        vo.setDevices(list);
+        return rb.success().setData(vo);
+
+    }
+    public PagerVo<ImgMessagesLogVo> listPage(PagerQuery<ImgMessagesLogQuery> pq) {
+        ResultBean rb=new ResultBean();
+        ImgMessagesLogQuery query = pq.getParams();
+//        String openid=systemMapper.getAppletOpenidByUsersid(query.getUserSid());
+        SysUser sysUser=systemMapper.getAppletOpenidByUsersid(query.getUserSid());
+        IPage<ImgMessagesLog> page = PagerUtil.queryToPage(pq);
+        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);
+            }
+        }
+        IPage<ImgMessagesLogVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<ImgMessagesLogVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+    public ResultBean numberOfJobs(String userSid){
+        ResultBean rb =new ResultBean();
+        Map<String,Object> map=new HashMap<>();
+//        String openid=systemMapper.getAppletOpenidByUsersid(userSid);
+        SysUser sysUser=systemMapper.getAppletOpenidByUsersid(userSid);
+        int pendingMessages=baseMapper.getAllByUserSid(sysUser.getAppletOpenid(),"0");
+        int readMessage=baseMapper.getAllByUserSid(sysUser.getAppletOpenid(),"1");
+        List<String> list = new ArrayList<>();
+        list.add("【一级风险】");
+        list.add("【二级风险】");
+        list.add("【三级风险】");
+        list.add("【四级风险】");
+        String[] urls = {"http://jianguan.yyundong.com/img/banner001.jpg"};
+        map.put("readMessage",readMessage);
+        map.put("pendingMessages",pendingMessages);
+        map.put("urls",urls);
+        map.put("notice",list);
+        return rb.success().setData(map);
+    }
+
+
+    public PagerVo<ImgMessagesLogVo> changeState(PagerQuery<ImgMessagesLogQuery> pq) {
+        ResultBean rb=new ResultBean();
+        ImgMessagesLogQuery query = pq.getParams();
+//        String openid=systemMapper.getAppletOpenidByUsersid(query.getUserSid());
+        IPage<ImgMessagesLog> page = PagerUtil.queryToPage(pq);
+        SysUser sysUser=systemMapper.getAppletOpenidByUsersid(query.getUserSid());
+        QueryWrapper<ImgMessagesLog> qw = new QueryWrapper<>();
+        qw.eq("o.openId",sysUser.getAppletOpenid());
+        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/imgmessageuser/ImgMessageUserMapper.java

@@ -0,0 +1,16 @@
+package com.yxt.supervise.report.biz.imgmessageuser;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.supervise.report.api.imgmessageuser.ImgMessageUser;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/27 9:56
+ */
+@Mapper
+public interface ImgMessageUserMapper extends BaseMapper<ImgMessageUser> {
+
+
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageuser/ImgMessageUserMapper.xml

@@ -0,0 +1,29 @@
+<?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.imgmessageuser.ImgMessageUserMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="getImgMessageUser" resultType="com.yxt.supervise.report.api.imgmessageuser.ImgMessageUserVo">
+        SELECT
+            *
+        FROM
+        report_sales_day_log
+        <where> ${ew.sqlSegment} </where>
+    </select>
+    <select id="getLogByOrderDate" resultType="com.yxt.supervise.report.api.imgmessageuser.ImgMessageUserVo">
+        SELECT
+        *
+        FROM
+        report_sales_day_log
+        where
+            orderDate=#{orderDate}
+    </select>
+
+    <select id="getAllImgMessageUser" resultType="com.yxt.supervise.report.api.imgmessageuser.ImgMessageUserVo">
+        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/imgmessageuser/ImgMessageUserRest.java

@@ -0,0 +1,29 @@
+package com.yxt.supervise.report.biz.imgmessageuser;
+
+
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.supervise.report.api.imgmessageuser.ImgMessageUserDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/27 9:56
+ */
+@RestController
+@RequestMapping("/ImgMessageUser")
+public class ImgMessageUserRest {
+
+    @Autowired
+    ImgMessageUserService ImgMessageUserService;
+
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody List<ImgMessageUserDto> dto){
+        return ImgMessageUserService.save(dto);
+    }
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageuser/ImgMessageUserService.java

@@ -0,0 +1,32 @@
+package com.yxt.supervise.report.biz.imgmessageuser;
+
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.supervise.report.api.imgmessageuser.ImgMessageUser;
+import com.yxt.supervise.report.api.imgmessageuser.ImgMessageUserDto;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.UUID;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/27 9:56
+ */
+@Service
+public class ImgMessageUserService extends MybatisBaseService<ImgMessageUserMapper, ImgMessageUser> {
+
+    public ResultBean save(List<ImgMessageUserDto> dto) {
+        ResultBean rb=new ResultBean();
+        for(ImgMessageUserDto dto1:dto){
+            ImgMessageUser entity=new ImgMessageUser();
+            BeanUtil.copyProperties(dto1, entity, "id");
+            entity.setSid(UUID.randomUUID().toString());
+            baseMapper.insert(entity);
+        }
+        return rb.success().setMsg("保存成功");
+
+    }
+}

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

@@ -10,6 +10,9 @@ 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.ImgMessagesLogDto;
+import com.yxt.supervise.report.api.imgmessageuser.ImgMessageUser;
 import com.yxt.supervise.report.api.messageopenid.MessageOpenid;
 import com.yxt.supervise.report.api.messageopenid.MessageOpenidDto;
 import com.yxt.supervise.report.api.messagepushlog.MessagePushLog;
@@ -21,7 +24,14 @@ import com.yxt.supervise.report.api.reportsalesdaygather.ReportSalesDayGatherQue
 import com.yxt.supervise.report.api.reportsalesdaygather.ReportSalesDayGatherVo;
 import com.yxt.supervise.report.api.reportsalesdaytobaccostore.ReportSalesDayTobaccoStore;
 import com.yxt.supervise.report.api.reportsalesdaytobaccostore.ReportSalesDayTobaccoStoreDto;
+import com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLog;
+import com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLogDto;
+import com.yxt.supervise.report.api.riskmessageuser.RiskMessageUser;
+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.riskmessageslog.RiskMessagesLogService;
+import com.yxt.supervise.report.biz.riskmessageuser.RiskMessageUserService;
 import com.yxt.supervise.report.ds.system.SysUser;
 import com.yxt.supervise.system.dicttype.DictType;
 import com.yxt.supervise.system.dicttype.DictTypeVo;
@@ -41,6 +51,14 @@ public class MessagePushLogService extends MybatisBaseService<MessagePushLogMapp
     MessageOpenidService messageOpenidService;
     @Autowired
     com.yxt.supervise.report.ds.system.systemMapper systemMapper;
+    @Autowired
+    RiskMessagesLogService riskMessagesLogService;
+    @Autowired
+    RiskMessageUserService riskMessageUserService;
+    @Autowired
+    ImgMessagesLogService imgMessagesLogService;
+    @Autowired
+    ImgMessageUserService imgMessageUserService;
     public ResultBean save(MessagePushLogDto dto) {
         //删除同天同项目消息
         baseMapper.delete(new QueryWrapper<MessagePushLog>().eq("projectSid",dto.getProjectSid()).eq("orderDate",dto.getOrderDate()));
@@ -58,6 +76,42 @@ public class MessagePushLogService extends MybatisBaseService<MessagePushLogMapp
         }
         return rb.success().setMsg("保存成功");
 
+    }
+    public ResultBean riskSave(RiskMessagesLogDto dto) {
+        //删除同天同项目消息
+        //baseMapper.delete(new QueryWrapper<MessagePushLog>().eq("projectSid",dto.getProjectSid()).eq("orderDate",dto.getOrderDate()));
+        ResultBean rb=new ResultBean();
+        RiskMessagesLog entity=new RiskMessagesLog();
+        BeanUtil.copyProperties(dto, entity, "id");
+        entity.setSid(UUID.randomUUID().toString());
+        riskMessagesLogService.insert(entity);
+        for(String openid:dto.getMessageOpenids()){
+            RiskMessageUser messageOpenid=new RiskMessageUser();
+            messageOpenid.setOpenId(openid);
+            messageOpenid.setMessageSid(entity.getSid());
+            messageOpenid.setSid(UUID.randomUUID().toString());
+            riskMessageUserService.save(messageOpenid);
+        }
+        return rb.success().setMsg("保存成功");
+
+    }
+    public ResultBean riskImgSave(ImgMessagesLogDto dto) {
+        //删除同天同项目消息
+        //baseMapper.delete(new QueryWrapper<MessagePushLog>().eq("projectSid",dto.getProjectSid()).eq("orderDate",dto.getOrderDate()));
+        ResultBean rb=new ResultBean();
+        ImgMessagesLog entity=new ImgMessagesLog();
+        BeanUtil.copyProperties(dto, entity, "id");
+        entity.setSid(UUID.randomUUID().toString());
+        imgMessagesLogService.insert(entity);
+        for(String openid:dto.getMessageOpenids()){
+            ImgMessageUser messageOpenid=new ImgMessageUser();
+            messageOpenid.setOpenId(openid);
+            messageOpenid.setMessageSid(entity.getSid());
+            messageOpenid.setSid(UUID.randomUUID().toString());
+            imgMessageUserService.save(messageOpenid);
+        }
+        return rb.success().setMsg("保存成功");
+
     }
     public PagerVo<MessagePushLogVo> listPage(PagerQuery<MessagePushLogQuery> pq) {
         ResultBean rb=new ResultBean();

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

@@ -0,0 +1,25 @@
+package com.yxt.supervise.report.biz.riskmessageslog;
+
+
+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.riskmessageslog.RiskMessagesLog;
+import com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLogVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/27 9:56
+ */
+@Mapper
+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);
+    @Select("select * from risk_messages_log where sid =#{sid} order by messageTime desc limit 1")
+    RiskMessagesLogVo getMessageBySid(@Param("sid") String sid);
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogMapper.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.riskmessageslog.RiskMessagesLogMapper">
+    <!--    <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>
+    <select id="getRiskMessagesLog" resultType="com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLogVo">
+        SELECT
+            *
+        FROM
+        report_sales_day_log
+        <where> ${ew.sqlSegment} </where>
+    </select>
+    <select id="getLogByOrderDate" resultType="com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLogVo">
+        SELECT
+        *
+        FROM
+        report_sales_day_log
+        where
+            orderDate=#{orderDate}
+    </select>
+
+    <select id="getAllRiskMessagesLog" resultType="com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLogVo">
+        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/riskmessageslog/RiskMessagesLogRest.java

@@ -0,0 +1,54 @@
+package com.yxt.supervise.report.biz.riskmessageslog;
+
+
+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.riskmessageslog.RiskMessagesLogDto;
+import com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLogQuery;
+import com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLogVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/27 9:56
+ */
+@RestController
+@RequestMapping("/RiskMessagesLog")
+public class RiskMessagesLogRest {
+
+    @Autowired
+    RiskMessagesLogService RiskMessagesLogService;
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody RiskMessagesLogDto dto){
+        return RiskMessagesLogService.save(dto);
+    }
+    @PostMapping("/listPage")
+    public ResultBean listPage(@RequestBody PagerQuery<RiskMessagesLogQuery> pq){
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<RiskMessagesLogVo> pv = RiskMessagesLogService.listPage(pq);
+        return rb.success().setData(pv);
+    }
+    @GetMapping("/getMessageBySid/{sid}")
+    public ResultBean getMessageBySid(@PathVariable("sid") String sid ){
+        return RiskMessagesLogService.getMessageBySid(sid);
+    }
+    /**
+     * 查询待阅 已阅消息数量
+     * @param userSid
+     * @return
+     */
+    @GetMapping("/numberOfJobs/{userSid}")
+    public ResultBean numberOfJobs(@PathVariable("userSid")String userSid){
+        return RiskMessagesLogService.numberOfJobs(userSid);
+    }
+
+    @PostMapping("/changeState")
+    public ResultBean changeState(@RequestBody PagerQuery<RiskMessagesLogQuery> pq){
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<RiskMessagesLogVo> pv = RiskMessagesLogService.listPage(pq);
+        return rb.success().setData(pv);
+    }
+
+}

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

@@ -0,0 +1,120 @@
+package com.yxt.supervise.report.biz.riskmessageslog;
+
+
+import cn.hutool.core.bean.BeanUtil;
+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;
+import com.yxt.supervise.report.api.messageopenid.MessageOpenid;
+import com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLog;
+import com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLogDto;
+import com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLogQuery;
+import com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLogVo;
+import com.yxt.supervise.report.biz.messageopenid.MessageOpenidService;
+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.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/27 9:56
+ */
+@Service
+public class RiskMessagesLogService extends MybatisBaseService<RiskMessagesLogMapper, RiskMessagesLog> {
+    @Autowired
+    MessageOpenidService messageOpenidService;
+    @Autowired
+    com.yxt.supervise.report.ds.system.systemMapper systemMapper;
+    @Autowired
+    RmsMapper rmsMapper;
+    public ResultBean save(RiskMessagesLogDto dto) {
+        //删除同天同项目消息
+        baseMapper.delete(new QueryWrapper<RiskMessagesLog>().eq("projectSid",dto.getProjectSid()).eq("orderDate",dto.getOrderDate()));
+        ResultBean rb=new ResultBean();
+        RiskMessagesLog entity=new RiskMessagesLog();
+        BeanUtil.copyProperties(dto, entity, "id");
+        entity.setSid(UUID.randomUUID().toString());
+        baseMapper.insert(entity);
+        for(String openid:dto.getMessageOpenids()){
+            MessageOpenid messageOpenid=new MessageOpenid();
+            messageOpenid.setOpenId(openid);
+            messageOpenid.setMessageSid(entity.getSid());
+            messageOpenid.setSid(UUID.randomUUID().toString());
+            messageOpenidService.save(messageOpenid);
+        }
+        return rb.success().setMsg("保存成功");
+
+    }
+    public ResultBean getMessageBySid(String sid) {
+        ResultBean rb=new ResultBean();
+        RiskMessagesLogVo vo= baseMapper.getMessageBySid(sid);
+        RiskAlarm riskAlarm=rmsMapper.getRiskByMessSid(vo.getRiskSid());
+        vo.setShName(riskAlarm.getPositionName());
+        vo.setText(riskAlarm.getContent());
+        return rb.success().setData(vo);
+
+    }
+    public PagerVo<RiskMessagesLogVo> listPage(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.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);
+            }
+        }
+        IPage<RiskMessagesLogVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<RiskMessagesLogVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+    public ResultBean numberOfJobs(String userSid){
+        ResultBean rb =new ResultBean();
+        Map<String,Object> map=new HashMap<>();
+//        String openid=systemMapper.getAppletOpenidByUsersid(userSid);
+        SysUser sysUser=systemMapper.getAppletOpenidByUsersid(userSid);
+        int pendingMessages=baseMapper.getAllByUserSid(sysUser.getAppletOpenid(),"0");
+        int readMessage=baseMapper.getAllByUserSid(sysUser.getAppletOpenid(),"1");
+        List<String> list = new ArrayList<>();
+        list.add("【一级风险】");
+        list.add("【二级风险】");
+        list.add("【三级风险】");
+        list.add("【四级风险】");
+        String[] urls = {"http://jianguan.yyundong.com/img/banner001.jpg"};
+        map.put("readMessage",readMessage);
+        map.put("pendingMessages",pendingMessages);
+        map.put("urls",urls);
+        map.put("notice",list);
+        return rb.success().setData(map);
+    }
+
+
+    public PagerVo<RiskMessagesLogVo> changeState(PagerQuery<RiskMessagesLogQuery> pq) {
+        ResultBean rb=new ResultBean();
+        RiskMessagesLogQuery query = pq.getParams();
+//        String openid=systemMapper.getAppletOpenidByUsersid(query.getUserSid());
+        IPage<RiskMessagesLog> page = PagerUtil.queryToPage(pq);
+        SysUser sysUser=systemMapper.getAppletOpenidByUsersid(query.getUserSid());
+        QueryWrapper<RiskMessagesLog> qw = new QueryWrapper<>();
+        qw.eq("o.openId",sysUser.getAppletOpenid());
+        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/biz/riskmessageuser/RiskMessageUserMapper.java

@@ -0,0 +1,17 @@
+package com.yxt.supervise.report.biz.riskmessageuser;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import com.yxt.supervise.report.api.riskmessageuser.RiskMessageUser;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/27 9:56
+ */
+@Mapper
+public interface RiskMessageUserMapper extends BaseMapper<RiskMessageUser> {
+
+
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageuser/RiskMessageUserMapper.xml

@@ -0,0 +1,29 @@
+<?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.riskmessageuser.RiskMessageUserMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="getRiskMessageUser" resultType="com.yxt.supervise.report.api.riskmessageuser.RiskMessageUserVo">
+        SELECT
+            *
+        FROM
+        report_sales_day_log
+        <where> ${ew.sqlSegment} </where>
+    </select>
+    <select id="getLogByOrderDate" resultType="com.yxt.supervise.report.api.riskmessageuser.RiskMessageUserVo">
+        SELECT
+        *
+        FROM
+        report_sales_day_log
+        where
+            orderDate=#{orderDate}
+    </select>
+
+    <select id="getAllRiskMessageUser" resultType="com.yxt.supervise.report.api.riskmessageuser.RiskMessageUserVo">
+        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/riskmessageuser/RiskMessageUserRest.java

@@ -0,0 +1,29 @@
+package com.yxt.supervise.report.biz.riskmessageuser;
+
+
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.supervise.report.api.riskmessageuser.RiskMessageUserDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/27 9:56
+ */
+@RestController
+@RequestMapping("/RiskMessageUser")
+public class RiskMessageUserRest {
+
+    @Autowired
+    RiskMessageUserService RiskMessageUserService;
+
+    @PostMapping("/save")
+    public ResultBean save(@RequestBody List<RiskMessageUserDto> dto){
+        return RiskMessageUserService.save(dto);
+    }
+}

yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageuser/RiskMessageUserService.java

@@ -0,0 +1,32 @@
+package com.yxt.supervise.report.biz.riskmessageuser;
+
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.supervise.report.api.riskmessageuser.RiskMessageUser;
+import com.yxt.supervise.report.api.riskmessageuser.RiskMessageUserDto;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.UUID;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/27 9:56
+ */
+@Service
+public class RiskMessageUserService extends MybatisBaseService<RiskMessageUserMapper, RiskMessageUser> {
+
+    public ResultBean save(List<RiskMessageUserDto> dto) {
+        ResultBean rb=new ResultBean();
+        for(RiskMessageUserDto dto1:dto){
+            RiskMessageUser entity=new RiskMessageUser();
+            BeanUtil.copyProperties(dto1, entity, "id");
+            entity.setSid(UUID.randomUUID().toString());
+            baseMapper.insert(entity);
+        }
+        return rb.success().setMsg("保存成功");
+
+    }
+}

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

@@ -4,6 +4,7 @@ import cn.hutool.Hutool;
 import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.yxt.common.base.config.RedisUtil;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.supervise.report.aes.AesException;
 import com.yxt.supervise.report.aes.WXBizMsgCrypt;
@@ -21,8 +22,12 @@ import com.yxt.supervise.report.biz.stock.ReportStockDay;
 import com.yxt.supervise.report.biz.stock.StockDayRest;
 import com.yxt.supervise.report.biz.util.WeixinCheckoutUtil;
 import com.yxt.supervise.report.ds.crm.CrmMapper;
+import com.yxt.supervise.report.ds.crm.UserProject;
+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.system.systemMapper;
+import com.yxt.supervise.report.ds.warehouse.WarehouseMapper;
 import com.yxt.supervise.report.wx.SuperviseWxMessSender;
 import com.yxt.supervise.report.wx.obj.RespMessReturn;
 import io.swagger.annotations.Api;
@@ -44,10 +49,10 @@ import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 import java.io.IOException;
 import java.io.StringReader;
-import java.util.ArrayList;
+import java.text.SimpleDateFormat;
-import java.util.HashMap;
+import java.util.*;
-import java.util.List;
+
-import java.util.Map;
+import static com.yxt.common.base.utils.MsgWs.SendWaitWorkMsg;
 
 /**
  * @author wangpengfei
@@ -82,6 +87,13 @@ public class WechatRest {
     CrmMapper crmMapper;
     @Autowired
     ProjectDailyService projectDailyService;
+    @Autowired
+    RedisUtil redisUtil;
+    @Autowired
+    WarehouseMapper warehouseMapper;
+    @Autowired
+    RmsMapper rmsMapper;
+
     @ApiOperation("token")
     @GetMapping(value = "token")
     public String wechate(String signature,String timestamp,String nonce,String echostr){
@@ -360,6 +372,78 @@ public class WechatRest {
         r= SuperviseWxMessSender.jgsjzlSend("赵丽晓",openIds,projectSid,projectDaily.getProjectName(),projectDaily.getReportTime());
         System.out.println(r);
     }
+    @GetMapping("/shMessage")
+    public void shMessage(@RequestParam("shSid") String shSid,@RequestParam("riskSid") String riskSid){
+        RiskAlarm riskAlarm=rmsMapper.getRiskByCode("030404");
+        RespMessReturn r=new RespMessReturn();
+        List<UserProject> user= crmMapper.users(shSid);
+        List<String> openIds=new ArrayList<>();
+        List<String> mobiles=new ArrayList<>();
+        for(UserProject u:user){
+            SysUser sysUser=systemMapper.getAppletOpenidByUsersid(u.getUserSid());
+            if(null!=sysUser) {
+                if (com.yxt.common.base.utils.StringUtils.isNotNull(sysUser.getAppletOpenid())) {
+                    openIds.add(sysUser.getAppletOpenid());
+                    mobiles.add(sysUser.getMobile());
+                }
+            }
+        }
+        String projectSid=crmMapper.ProjectSidByshSid(shSid);
+        String name=warehouseMapper.getNameBySid(shSid);
+        SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+        // 公众号的模板id(也有相应的接口可以查询到)
+        //sendVerificationCode(name,mobiles);
+        r= SuperviseWxMessSender.jkSend("赵丽晓",openIds,projectSid,riskSid,name,riskAlarm.getSid(),ft.format(new Date()));
+        System.out.println(r);
+    }
+    @GetMapping("/shImgMessage")
+    public void shImgMessage(@RequestParam("shSid") String shSid,@RequestParam("riskSid") String riskSid){
+        rmsMapper.getRiskByCode("030405");
+        RespMessReturn r=new RespMessReturn();
+        List<UserProject> user= crmMapper.users(shSid);
+        List<String> openIds=new ArrayList<>();
+        List<String> mobiles=new ArrayList<>();
+        for(UserProject u:user){
+            SysUser sysUser=systemMapper.getAppletOpenidByUsersid(u.getUserSid());
+            if(null!=sysUser) {
+                if (com.yxt.common.base.utils.StringUtils.isNotNull(sysUser.getAppletOpenid())) {
+                    openIds.add(sysUser.getAppletOpenid());
+                    mobiles.add(sysUser.getMobile());
+                }
+            }
+        }
+        String projectSid=crmMapper.ProjectSidByshSid(shSid);
+        String name=warehouseMapper.getNameBySid(shSid);
+        SimpleDateFormat ft = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+        // 公众号的模板id(也有相应的接口可以查询到)
+        //sendVerificationCode(name,mobiles);
+        r= SuperviseWxMessSender.jkImgSend("赵丽晓",openIds,projectSid,riskSid,name,ft.format(new Date()));
+        System.out.println(r);
+    }
+    public ResultBean sendVerificationCode(String shName, List<String> users) {
+        String mobile = "";
+        ResultBean rb = new ResultBean().fireFail();
+        Date date = new Date();
+        String redisKey = "";
+        String codeRedis = redisUtil.get(redisKey + mobile);
+        if (com.yxt.common.base.utils.StringUtils.isNotEmpty(codeRedis)) {
+            //查看请求间隔,默认是一分钟,小于一分钟继续等待，超过一分钟发送短信
+            String sendTime = codeRedis.substring(4);
+            long diffSecond = (date.getTime() - Long.parseLong(sendTime)) / 1000;
+            if (diffSecond < 60) {
+                return ResultBean.fireFail().setMsg("请等待一分钟后再次重试!");
+            }
+        }
+        String content = "监控异常提醒：" + shName + "仓库监控设备于" + new Date() + "发生异常，请及时处理。";
+
+        for (String u : users) {
+            String res = SendWaitWorkMsg(u, content);
+        }
+
+//		String res = "1";
+
+        return ResultBean.fireSuccess().setMsg("发送短信验证码成功");
+    }
     /**
      * 山海光伏库存推送
      * @param orderDate

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

@@ -19,6 +19,11 @@ public interface CrmMapper extends BaseMapper<ProjectInfo> {
     List<UserProject> userProList ();
     @Select("select userSid from user_project where projectSid=#{projectSid}")
     List<String> suerList(@Param("projectSid") String projectSid);
+    @Select("select projectSid from storehouse_project where shSid=#{shSid}")
+    String ProjectSidByshSid(@Param("shSid") String shSid);
+    @Select("SELECT u.* FROM storehouse_project s LEFT JOIN user_project u ON u.projectSid = s.projectSid \n" +
+            "WHERE s.shSid =#{shSid}")
+    List<UserProject> users(@Param("shSid") String shSid);
     @Select("select count(*) from user_project where projectSid=#{projectSid} and userSid=#{userSid}")
     int getCountByUserSidAndProjectSid(@Param("projectSid") String projectSid,@Param("userSid")String userSid);
     @Select("select * from storehouse_project where projectSid = #{projectSid} ")

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

@@ -2,42 +2,17 @@ package com.yxt.supervise.report.ds.crm;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yxt.common.core.domain.EntityWithId;
+import lombok.Data;
 
 /**
  * @author wangpengfei
  * @date 2023/8/6 11:34
  */
-@TableName("user_project")
+@Data
 public class UserProject extends EntityWithId {
 
     private String sid;
     private String projectSid;
     private String userSid;
 
-
-
-
-    public String getSid() {
-        return sid;
-    }
-
-    public void setSid(String sid) {
-        this.sid = sid;
-    }
-
-    public String getProjectSid() {
-        return projectSid;
-    }
-
-    public void setProjectSid(String projectSid) {
-        this.projectSid = projectSid;
-    }
-
-    public String getUserSid() {
-        return userSid;
-    }
-
-    public void setUserSid(String userSid) {
-        this.userSid = userSid;
-    }
 }

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

@@ -0,0 +1,72 @@
+package com.yxt.supervise.report.ds.rms;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.UUID;
+
+/**
+ * @author feikefei
+ * @create 2023-06-19-11:28
+ */
+@Data
+@ApiModel(value = "风险报警表")
+@TableName("risk_alarm")
+public class RiskAlarm {
+    @ApiModelProperty("ID，唯一编号")
+    private Integer id ;
+    @ApiModelProperty("字符型编号")
+    private String sid = UUID.randomUUID().toString();
+    @ApiModelProperty("记录创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date createTime = new Date();
+    @ApiModelProperty("备注信息")
+    private String remarks;
+    @ApiModelProperty("客户Sid")
+    private String customerSid;
+    @ApiModelProperty("客户名称")
+    private String customerName;
+    @ApiModelProperty("风险处于位置1.主体2.供应商3.仓库4.门店")
+    private Integer positionCode;
+    @ApiModelProperty("风险处于位置Sid")
+    private String positionSid;
+    @ApiModelProperty("风险处于位置名称")
+    private String positionName;
+    @ApiModelProperty("风险触发时间")
+    private Date triggerTime;
+    @ApiModelProperty("风险处理状态：0=待处理，1=处理中，2=已办结")
+    private Integer treatmentStatus;
+    @ApiModelProperty("风险处理时间")
+    private Date treatmentTime;
+    @ApiModelProperty("风险处理内容")
+    private String treatmentContent;
+    @ApiModelProperty("风险消除程度0.未消除1.已消除")
+    private Integer eliminationStatus;
+    @ApiModelProperty("风险消除时间")
+    private Date eliminationTime;
+    @ApiModelProperty("风险消除内容")
+    private String eliminationContent;
+    @ApiModelProperty("风险指标Sid")
+    private String indicatorSid;
+    @ApiModelProperty("风险指标代码")
+    private String indicatorCode;
+    @ApiModelProperty("风险指标名称")
+    private String indicatorName;
+    @ApiModelProperty("风险等级(程度)Sid")
+    private String levelSid;
+    @ApiModelProperty("风险等级(程度)代码")
+    private String levelCode;
+    @ApiModelProperty("风险等级(程度)名称")
+    private String levelName;
+    @ApiModelProperty("风险类别Sid")
+    private String typeSid;
+    @ApiModelProperty("风险类别代码")
+    private String typeCode;
+    @ApiModelProperty("风险类别名称")
+    private String typeName;
+    private String content;
+}

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

@@ -0,0 +1,23 @@
+package com.yxt.supervise.report.ds.rms;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.supervise.report.ds.crm.ProjectInfo;
+import com.yxt.supervise.report.ds.crm.UserProject;
+import com.yxt.supervise.report.ds.warehouse.StoreHouse;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+@DS("rms")
+@Mapper
+public interface RmsMapper extends BaseMapper<RiskAlarm> {
+    @Select("select * from risk_alarm where sid =#{sid}")
+    RiskAlarm getRiskByMessSid (@Param("sid")String sid );
+    @Select("select * from risk_alarm where indicatorCode=#{code} order by triggerTime desc limit 1")
+    RiskAlarm getRiskByCode (@Param("code")String code );
+
+
+}

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

@@ -2,9 +2,12 @@ package com.yxt.supervise.report.wx;
 
 import cn.hutool.core.thread.ThreadUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yxt.supervise.report.api.imgmessageslog.ImgMessagesLogDto;
 import com.yxt.supervise.report.api.messagepushlog.MessagePushLog;
 import com.yxt.supervise.report.api.messagepushlog.MessagePushLogDto;
+import com.yxt.supervise.report.api.riskmessageslog.RiskMessagesLogDto;
 import com.yxt.supervise.report.biz.messagepushlog.MessagePushLogService;
+import com.yxt.supervise.report.biz.riskmessageslog.RiskMessagesLogService;
 import com.yxt.supervise.report.wx.obj.RespMessReturn;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -67,7 +70,78 @@ public class SuperviseWxMessSender {
         });
         return respMessReturn;
     }
-
+    public static RespMessReturn jkSend(String sender, 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 = jgsjzl_pagepath.replace("ORDER_DATE", orderDate).replace("PROJECT_SID", projectSid);?
+        String pagepath ="pages/index/DeviceException"+"?sid"+messSid;
+        HashMap<String, String> data = new HashMap<>();
+        data.put("time1", reportTime);
+        String thing2 = projectName +"监控设备异常";
+        data.put("thing2", maxLength20(thing2));
+        data.put("thing3", sender);
+//        String thing2 =   projectName;
+//        data.put("thing4",  maxLength20(thing2));
+//        data.put("const2", reportTime);
+//        data.put("const3", reportTime);
+//        data.put("character_string5", "");
+//        data.put("time1", reportTime);
+        for(String touser:tousers){
+            respMessReturn = WxMessage.sendMessage(jgsjzl_template_id, touser, pagepath, data);
+        }
+        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);
+        ThreadUtil.execute(() -> {
+            try {
+                superviseWxMessSender.messagePushLogService.riskSave(logDto);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        });
+        return respMessReturn;
+    }
+    public static RespMessReturn jkImgSend(String sender, List<String> tousers, String projectSid,String riskSid, String projectName, String reportTime) {
+        RespMessReturn respMessReturn=new RespMessReturn();
+        String orderDate = reportTime.substring(0, 10);
+        String pagepath = "";
+//        String pagepath = "";
+        HashMap<String, String> data = new HashMap<>();
+        data.put("time1", reportTime);
+        String thing2 = projectName+"图片对比异常";
+        data.put("thing2", maxLength20(thing2));
+        data.put("thing3", sender);
+//        String thing2 =   projectName;
+//        data.put("thing4",  maxLength20(thing2));
+//        data.put("const2", reportTime);
+//        data.put("const3", reportTime);
+//        data.put("character_string5", "");
+//        data.put("time1", reportTime);
+        for(String touser:tousers){
+            respMessReturn = WxMessage.sendMessage(jgsjzl_template_id, touser, pagepath, data);
+        }
+        ImgMessagesLogDto logDto=new ImgMessagesLogDto();
+        logDto.setContent(data);
+        logDto.setMessageTime(reportTime);
+        logDto.setPagepath(pagepath);
+        logDto.setMessageOpenids(tousers);
+        logDto.setProjectSid(projectSid);
+        logDto.setOrderDate(orderDate);
+        logDto.setRiskSid(riskSid);
+        ThreadUtil.execute(() -> {
+            try {
+                superviseWxMessSender.messagePushLogService.riskImgSave(logDto);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        });
+        return respMessReturn;
+    }
     private static String maxLength(String src, int length) {
         if (StringUtils.isBlank(src) || src.length() <= length)
             return src;

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

@@ -0,0 +1,16 @@
+package com.supervise.rms.api.riskalarm;
+
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/9/3 17:06
+ */
+@Data
+public class Device {
+
+        private String name;
+        private String serialNumber;
+        private String status;
+
+}

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

@@ -0,0 +1,37 @@
+package com.supervise.rms.api.riskalarm;
+
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/9/3 15:27
+ */
+@Data
+public class DeviceImages {
+    private String endImage;
+    private String endTime;
+    private String name;
+    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;
+    }
+}

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

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

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

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author feikefei
@@ -61,4 +62,12 @@ public class RiskAlarmDto implements Dto {
     private String typeCode;
     @ApiModelProperty("风险类别名称")
     private String typeName;
+    //对比值
+    private Integer oddsRatio;
+    private List<Device> devices;
+    private String errorCount;
+    private String name;
+    private String sendTime;
+    private List<DeviceImages> deviceImages;
+    private String content;
 }

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

@@ -8,6 +8,7 @@ import com.supervise.rms.api.riskalarm.RiskAlarm;
 import com.supervise.rms.api.riskalarm.RiskAlarmVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 /**
  * @author feikefei
@@ -16,4 +17,6 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface RiskAlarmMapper extends BaseMapper<RiskAlarm> {
     IPage<RiskAlarmVo> listPage(IPage<RiskAlarm> page, @Param(Constants.WRAPPER) Wrapper<RiskAlarm> qw);
+    @Select("select * from risk_alarm where positionSid=#{shSid} and indicatorCode=#{code} order by triggerTime desc limit 1")
+    RiskAlarmVo getRiskAlarm(@Param("shSid")String shSid,@Param("code")String code);
 }

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

@@ -10,10 +10,7 @@ import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 /**
  * @author feikefei
@@ -40,5 +37,19 @@ public class RiskAlarmRest implements RiskAlarmFeign {
     public ResultBean saveRiskAlarm(@RequestBody RiskAlarmDto dto){
         return riskAlarmService.saveRiskAlarm(dto);
     }
-
+    @ApiOperation("增加报警数据并通知")
+    @PostMapping("/saveRisk")
+    public ResultBean saveRisk(@RequestBody RiskAlarmDto dto){
+        return riskAlarmService.saveRisk(dto);
+    }
+    @ApiOperation("接收拍照对比结果")
+    @PostMapping("/contrast")
+    public ResultBean contrast(@RequestBody RiskAlarmDto dto){
+        return riskAlarmService.contrast(dto);
+    }
+//    @ApiOperation(value = "发送验证码")
+//    @GetMapping("/sendVerificationCode/{mobile}/{type}")
+//    public ResultBean sendVerificationCode(@PathVariable("mobile") String mobile,@PathVariable("type") String type){
+//        return riskAlarmService.sendVerificationCode(mobile, type);
+//    }
 }

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

@@ -1,33 +1,77 @@
 package com.supervise.rms.biz.riskalarm;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.thread.ThreadUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.api.R;
-import com.supervise.rms.api.riskalarm.RiskAlarm;
+import com.supervise.rms.api.riskalarm.*;
-import com.supervise.rms.api.riskalarm.RiskAlarmDto;
+import com.supervise.rms.api.riskindicators.RiskIndicators;
-import com.supervise.rms.api.riskalarm.RiskAlarmQuery;
+import com.supervise.rms.biz.riskindicators.RiskIndicatorsService;
-import com.supervise.rms.api.riskalarm.RiskAlarmVo;
+import com.supervise.rms.feign.crm.StoreHouseProjectFeign;
+import com.supervise.rms.feign.crm.StoreHouseProjectVo;
+import com.supervise.rms.feign.crm.UserProjectFeign;
+import com.supervise.rms.feign.crm.UserProjectVo;
+import com.supervise.rms.feign.report.WechatFeign;
+import com.supervise.rms.feign.system.SysUser;
+import com.supervise.rms.feign.system.sysUserFeign;
+import com.yxt.common.base.config.RedisUtil;
 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;
+import lombok.experimental.Accessors;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.io.IOException;
+import java.util.*;
+
+import static com.yxt.common.base.utils.MsgWs.SendWaitWorkMsg;
+
 /**
  * @author feikefei
  * @create 2023-06-19-11:42
  */
 @Service
 public class RiskAlarmService extends MybatisBaseService<RiskAlarmMapper, RiskAlarm> {
+    /**
+     * 设置redis的过期时间为4小时
+     */
+    public static final long USERS_REDIS_SESSION_TL_PC = 4 * 3600;
+    public static final long USERS_REDIS_SESSION_TL_App = 24 * 15 * 3600;
+    /**
+     * 验证码长度
+     */
+    static final int LENGTH_OF_CODE = 4;
+    /**
+     * 调用发送短信接口返回值
+     */
+    static final String RESULT_CODE = "1";
+    /**
+     * 手机短信登录验证码时效(秒)
+     */
+    static final long APP_LOGIN_CODE_TIME_LIMIT = 300L;
+    @Autowired
+    RiskIndicatorsService riskIndicatorsService;
+    @Autowired
+    WechatFeign wechatFeign;
+    @Autowired
+    private RedisUtil redisUtil;
+    @Autowired
+    private StoreHouseProjectFeign storeHouseProjectFeign;
+    @Autowired
+    private UserProjectFeign userProjectFeign;
+    @Autowired
+    private com.supervise.rms.feign.system.sysUserFeign sysUserFeign;
 
-    public PagerVo<RiskAlarmVo> listPage(PagerQuery<RiskAlarmQuery> pq){
+    public PagerVo<RiskAlarmVo> listPage(PagerQuery<RiskAlarmQuery> pq) {
         RiskAlarmQuery params = pq.getParams();
         QueryWrapper<RiskAlarm> wq = new QueryWrapper<>();
-        if (params != null){
+        if (params != null) {
-            if (StringUtils.isBlank(params.getIndicatorName())){
+            if (StringUtils.isBlank(params.getIndicatorName())) {
 
             }
         }
@@ -37,17 +81,124 @@ public class RiskAlarmService extends MybatisBaseService<RiskAlarmMapper, RiskAl
         return vo;
     }
 
-    public ResultBean saveRiskAlarm(RiskAlarmDto dto){
+    public ResultBean saveRiskAlarm(RiskAlarmDto dto) {
         ResultBean rb = ResultBean.fireFail();
-        if (StringUtils.isBlank(dto.getSid())){
+        if (StringUtils.isBlank(dto.getSid())) {
             RiskAlarm riskAlarm = new RiskAlarm();
-            BeanUtil.copyProperties(dto,riskAlarm);
+            BeanUtil.copyProperties(dto, riskAlarm);
             baseMapper.insert(riskAlarm);
-        }else {
+        } else {
             RiskAlarm riskAlarm = fetchBySid(dto.getSid());
-            BeanUtil.copyProperties(dto,riskAlarm,"sid","id");
+            BeanUtil.copyProperties(dto, riskAlarm, "sid", "id");
             baseMapper.updateById(riskAlarm);
         }
         return rb.success().setMsg("更新成功");
     }
+
+    public ResultBean saveRisk(RiskAlarmDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        RiskAlarm riskAlarm = new RiskAlarm();
+        BeanUtil.copyProperties(dto, riskAlarm);
+        System.out.println(dto.getDevices().size());
+        //正常状态
+        if (dto.getDevices().size() == 0) {
+        } else {
+            RiskIndicators riskIndicators = riskIndicatorsService.getOne(new QueryWrapper<RiskIndicators>().eq("code", "030404"));
+//            riskAlarm.setRemarks(str(dto.getDevices()));
+            riskAlarm.setIndicatorSid(riskIndicators.getSid());
+            riskAlarm.setIndicatorCode(riskIndicators.getCode());
+            riskAlarm.setIndicatorName(riskIndicators.getName());
+            riskAlarm.setPositionSid(dto.getSid());
+            riskAlarm.setPositionName(dto.getName());
+            riskAlarm.setTriggerTime(dto.getTriggerTime());
+            riskAlarm.setSid(UUID.randomUUID().toString());
+            riskAlarm.setTreatmentTime(new Date());
+            riskAlarm.setContent(dto.getDevices().toString());
+            RiskAlarmVo riskAlarmVo = baseMapper.getRiskAlarm(dto.getSid(),"030404");
+            String shSid=dto.getSid();
+            if (null == riskAlarmVo) {
+                baseMapper.insert(riskAlarm);
+                ThreadUtil.execute(()->{
+                    wechatFeign.shMessage(shSid,riskAlarm.getSid());
+                    //sendVerificationCode(dto.getSid(), dto.getName(), dto.getSendTime().toString());
+                });
+            }else{
+                Date newDate = addHour(riskAlarmVo.getCreateTime(), 4);
+                if (newDate.before(new Date())) {
+                    baseMapper.insert(riskAlarm);
+                    ThreadUtil.execute(()->{
+                        wechatFeign.shMessage(shSid,riskAlarm.getSid());
+                        //sendVerificationCode(dto.getSid(), dto.getName(), dto.getSendTime().toString());
+                    });
+                    return rb.success().setMsg("成功");
+                }
+                return rb.success().setMsg("成功");
+            }
+        }
+        return rb.success().setMsg("成功");
+    }
+
+    public static String str(List<String> date) {
+        String c = "";
+        for(String u:date){
+            if(c.equals("")){
+                c=c+u;
+            }else{
+                c=c+","+u;
+            }
+        }
+        return c;
+    }
+    public static Date addHour(Date date, int i) {
+        Calendar c = Calendar.getInstance();
+        c.setTime(date);
+        c.add(Calendar.HOUR_OF_DAY, i);
+        Date newDate = c.getTime();
+        return newDate;
+    }
+
+    public ResultBean contrast(RiskAlarmDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        Integer s = 0;
+        RiskAlarm riskAlarm = new RiskAlarm();
+        BeanUtil.copyProperties(dto, riskAlarm);
+        for(DeviceImages deviceImages:dto.getDeviceImages()){
+            Integer sim=Integer.valueOf(deviceImages.getSimilarity().replace("%",""));
+            if(sim<90){
+                RiskIndicators riskIndicators = riskIndicatorsService.getOne(new QueryWrapper<RiskIndicators>().eq("code", "030405"));
+//            riskAlarm.setRemarks(str(dto.getDevices()));
+                riskAlarm.setContent(dto.getDeviceImages().toString());
+                riskAlarm.setIndicatorSid(riskIndicators.getSid());
+                riskAlarm.setIndicatorCode(riskIndicators.getCode());
+                riskAlarm.setIndicatorName(riskIndicators.getName());
+                riskAlarm.setPositionSid(dto.getSid());
+                riskAlarm.setPositionName(dto.getName());
+                riskAlarm.setTriggerTime(dto.getTriggerTime());
+                riskAlarm.setSid(UUID.randomUUID().toString());
+                riskAlarm.setTreatmentTime(new Date());
+                riskAlarm.setContent(dto.getDeviceImages().toString());
+                RiskAlarmVo riskAlarmVo = baseMapper.getRiskAlarm(dto.getSid(),"030405");
+                String shSid=dto.getSid();
+                if (null == riskAlarmVo) {
+                    baseMapper.insert(riskAlarm);
+                    ThreadUtil.execute(()->{
+                        wechatFeign.shImgMessage(shSid,riskAlarm.getSid());
+                        //sendVerificationCode(dto.getSid(), dto.getName(), dto.getSendTime().toString());
+                    });
+                }else{
+                    Date newDate = addHour(riskAlarmVo.getCreateTime(), 4);
+                    if (newDate.before(new Date())) {
+                        baseMapper.insert(riskAlarm);
+                        ThreadUtil.execute(()->{
+                            wechatFeign.shImgMessage(shSid,riskAlarm.getSid());
+                            //sendVerificationCode(dto.getSid(), dto.getName(), dto.getSendTime().toString());
+                        });
+                        return rb.success().setMsg("成功");
+                    }
+                    return rb.success().setMsg("成功");
+                }
+            }
+        }
+        return rb.success().setMsg("成功");
+    }
 }

yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicators/RiskIndicatorsMapper.java

@@ -9,6 +9,8 @@ import com.supervise.rms.api.riskindicators.RiskIndicatorsVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * @author feikefei
  * @create 2023-06-16-10:19
@@ -16,4 +18,6 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface RiskIndicatorsMapper extends BaseMapper<RiskIndicators> {
     IPage<RiskIndicatorsVo> listPage(IPage<RiskIndicators> page, @Param(Constants.WRAPPER) Wrapper<RiskIndicators> qw);
+    List<RiskIndicatorsVo> listAll();
+
 }

yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicators/RiskIndicatorsMapper.xml

@@ -9,4 +9,10 @@
             ${ew.sqlSegment}
         </where>
     </select>
+    <select id="listAll" resultType="com.supervise.rms.api.riskindicators.RiskIndicatorsVo">
+        select i.*,t.name bigTypeName from risk_indicators i
+        left join risk_type l on i.typeSid = l.sid
+        left join risk_type t on l.parentSid = t.sid
+        where i.typeCode='0304'
+    </select>
 </mapper>

yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicators/RiskIndicatorsRest.java

@@ -11,6 +11,8 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * @author feikefei
  * @create 2023-06-16-10:18
@@ -36,7 +38,13 @@ public class RiskIndicatorsRest {
         PagerVo<RiskIndicatorsVo> listPage = riskIndicatorService.listPage(pq);
         return rb.success().setData(listPage);
     }
-
+    @ApiOperation("查询风险指标列表")
+    @PostMapping("/listAll")
+    public ResultBean listAll(){
+        ResultBean rb = ResultBean.fireFail();
+        List<RiskIndicatorsVo> list = riskIndicatorService.listAll();
+        return rb.success().setData(list);
+    }
     @ApiOperation("删除风险指标")
     @GetMapping("/del/{sid}")
     public ResultBean del(@PathVariable String sid){

yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicators/RiskIndicatorsService.java

@@ -79,4 +79,8 @@ public class RiskIndicatorsService extends MybatisBaseService<RiskIndicatorsMapp
         PagerVo<RiskIndicatorsVo> pageToVo = PagerUtil.pageToVo(iPage, null);
         return pageToVo;
     }
+    public List<RiskIndicatorsVo> listAll(){
+        List<RiskIndicatorsVo> list = baseMapper.listAll();
+        return list;
+    }
 }

yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/feign/crm/ProjectInformationFeign.java

@@ -0,0 +1,21 @@
+package com.supervise.rms.feign.crm;
+
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/21 9:19
+ */
+@FeignClient(
+        contextId = "supervise-crm-projectinformation",
+        name = "supervise-crm",
+        path = "v1/projectinformation")
+public interface ProjectInformationFeign {
+    @GetMapping("/listAll")
+    public ResultBean listAll();
+    @GetMapping("/getProjectNameBySid")
+    public String getProjectNameBySid(@RequestParam("sid")String sid);
+}

yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/feign/crm/StoreHouseProjectFeign.java

@@ -0,0 +1,21 @@
+package com.supervise.rms.feign.crm;
+
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+
+/**
+ * @author wangpengfei
+ * @date 2023/9/3 9:54
+ */
+@FeignClient(
+        contextId = "supervise-crm-storehouseproject",
+        name = "supervise-crm",
+        path = "v1/storehouseproject")
+public interface StoreHouseProjectFeign {
+    @ApiOperation("根据仓库sid查询项目信息")
+    @PostMapping("/selectProjectByshSid/{sid}")
+    public ResultBean<StoreHouseProjectVo> selectProjectByshSid(@PathVariable("sid")String sid);
+}

yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/feign/crm/StoreHouseProjectVo.java

@@ -0,0 +1,19 @@
+package com.supervise.rms.feign.crm;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/19 15:37
+ */
+@Data
+public class StoreHouseProjectVo implements Vo {
+    private String id;
+    private String sid;
+    private String shSid;
+    private String projectSid;
+    //仓库名称
+    private String name;
+    private String picUrl; // 图片访问url
+}

yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/feign/crm/UserProjectFeign.java

@@ -0,0 +1,25 @@
+package com.supervise.rms.feign.crm;
+
+import com.yxt.common.core.result.ResultBean;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/9/3 10:06
+ */
+@FeignClient(
+        contextId = "supervise-crm-userproject",
+        name = "supervise-crm",
+        path = "userproject")
+public interface UserProjectFeign {
+    @ApiOperation("根据项目sid查询")
+    @GetMapping("/getUsersByprojectSid")
+    public ResultBean<List<String>> getUsersByprojectSid(@RequestParam("projectSid") String projectSid);
+}

yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/feign/crm/UserProjectVo.java

@@ -0,0 +1,46 @@
+package com.supervise.rms.feign.crm;
+
+import com.yxt.common.core.query.Query;
+
+/**
+ * @author wangpengfei
+ * @date 2023/8/6 11:35
+ */
+public class UserProjectVo implements Query {
+    private String id;
+    private String sid;
+    private String projectSid;
+    private String userSid;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getSid() {
+        return sid;
+    }
+
+    public void setSid(String sid) {
+        this.sid = sid;
+    }
+
+    public String getProjectSid() {
+        return projectSid;
+    }
+
+    public void setProjectSid(String projectSid) {
+        this.projectSid = projectSid;
+    }
+
+    public String getUserSid() {
+        return userSid;
+    }
+
+    public void setUserSid(String userSid) {
+        this.userSid = userSid;
+    }
+}

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

@@ -0,0 +1,22 @@
+package com.supervise.rms.feign.report;
+
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/7/19 13:55
+ */
+@FeignClient(
+        contextId = "supervise-report-wechat",
+        name = "supervise-report",
+        path = "/v1/wechat")
+public interface WechatFeign {
+    @GetMapping("/shMessage")
+    public void shMessage(@RequestParam("shSid") String shSid,@RequestParam("riskSid") String riskSid);
+    @GetMapping("/shImgMessage")
+    public void shImgMessage(@RequestParam("shSid") String shSid,@RequestParam("riskSid") String riskSid);
+}

yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/feign/system/SysUser.java

@@ -0,0 +1,77 @@
+package com.supervise.rms.feign.system;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Project: anrui_portal(门户建设) <br/>
+ * File: SysUser.java <br/>
+ * Class: SysUser <br/>
+ * Description: 用户表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-08-03 00:24:30 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "用户表", description = "用户表")
+@TableName("sys_user")
+@Data
+public class SysUser extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    
+	@ApiModelProperty("登录名，登录名不能相同")
+    private String userName;
+    
+	@ApiModelProperty("密码（加密或签名后）")
+    private String password;
+    
+	@ApiModelProperty("密码修改时限")
+    private String pwdDayslimit;
+    
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+	@ApiModelProperty("最后一次密码修改时间")
+    private Date pwdModifyTime;
+    
+	@ApiModelProperty("在线状态（0为离线、1为在线）")
+    private Integer onlineState;
+    
+	@ApiModelProperty("用户登录时随机生成身份验证字符串")
+    private String token;
+    
+	@ApiModelProperty("是否是管理员：1管理员，2一般用户，0是超级管理员,3尚无单位人员")
+    private String isAdmin;
+    
+	@ApiModelProperty("手机登录唯一标识，手机与用户绑定字段")
+    private String appId;
+    
+	@ApiModelProperty("关联的人员sid")
+    private String staffSid;
+    
+	@ApiModelProperty("手机号")
+    private String mobile;
+    
+	@ApiModelProperty("用户类型:1员工、2客户、3供应商")
+    private Integer userType;
+
+	@ApiModelProperty("用户头像")
+    private String headImage;
+    private String openId;
+    private String appletOpenid;
+    @TableField(exist = false)
+    private List<String> roleNames;
+    private String unionid;
+    //d订阅状态
+    private String subscriptionStatus;
+}

yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/feign/system/sysUserFeign.java

@@ -0,0 +1,21 @@
+package com.supervise.rms.feign.system;
+
+import com.yxt.common.core.result.ResultBean;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+/**
+ * @author wangpengfei
+ * @date 2023/9/3 10:17
+ */
+@FeignClient(
+        contextId = "supervise-system-sysUser",
+        name = "supervise-system",
+        path = "v1/sysuser")
+public interface sysUserFeign {
+    @PostMapping("/getUsersBySid")
+    public ResultBean<List<SysUser>> getUsersBySid(@RequestBody List<String> list);
+}

yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserRest.java

@@ -715,4 +715,8 @@ public class SysUserRest implements SysUserFeign {
     public ResultBean updateSysUserImage(@RequestBody Map<String, String> map){
         return sysUserService.updateSysUserImage(map);
     }
+    @PostMapping("/getUsersBySid")
+    public ResultBean<List<SysUser>> getUsersBySid(@RequestBody List<String> list){
+        return sysUserService.getUsersBySid(list);
+    }
 }

yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java

@@ -1480,4 +1480,10 @@ public class SysUserService extends MybatisBaseService<SysUserMapper, SysUser> {
         int sid = baseMapper.update(sysUser, new QueryWrapper<SysUser>().eq("sid", sysUser.getSid()));
         return rb.success().setMsg("上传成功");
     }
+    public ResultBean<List<SysUser>> getUsersBySid(List<String> list){
+        ResultBean rb = ResultBean.fireFail();
+        List<SysUser>users=baseMapper.selectList(new QueryWrapper<SysUser>().in("sid",list));
+
+        return rb.success().setData(users);
+    }
 }