From 8ff0d37a7e9cfb81850a50a60a6421e1bc85e213 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Sun, 3 Sep 2023 18:22:50 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E6=8E=A7=E9=A2=84=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yxt/common/base/utils/MsgWs.java | 2 +- .../StoreHouseProjectMapper.java | 2 + .../StoreHouseProjectRest.java | 7 + .../StoreHouseProjectService.java | 5 + .../biz/userproject/UserProjectMapper.java | 1 + .../crm/biz/userproject/UserProjectMapper.xml | 3 + .../crm/biz/userproject/UserProjectRest.java | 9 +- .../biz/userproject/UserProjectService.java | 6 + .../api/imgmessageslog/ImgMessagesLog.java | 23 +++ .../api/imgmessageslog/ImgMessagesLogDto.java | 26 +++ .../imgmessageslog/ImgMessagesLogQuery.java | 14 ++ .../api/imgmessageslog/ImgMessagesLogVo.java | 47 +++++ .../api/imgmessageuser/ImgMessageUser.java | 20 ++ .../api/imgmessageuser/ImgMessageUserDto.java | 17 ++ .../imgmessageuser/ImgMessageUserQuery.java | 17 ++ .../api/imgmessageuser/ImgMessageUserVo.java | 17 ++ .../api/riskmessageslog/RiskMessagesLog.java | 23 +++ .../riskmessageslog/RiskMessagesLogDto.java | 26 +++ .../riskmessageslog/RiskMessagesLogQuery.java | 14 ++ .../riskmessageslog/RiskMessagesLogVo.java | 47 +++++ .../api/riskmessageuser/RiskMessageUser.java | 20 ++ .../riskmessageuser/RiskMessageUserDto.java | 17 ++ .../riskmessageuser/RiskMessageUserQuery.java | 17 ++ .../riskmessageuser/RiskMessageUserVo.java | 17 ++ .../biz/csmcashreport/CsmCashReportRest.java | 6 +- .../imgmessageslog/ImgMessagesLogMapper.java | 25 +++ .../imgmessageslog/ImgMessagesLogMapper.xml | 32 ++++ .../imgmessageslog/ImgMessagesLogRest.java | 54 ++++++ .../imgmessageslog/ImgMessagesLogService.java | 125 +++++++++++++ .../imgmessageuser/ImgMessageUserMapper.java | 16 ++ .../imgmessageuser/ImgMessageUserMapper.xml | 29 +++ .../imgmessageuser/ImgMessageUserRest.java | 29 +++ .../imgmessageuser/ImgMessageUserService.java | 32 ++++ .../messagepushlog/MessagePushLogService.java | 54 ++++++ .../RiskMessagesLogMapper.java | 25 +++ .../riskmessageslog/RiskMessagesLogMapper.xml | 32 ++++ .../riskmessageslog/RiskMessagesLogRest.java | 54 ++++++ .../RiskMessagesLogService.java | 120 ++++++++++++ .../RiskMessageUserMapper.java | 17 ++ .../riskmessageuser/RiskMessageUserMapper.xml | 29 +++ .../riskmessageuser/RiskMessageUserRest.java | 29 +++ .../RiskMessageUserService.java | 32 ++++ .../report/biz/wechat/WechatRest.java | 92 ++++++++- .../supervise/report/ds/crm/CrmMapper.java | 5 + .../supervise/report/ds/crm/UserProject.java | 29 +-- .../supervise/report/ds/rms/RiskAlarm.java | 72 +++++++ .../supervise/report/ds/rms/RmsMapper.java | 23 +++ .../report/wx/SuperviseWxMessSender.java | 76 +++++++- .../supervise/rms/api/riskalarm/Device.java | 16 ++ .../rms/api/riskalarm/DeviceImages.java | 37 ++++ .../rms/api/riskalarm/RiskAlarm.java | 1 + .../rms/api/riskalarm/RiskAlarmDto.java | 9 + .../rms/biz/riskalarm/RiskAlarmMapper.java | 3 + .../rms/biz/riskalarm/RiskAlarmRest.java | 21 ++- .../rms/biz/riskalarm/RiskAlarmService.java | 175 ++++++++++++++++-- .../riskindicators/RiskIndicatorsMapper.java | 4 + .../riskindicators/RiskIndicatorsMapper.xml | 6 + .../riskindicators/RiskIndicatorsRest.java | 10 +- .../riskindicators/RiskIndicatorsService.java | 4 + .../feign/crm/ProjectInformationFeign.java | 21 +++ .../rms/feign/crm/StoreHouseProjectFeign.java | 21 +++ .../rms/feign/crm/StoreHouseProjectVo.java | 19 ++ .../rms/feign/crm/UserProjectFeign.java | 25 +++ .../rms/feign/crm/UserProjectVo.java | 46 +++++ .../rms/feign/report/WechatFeign.java | 22 +++ .../supervise/rms/feign/system/SysUser.java | 77 ++++++++ .../rms/feign/system/sysUserFeign.java | 21 +++ .../supervise/system/sysuser/SysUserRest.java | 4 + .../system/sysuser/SysUserService.java | 6 + 69 files changed, 1926 insertions(+), 56 deletions(-) create mode 100644 yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/imgmessageslog/ImgMessagesLog.java create mode 100644 yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/imgmessageslog/ImgMessagesLogDto.java create mode 100644 yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/imgmessageslog/ImgMessagesLogQuery.java create mode 100644 yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/imgmessageslog/ImgMessagesLogVo.java create mode 100644 yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/imgmessageuser/ImgMessageUser.java create mode 100644 yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/imgmessageuser/ImgMessageUserDto.java create mode 100644 yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/imgmessageuser/ImgMessageUserQuery.java create mode 100644 yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/imgmessageuser/ImgMessageUserVo.java create mode 100644 yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/riskmessageslog/RiskMessagesLog.java create mode 100644 yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/riskmessageslog/RiskMessagesLogDto.java create mode 100644 yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/riskmessageslog/RiskMessagesLogQuery.java create mode 100644 yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/riskmessageslog/RiskMessagesLogVo.java create mode 100644 yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/riskmessageuser/RiskMessageUser.java create mode 100644 yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/riskmessageuser/RiskMessageUserDto.java create mode 100644 yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/riskmessageuser/RiskMessageUserQuery.java create mode 100644 yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/riskmessageuser/RiskMessageUserVo.java create mode 100644 yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageslog/ImgMessagesLogMapper.java create mode 100644 yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageslog/ImgMessagesLogMapper.xml create mode 100644 yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageslog/ImgMessagesLogRest.java create mode 100644 yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageslog/ImgMessagesLogService.java create mode 100644 yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageuser/ImgMessageUserMapper.java create mode 100644 yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageuser/ImgMessageUserMapper.xml create mode 100644 yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageuser/ImgMessageUserRest.java create mode 100644 yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageuser/ImgMessageUserService.java create mode 100644 yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogMapper.java create mode 100644 yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogMapper.xml create mode 100644 yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogRest.java create mode 100644 yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogService.java create mode 100644 yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageuser/RiskMessageUserMapper.java create mode 100644 yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageuser/RiskMessageUserMapper.xml create mode 100644 yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageuser/RiskMessageUserRest.java create mode 100644 yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageuser/RiskMessageUserService.java create mode 100644 yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/rms/RiskAlarm.java create mode 100644 yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/rms/RmsMapper.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarm/Device.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarm/DeviceImages.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/feign/crm/ProjectInformationFeign.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/feign/crm/StoreHouseProjectFeign.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/feign/crm/StoreHouseProjectVo.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/feign/crm/UserProjectFeign.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/feign/crm/UserProjectVo.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/feign/report/WechatFeign.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/feign/system/SysUser.java create mode 100644 yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/feign/system/sysUserFeign.java diff --git a/yxt/yxt-common/yxt-common-base/src/main/java/com/yxt/common/base/utils/MsgWs.java b/yxt/yxt-common/yxt-common-base/src/main/java/com/yxt/common/base/utils/MsgWs.java index 34a17dee..33d6ce8a 100644 --- a/yxt/yxt-common/yxt-common-base/src/main/java/com/yxt/common/base/utils/MsgWs.java +++ b/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 = "用户，您好！您注册的单位已审核通过，管理员的密码为："; diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/storehouseproject/StoreHouseProjectMapper.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/storehouseproject/StoreHouseProjectMapper.java index b596ab03..0e2b8c6d 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/storehouseproject/StoreHouseProjectMapper.java +++ b/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 { @Select("select * from storehouse_project where projectSid=#{sid}") List 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 getAllShSid(); } diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/storehouseproject/StoreHouseProjectRest.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/storehouseproject/StoreHouseProjectRest.java index 6e6c0de4..84c8feba 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/storehouseproject/StoreHouseProjectRest.java +++ b/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 { Listlist= storeHouseProjectService.selectStoreBySid(sid); return rb.success().setData(list); } + @ApiOperation("根据仓库sid查询项目信息") + @PostMapping("/selectProjectByshSid/{sid}") + public ResultBean selectProjectByshSid(@PathVariable("sid")String sid){ + ResultBean rb = ResultBean.fireFail(); + StoreHouseProjectVo list= storeHouseProjectService.selectProjectByshSid(sid); + return rb.success().setData(list); + } } diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/storehouseproject/StoreHouseProjectService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/storehouseproject/StoreHouseProjectService.java index 7e329281..782e2691 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/storehouseproject/StoreHouseProjectService.java +++ b/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 getAllShSid() { List pagging = baseMapper.getAllShSid(); return pagging; diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectMapper.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectMapper.java index f4797618..aa6738ef 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectMapper.java +++ b/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 { IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); List userProjectList(); List getUserProjectBySid( @Param("projectSid") String projectSid,@Param("userType")String userType); + List getUsersByprojectSid( @Param("projectSid") String projectSid); } diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectMapper.xml b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectMapper.xml index ec7bc4ff..65fc8ef6 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectMapper.xml +++ b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectMapper.xml @@ -19,4 +19,7 @@ + \ No newline at end of file diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectRest.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectRest.java index bb19aaa6..3af0c900 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectRest.java +++ b/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> getUsersByprojectSid(@RequestParam("projectSid") String projectSid){ + ResultBean rb = ResultBean.fireFail(); + return UserProjectService.getUsersByprojectSid(projectSid); + } } diff --git a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectService.java b/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectService.java index 35e6720f..fbfe2456 100644 --- a/yxt_supervise/supervise-crm/supervise-crm-biz/src/main/java/com/yxt/supervise/crm/biz/userproject/UserProjectService.java +++ b/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> getUsersByprojectSid(String projectSid){ + ResultBean rb=new ResultBean(); + List banks=baseMapper.getUsersByprojectSid(projectSid); + return rb.success().setData(banks); + } + public ResultBean delete(String sid) { ResultBean rb=new ResultBean(); baseMapper.delete(new QueryWrapper().eq("sid",sid)); diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/imgmessageslog/ImgMessagesLog.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/imgmessageslog/ImgMessagesLog.java new file mode 100644 index 00000000..6bd7c584 --- /dev/null +++ b/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; +} diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/imgmessageslog/ImgMessagesLogDto.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/imgmessageslog/ImgMessagesLogDto.java new file mode 100644 index 00000000..a0b32634 --- /dev/null +++ b/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 content; + private Map content; + private List messageOpenids; + private String openid;//小程序openid + private String projectSid; + private String orderDate; + private String riskSid; +} diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/imgmessageslog/ImgMessagesLogQuery.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/imgmessageslog/ImgMessagesLogQuery.java new file mode 100644 index 00000000..9dcd0bac --- /dev/null +++ b/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全部 +} diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/imgmessageslog/ImgMessagesLogVo.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/imgmessageslog/ImgMessagesLogVo.java new file mode 100644 index 00000000..655648e2 --- /dev/null +++ b/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 map; + private String riskSid; + private String shName; + private List devices; + private String text; + + + public Map getMap() { + Map 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; + } +} diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/imgmessageuser/ImgMessageUser.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/imgmessageuser/ImgMessageUser.java new file mode 100644 index 00000000..606cd030 --- /dev/null +++ b/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; +} diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/imgmessageuser/ImgMessageUserDto.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/imgmessageuser/ImgMessageUserDto.java new file mode 100644 index 00000000..8aa74a61 --- /dev/null +++ b/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; +} diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/imgmessageuser/ImgMessageUserQuery.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/imgmessageuser/ImgMessageUserQuery.java new file mode 100644 index 00000000..b3e23bd0 --- /dev/null +++ b/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; +} diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/imgmessageuser/ImgMessageUserVo.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/imgmessageuser/ImgMessageUserVo.java new file mode 100644 index 00000000..78e04bab --- /dev/null +++ b/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; +} diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/riskmessageslog/RiskMessagesLog.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/riskmessageslog/RiskMessagesLog.java new file mode 100644 index 00000000..5dd7b44a --- /dev/null +++ b/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; +} diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/riskmessageslog/RiskMessagesLogDto.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/riskmessageslog/RiskMessagesLogDto.java new file mode 100644 index 00000000..00a9b286 --- /dev/null +++ b/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 content; + private Map content; + private List messageOpenids; + private String openid;//小程序openid + private String projectSid; + private String orderDate; + private String riskSid; +} diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/riskmessageslog/RiskMessagesLogQuery.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/riskmessageslog/RiskMessagesLogQuery.java new file mode 100644 index 00000000..f1df7690 --- /dev/null +++ b/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全部 +} diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/riskmessageslog/RiskMessagesLogVo.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/riskmessageslog/RiskMessagesLogVo.java new file mode 100644 index 00000000..786ec5cd --- /dev/null +++ b/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 map; + private String riskSid; + private String shName; + private List devices; + private String text; + + + public Map getMap() { + Map 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; + } +} diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/riskmessageuser/RiskMessageUser.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/riskmessageuser/RiskMessageUser.java new file mode 100644 index 00000000..bfdbe7a4 --- /dev/null +++ b/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; +} diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/riskmessageuser/RiskMessageUserDto.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/riskmessageuser/RiskMessageUserDto.java new file mode 100644 index 00000000..842d1bfd --- /dev/null +++ b/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; +} diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/riskmessageuser/RiskMessageUserQuery.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/riskmessageuser/RiskMessageUserQuery.java new file mode 100644 index 00000000..0ce0f015 --- /dev/null +++ b/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; +} diff --git a/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/riskmessageuser/RiskMessageUserVo.java b/yxt_supervise/supervise-report/supervise-report-api/src/main/java/com/yxt/supervise/report/api/riskmessageuser/RiskMessageUserVo.java new file mode 100644 index 00000000..d2a61435 --- /dev/null +++ b/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; +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreport/CsmCashReportRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreport/CsmCashReportRest.java index 1c4642ec..7faaad49 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/csmcashreport/CsmCashReportRest.java +++ b/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 - CsmCashLogService csmCashLogService; +// @Autowired +// CsmCashLogService csmCashLogService; @Autowired WechatRest wechatRest; diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageslog/ImgMessagesLogMapper.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageslog/ImgMessagesLogMapper.java new file mode 100644 index 00000000..99951528 --- /dev/null +++ b/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 { + @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 selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + @Select("select * from risk_messages_log where sid =#{sid} order by messageTime desc limit 1") + ImgMessagesLogVo getMessageBySid(@Param("sid") String sid); +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageslog/ImgMessagesLogMapper.xml b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageslog/ImgMessagesLogMapper.xml new file mode 100644 index 00000000..f4c9f3be --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageslog/ImgMessagesLogMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageslog/ImgMessagesLogRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageslog/ImgMessagesLogRest.java new file mode 100644 index 00000000..ab6717e1 --- /dev/null +++ b/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 pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo 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 pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = ImgMessagesLogService.listPage(pq); + return rb.success().setData(pv); + } + +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageslog/ImgMessagesLogService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageslog/ImgMessagesLogService.java new file mode 100644 index 00000000..8ef980d7 --- /dev/null +++ b/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 { + @Autowired + MessageOpenidService messageOpenidService; + @Autowired + com.yxt.supervise.report.ds.system.systemMapper systemMapper; + @Autowired + RmsMapper rmsMapper; + public ResultBean save(ImgMessagesLogDto dto) { + //删除同天同项目消息 + baseMapper.delete(new QueryWrapper().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 list=new ArrayList<>(); + for (String u:split){ + list.add(u); + } + vo.setDevices(list); + return rb.success().setData(vo); + + } + public PagerVo listPage(PagerQuery pq) { + ResultBean rb=new ResultBean(); + ImgMessagesLogQuery query = pq.getParams(); +// String openid=systemMapper.getAppletOpenidByUsersid(query.getUserSid()); + SysUser sysUser=systemMapper.getAppletOpenidByUsersid(query.getUserSid()); + IPage page = PagerUtil.queryToPage(pq); + QueryWrapper 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 pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + public ResultBean numberOfJobs(String userSid){ + ResultBean rb =new ResultBean(); + Map 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 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 changeState(PagerQuery pq) { + ResultBean rb=new ResultBean(); + ImgMessagesLogQuery query = pq.getParams(); +// String openid=systemMapper.getAppletOpenidByUsersid(query.getUserSid()); + IPage page = PagerUtil.queryToPage(pq); + SysUser sysUser=systemMapper.getAppletOpenidByUsersid(query.getUserSid()); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("o.openId",sysUser.getAppletOpenid()); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageuser/ImgMessageUserMapper.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageuser/ImgMessageUserMapper.java new file mode 100644 index 00000000..164dfc1b --- /dev/null +++ b/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 { + + +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageuser/ImgMessageUserMapper.xml b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageuser/ImgMessageUserMapper.xml new file mode 100644 index 00000000..d3f69b34 --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageuser/ImgMessageUserMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageuser/ImgMessageUserRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageuser/ImgMessageUserRest.java new file mode 100644 index 00000000..39e7c68c --- /dev/null +++ b/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 dto){ + return ImgMessageUserService.save(dto); + } +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageuser/ImgMessageUserService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/imgmessageuser/ImgMessageUserService.java new file mode 100644 index 00000000..2cb3b9ad --- /dev/null +++ b/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 { + + public ResultBean save(List 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("保存成功"); + + } +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/messagepushlog/MessagePushLogService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/messagepushlog/MessagePushLogService.java index f506e6b7..7a23f5d9 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/messagepushlog/MessagePushLogService.java +++ b/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().eq("projectSid",dto.getProjectSid()).eq("orderDate",dto.getOrderDate())); @@ -58,6 +76,42 @@ public class MessagePushLogService extends MybatisBaseService().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().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 listPage(PagerQuery pq) { ResultBean rb=new ResultBean(); diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogMapper.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogMapper.java new file mode 100644 index 00000000..1247206f --- /dev/null +++ b/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 { + @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 selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + @Select("select * from risk_messages_log where sid =#{sid} order by messageTime desc limit 1") + RiskMessagesLogVo getMessageBySid(@Param("sid") String sid); +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogMapper.xml b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogMapper.xml new file mode 100644 index 00000000..88ba2aa5 --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogRest.java new file mode 100644 index 00000000..f8893536 --- /dev/null +++ b/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 pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo 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 pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = RiskMessagesLogService.listPage(pq); + return rb.success().setData(pv); + } + +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageslog/RiskMessagesLogService.java new file mode 100644 index 00000000..4bcd9b15 --- /dev/null +++ b/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 { + @Autowired + MessageOpenidService messageOpenidService; + @Autowired + com.yxt.supervise.report.ds.system.systemMapper systemMapper; + @Autowired + RmsMapper rmsMapper; + public ResultBean save(RiskMessagesLogDto dto) { + //删除同天同项目消息 + baseMapper.delete(new QueryWrapper().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 listPage(PagerQuery pq) { + ResultBean rb=new ResultBean(); + RiskMessagesLogQuery query = pq.getParams(); +// String openid=systemMapper.getAppletOpenidByUsersid(query.getUserSid()); + SysUser sysUser=systemMapper.getAppletOpenidByUsersid(query.getUserSid()); + IPage page = PagerUtil.queryToPage(pq); + QueryWrapper 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 pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + public ResultBean numberOfJobs(String userSid){ + ResultBean rb =new ResultBean(); + Map 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 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 changeState(PagerQuery pq) { + ResultBean rb=new ResultBean(); + RiskMessagesLogQuery query = pq.getParams(); +// String openid=systemMapper.getAppletOpenidByUsersid(query.getUserSid()); + IPage page = PagerUtil.queryToPage(pq); + SysUser sysUser=systemMapper.getAppletOpenidByUsersid(query.getUserSid()); + QueryWrapper qw = new QueryWrapper<>(); + qw.eq("o.openId",sysUser.getAppletOpenid()); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageuser/RiskMessageUserMapper.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageuser/RiskMessageUserMapper.java new file mode 100644 index 00000000..5da4c681 --- /dev/null +++ b/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 { + + +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageuser/RiskMessageUserMapper.xml b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageuser/RiskMessageUserMapper.xml new file mode 100644 index 00000000..13d20485 --- /dev/null +++ b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageuser/RiskMessageUserMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + + + \ No newline at end of file diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageuser/RiskMessageUserRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageuser/RiskMessageUserRest.java new file mode 100644 index 00000000..121ab6a4 --- /dev/null +++ b/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 dto){ + return RiskMessageUserService.save(dto); + } +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageuser/RiskMessageUserService.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/riskmessageuser/RiskMessageUserService.java new file mode 100644 index 00000000..c86ce52b --- /dev/null +++ b/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 { + + public ResultBean save(List 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("保存成功"); + + } +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatRest.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatRest.java index dfce3cf3..8c672c18 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/biz/wechat/WechatRest.java +++ b/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.util.HashMap; -import java.util.List; -import java.util.Map; +import java.text.SimpleDateFormat; +import java.util.*; + +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 user= crmMapper.users(shSid); + List openIds=new ArrayList<>(); + List 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 user= crmMapper.users(shSid); + List openIds=new ArrayList<>(); + List 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 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 diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java index 37f9e9c4..0d8be216 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/CrmMapper.java +++ b/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 { List userProList (); @Select("select userSid from user_project where projectSid=#{projectSid}") List 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 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} ") diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/UserProject.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/UserProject.java index 87a4d2a4..9529673d 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/crm/UserProject.java +++ b/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; - } } diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/rms/RiskAlarm.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/rms/RiskAlarm.java new file mode 100644 index 00000000..50ba2f3a --- /dev/null +++ b/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; +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/rms/RmsMapper.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/ds/rms/RmsMapper.java new file mode 100644 index 00000000..2c7ac2f9 --- /dev/null +++ b/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 { + @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 ); + + +} diff --git a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/wx/SuperviseWxMessSender.java b/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/wx/SuperviseWxMessSender.java index b291235b..5f4dcc17 100644 --- a/yxt_supervise/supervise-report/supervise-report-biz/src/main/java/com/yxt/supervise/report/wx/SuperviseWxMessSender.java +++ b/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 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 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 tousers, String projectSid,String riskSid, String projectName, String reportTime) { + RespMessReturn respMessReturn=new RespMessReturn(); + String orderDate = reportTime.substring(0, 10); + String pagepath = ""; +// String pagepath = ""; + HashMap 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; diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarm/Device.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarm/Device.java new file mode 100644 index 00000000..2b8ffbbf --- /dev/null +++ b/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; + +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarm/DeviceImages.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarm/DeviceImages.java new file mode 100644 index 00000000..206c2749 --- /dev/null +++ b/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; + } +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarm/RiskAlarm.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarm/RiskAlarm.java index 4252dc89..7af68516 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarm/RiskAlarm.java +++ b/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; } diff --git a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarm/RiskAlarmDto.java b/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarm/RiskAlarmDto.java index 038e8443..f3fd54a5 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-api/src/main/java/com/supervise/rms/api/riskalarm/RiskAlarmDto.java +++ b/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 devices; + private String errorCount; + private String name; + private String sendTime; + private List deviceImages; + private String content; } diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarm/RiskAlarmMapper.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarm/RiskAlarmMapper.java index 3e70df1a..b45151f6 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarm/RiskAlarmMapper.java +++ b/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 { IPage listPage(IPage page, @Param(Constants.WRAPPER) Wrapper 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); } diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarm/RiskAlarmRest.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarm/RiskAlarmRest.java index 60db5ce6..b2baa316 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarm/RiskAlarmRest.java +++ b/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.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; /** * @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); +// } } diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarm/RiskAlarmService.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarm/RiskAlarmService.java index 4e6c6b17..8168ee5b 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskalarm/RiskAlarmService.java +++ b/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.RiskAlarmDto; -import com.supervise.rms.api.riskalarm.RiskAlarmQuery; -import com.supervise.rms.api.riskalarm.RiskAlarmVo; +import com.supervise.rms.api.riskalarm.*; +import com.supervise.rms.api.riskindicators.RiskIndicators; +import com.supervise.rms.biz.riskindicators.RiskIndicatorsService; +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 { + /** + * 设置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 listPage(PagerQuery pq){ + public PagerVo listPage(PagerQuery pq) { RiskAlarmQuery params = pq.getParams(); QueryWrapper wq = new QueryWrapper<>(); - if (params != null){ - if (StringUtils.isBlank(params.getIndicatorName())){ + if (params != null) { + if (StringUtils.isBlank(params.getIndicatorName())) { } } @@ -37,17 +81,124 @@ public class RiskAlarmService extends MybatisBaseService().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 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().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("成功"); + } } diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicators/RiskIndicatorsMapper.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicators/RiskIndicatorsMapper.java index 52e46fd9..94b23279 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicators/RiskIndicatorsMapper.java +++ b/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 { IPage listPage(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + List listAll(); + } diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicators/RiskIndicatorsMapper.xml b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicators/RiskIndicatorsMapper.xml index 38ed5bdd..1b4192d7 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicators/RiskIndicatorsMapper.xml +++ b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicators/RiskIndicatorsMapper.xml @@ -9,4 +9,10 @@ ${ew.sqlSegment} + \ No newline at end of file diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicators/RiskIndicatorsRest.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicators/RiskIndicatorsRest.java index 3c8dff94..b4126be6 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicators/RiskIndicatorsRest.java +++ b/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 listPage = riskIndicatorService.listPage(pq); return rb.success().setData(listPage); } - + @ApiOperation("查询风险指标列表") + @PostMapping("/listAll") + public ResultBean listAll(){ + ResultBean rb = ResultBean.fireFail(); + List list = riskIndicatorService.listAll(); + return rb.success().setData(list); + } @ApiOperation("删除风险指标") @GetMapping("/del/{sid}") public ResultBean del(@PathVariable String sid){ diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicators/RiskIndicatorsService.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicators/RiskIndicatorsService.java index 9dab41ce..55fa9668 100644 --- a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/biz/riskindicators/RiskIndicatorsService.java +++ b/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 pageToVo = PagerUtil.pageToVo(iPage, null); return pageToVo; } + public List listAll(){ + List list = baseMapper.listAll(); + return list; + } } diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/feign/crm/ProjectInformationFeign.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/feign/crm/ProjectInformationFeign.java new file mode 100644 index 00000000..f2611dfe --- /dev/null +++ b/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); +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/feign/crm/StoreHouseProjectFeign.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/feign/crm/StoreHouseProjectFeign.java new file mode 100644 index 00000000..fa41f261 --- /dev/null +++ b/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 selectProjectByshSid(@PathVariable("sid")String sid); +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/feign/crm/StoreHouseProjectVo.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/feign/crm/StoreHouseProjectVo.java new file mode 100644 index 00000000..189bdd42 --- /dev/null +++ b/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 +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/feign/crm/UserProjectFeign.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/feign/crm/UserProjectFeign.java new file mode 100644 index 00000000..dfb219f8 --- /dev/null +++ b/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> getUsersByprojectSid(@RequestParam("projectSid") String projectSid); +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/feign/crm/UserProjectVo.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/feign/crm/UserProjectVo.java new file mode 100644 index 00000000..a2e0e21c --- /dev/null +++ b/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; + } +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/feign/report/WechatFeign.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/feign/report/WechatFeign.java new file mode 100644 index 00000000..7c47632a --- /dev/null +++ b/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); +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/feign/system/SysUser.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/feign/system/SysUser.java new file mode 100644 index 00000000..d6329baa --- /dev/null +++ b/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(门户建设)
+ * File: SysUser.java
+ * Class: SysUser
+ * Description: 用户表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2021-08-03 00:24:30
+ * + * @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 roleNames; + private String unionid; + //d订阅状态 + private String subscriptionStatus; +} diff --git a/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/feign/system/sysUserFeign.java b/yxt_supervise/supervise-rms/supervise-rms-biz/src/main/java/com/supervise/rms/feign/system/sysUserFeign.java new file mode 100644 index 00000000..b6a75074 --- /dev/null +++ b/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> getUsersBySid(@RequestBody List list); +} diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserRest.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserRest.java index ae4db2e2..315458f3 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserRest.java +++ b/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 map){ return sysUserService.updateSysUserImage(map); } + @PostMapping("/getUsersBySid") + public ResultBean> getUsersBySid(@RequestBody List list){ + return sysUserService.getUsersBySid(list); + } } diff --git a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java b/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java index 3579c562..e8f2091e 100644 --- a/yxt_supervise/supervise-system/supervise-system-biz/src/main/java/com/yxt/supervise/system/sysuser/SysUserService.java +++ b/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 { int sid = baseMapper.update(sysUser, new QueryWrapper().eq("sid", sysUser.getSid())); return rb.success().setMsg("上传成功"); } + public ResultBean> getUsersBySid(List list){ + ResultBean rb = ResultBean.fireFail(); + Listusers=baseMapper.selectList(new QueryWrapper().in("sid",list)); + + return rb.success().setData(users); + } } \ No newline at end of file