diff --git a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java index 610af898..50f246fe 100644 --- a/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java +++ b/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java @@ -125,6 +125,8 @@ public class ShiroConfig { filterChainDefinitionMap.put("/meeting/payMeetingSituation/page2","anon");//查询参会人 filterChainDefinitionMap.put("/sys/user/payUserList","anon");//查询负责人 filterChainDefinitionMap.put("/meeting/payMeeting/createBase64","anon");//生成二维码 + filterChainDefinitionMap.put("/send/message/standardsSend","anon");//会员系统更新收费通知单发送消息 + //不需要权限的接口 filterChainDefinitionMap.put("/meeting/payMeetingSituation/signUp","anon");//报名 filterChainDefinitionMap.put("/meeting/payMeetingSituation/validInvitationCode","anon");//报名 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/CompanyMessageEnums.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/CompanyMessageEnums.java index 634b3c1f..704eb6c6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/CompanyMessageEnums.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/CompanyMessageEnums.java @@ -33,7 +33,8 @@ public enum CompanyMessageEnums { MSG19("QY_19_HYTZ_CANCELLATION","合同通知","contractNum,contractName"),//合同列表页 contractNum,contractName MSG20("QY_20_HYTZ_NOT_AUDIT_CREATE","项目通知","projectName,"),//项目详情页/弹框 projectName MSG21("QY_21_HYTZ_NOT_AUDIT_CREATE","合同通知","contractNum,contractName"),//合同列表页 contractNum,contractName 对应原型的序号19 - MSG22("QY_22_WJTZ_DEND_FILE","文件通知","projectName");// 弹窗：查看该项目详情，projectName + MSG22("QY_22_WJTZ_DEND_FILE","文件通知","projectName"),// 弹窗：查看该项目详情，projectName + MSG23("QY_23_WJTZ_FILE_EDIT","文件通知","year");// 进入收费通知的页面 private String code; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java index 9b8e78e9..5c8e8a11 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/enums/MessageUrlEnums.java @@ -50,8 +50,8 @@ public enum MessageUrlEnums { C_OPEN_TYPE19("C_OPEN_TYPE19","url","/mineContract/MineContract"), C_OPEN_TYPE20("C_OPEN_TYPE20","project",""), C_OPEN_TYPE21("C_OPEN_TYPE21","url","/mineContract/MineContract"), - C_OPEN_TYPE22("C_OPEN_TYPE22","component","MessagePage/ProjectDetailModal"); - + C_OPEN_TYPE22("C_OPEN_TYPE22","component","MessagePage/ProjectDetailModal"), + C_OPEN_TYPE23("C_OPEN_TYPE23","url","/standardsAssociation/approvalDocumentNumberList"); /** * 业务类型(email:邮件 bpm:流程) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java index d51f9de3..1e55f0c6 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java @@ -1,5 +1,6 @@ package com.jero.common.service.impl; +import cn.hutool.core.thread.ThreadUtil; import com.alibaba.fastjson.JSONObject; import com.jero.common.common.ProjectCommon; import com.jero.common.constant.CommonConstant; @@ -34,6 +35,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.*; +import java.util.concurrent.ExecutorService; @Slf4j @Service diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/system/controller/SystemSendMessageController.java b/jero-boot-incoming-payment/src/main/java/com/jero/system/controller/SystemSendMessageController.java index 2444825d..a0d5f0e1 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/system/controller/SystemSendMessageController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/system/controller/SystemSendMessageController.java @@ -1,12 +1,16 @@ package com.jero.system.controller; +import cn.hutool.core.thread.ThreadUtil; import com.alibaba.fastjson.JSONObject; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.common.ProjectCommon; import com.jero.common.constant.CommonConstant; import com.jero.common.constant.WebsocketConst; +import com.jero.common.dto.SendMessageDTO; +import com.jero.common.enums.CompanyMessageEnums; import com.jero.common.exception.JeroBootException; +import com.jero.common.service.SendMessageService; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.PasswordUtil; import com.jero.common.util.oConvertUtils; @@ -27,15 +31,15 @@ import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.BeanUtils; import org.springframework.core.env.Environment; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Objects; +import java.util.concurrent.ExecutorService; +import java.util.stream.Collectors; /** @@ -62,6 +66,8 @@ public class SystemSendMessageController { private Environment env; @Resource private ISysAnnouncementService sysAnnouncementService; + @Resource + private SendMessageService sendMessageService; /** * 发送站内消息 @@ -76,20 +82,20 @@ public class SystemSendMessageController { public Result sendAllUserMessage(@RequestParam("content") String content) { List listPayContactsManagement = payContactsManagementService.list(); if(!CollectionUtils.isEmpty(listPayContactsManagement)){ + SysAnnouncement announcement = new SysAnnouncement(); + announcement.setTitile(ProjectCommon.ALERT12); + announcement.setMsgContent(content); + announcement.setSender(env.getProperty("message.systemEmailUser")); + announcement.setPriority(CommonConstant.PRIORITY_M); + announcement.setMsgType(CommonConstant.MSG_TYPE_UESR); + announcement.setSendStatus(CommonConstant.HAS_SEND); + announcement.setSendTime(new Date()); + announcement.setMsgCategory(CommonConstant.MSG_CATEGORY_2); + announcement.setDelFlag(String.valueOf(CommonConstant.DEL_FLAG_0)); + sysAnnouncementService.save(announcement); listPayContactsManagement.parallelStream().forEach(p->{ try { String toUser = PasswordUtil.decrypt(p.getPhone()); - SysAnnouncement announcement = new SysAnnouncement(); - announcement.setTitile(ProjectCommon.ALERT12); - announcement.setMsgContent(content); - announcement.setSender(env.getProperty("message.systemEmailUser")); - announcement.setPriority(CommonConstant.PRIORITY_M); - announcement.setMsgType(CommonConstant.MSG_TYPE_UESR); - announcement.setSendStatus(CommonConstant.HAS_SEND); - announcement.setSendTime(new Date()); - announcement.setMsgCategory(CommonConstant.MSG_CATEGORY_2); - announcement.setDelFlag(String.valueOf(CommonConstant.DEL_FLAG_0)); - sysAnnouncementService.save(announcement); // 2.插入用户通告阅读标记表记录 String[] userIds = toUser.split(","); String anntId = announcement.getId(); @@ -128,4 +134,29 @@ public class SystemSendMessageController { } return Result.OK("操作成功"); } + @ApiOperation(value = "会员系统更新收费通知单发送消息", notes = "会员系统更新收费通知单发送消息") + @GetMapping(value = "/standardsSend") + public Result add(String year) { + List listPayContactsManagement = payContactsManagementService.list(); + if (listPayContactsManagement.isEmpty()) { + return Result.OK(); + } + String toUser = listPayContactsManagement.stream().map(PayContactsManagement::getPhone).collect(Collectors.joining(",")); + // 发送消息 + SendMessageDTO sendMessageDTO = new SendMessageDTO(); + + HashMap map = new HashMap<>(); + map.put("year", year); + sendMessageDTO.setFromUser("BXGLZ"); + sendMessageDTO.setToUser(toUser); + sendMessageDTO.setTemplateCode(CompanyMessageEnums.MSG23.getCode()); + sendMessageDTO.setTemplateParam(map); + sendMessageDTO.setBusType("C_OPEN_TYPE23"); + JSONObject jsonObject = new JSONObject(); + //jsonObject.put("id", id); + sendMessageDTO.setBusId(jsonObject.toJSONString()); + sendMessageService.SendMessageService(sendMessageDTO); + + return Result.OK(); + } }