表单-布局新增行列设置初始数据

SWEB通知附件调整
定时任务日志添加所属模块
消息设置所属模块
消息微服务调用方法调整

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java

@@ -11,6 +11,8 @@ import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
+import cn.estsh.i3plus.pojo.model.platform.MessagePagerModel;
+import cn.estsh.i3plus.pojo.model.platform.RefUserMessagePagerModel;
 import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
 import cn.estsh.i3plus.pojo.platform.bean.SysMessage;
 import cn.estsh.i3plus.pojo.platform.bean.SysRefUserMessage;
@@ -54,7 +56,7 @@ public class SysMessageController extends CoreBaseController {
 
     @PostMapping(value = "/sys-message/insert")
     @ApiOperation(value = "新增消息",notes = "新增消息")
-    public ResultBean insertSysMessage(SysMessage sysMessage){
+    public ResultBean insertSysMessage(@RequestBody SysMessage sysMessage){
         try {
             // 条件校验
             ValidatorBean.beginValid(sysMessage)
@@ -162,9 +164,10 @@ public class SysMessageController extends CoreBaseController {
 
     @GetMapping(value = "/sys-message/query")
     @ApiOperation(value = "消息复杂查询，分页，排序",notes = "消息复杂查询，分页，排序")
-    public ResultBean querySysMessageByPager(SysMessage sysMessage, Pager pager){
+    public ResultBean querySysMessageByPager(@RequestBody MessagePagerModel messagePagerModel){
         try {
-            ListPager sysMessageListPager = sysMessageService.querySysMessageByPager(sysMessage,pager);
+            ListPager sysMessageListPager = sysMessageService.querySysMessageByPager(messagePagerModel.getSysMessage(),
+                    messagePagerModel.getPager());
             return  ResultBean.success("操作成功").setListPager(sysMessageListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
             return ResultBean.fail(busExcep);
@@ -341,9 +344,10 @@ public class SysMessageController extends CoreBaseController {
 
     @GetMapping(value = "/user-message/query")
     @ApiOperation(value = "消息复杂查询，分页，排序",notes = "消息复杂查询，分页，排序")
-    public ResultBean querySysRefUserMessageByPager(SysRefUserMessage sysRefUserMessage, Pager pager){
+    public ResultBean querySysRefUserMessageByPager(@RequestBody RefUserMessagePagerModel refUserMessagePagerModel){
         try {
-            ListPager sysMessageListPager = sysMessageService.querySysRefUserMessageByPager(sysRefUserMessage, pager);
+            ListPager sysMessageListPager = sysMessageService.querySysRefUserMessageByPager(
+                    refUserMessagePagerModel.getSysRefUserMessage(),refUserMessagePagerModel.getPager());
             return  ResultBean.success("操作成功").setListPager(sysMessageListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
             return ResultBean.fail(busExcep);

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageLetterQueueReceiver.java

@@ -80,6 +80,7 @@ public class MessageLetterQueueReceiver {
                         for (SysUser user : userList) {
                             refUserMessage = new SysRefUserMessage();
                             refUserMessage.setMessageId(msg.getId());
+                            refUserMessage.setMessageSoftType(msg.getMessageSoftType());
                             refUserMessage.setMessageTitleRdd(msg.getMessageTitle());
                             refUserMessage.setMessageTypeRdd(msg.getMessageType());
                             refUserMessage.setMessageSenderNameRdd(msg.getMessageSenderNameRdd());

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java

@@ -6,6 +6,7 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService;
 import cn.estsh.i3plus.core.apiservice.util.MailUtil;
 import cn.estsh.i3plus.platform.common.tool.TimeTool;
 import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
 import cn.estsh.i3plus.pojo.platform.bean.SysMessage;
 import cn.estsh.i3plus.pojo.platform.bean.SysRefUserMessage;
@@ -90,6 +91,7 @@ public class MessageMailQueueReceiver {
 
                         refUserMessage = new SysRefUserMessage();
                         refUserMessage.setMessageId(msg.getId());
+                        refUserMessage.setMessageSoftType(msg.getMessageSoftType());
                         refUserMessage.setMessageTitleRdd(msg.getMessageTitle());
                         refUserMessage.setMessageTypeRdd(msg.getMessageType());
                         refUserMessage.setMessageSenderNameRdd(msg.getMessageSenderNameRdd());
@@ -97,6 +99,7 @@ public class MessageMailQueueReceiver {
                         refUserMessage.setReceiverNameRdd(sysUser.getUserName());
                         refUserMessage.setMessageStatus(ImppEnumUtil.MESSAGE_STATUS.UNREAD.getValue());
                         refUserMessage.setReceiverTime(TimeTool.getNowTime(true));
+                        refUserMessage.setIsUrgent(msg.getIsUrgent());
 
                         sysMessageService.insertSysRefUserMessage(refUserMessage);
 

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageSWebNoticeQueueReceiver.java

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.mq;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysFileAttachService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysFileService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService;
+import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.platform.common.tool.TimeTool;
 import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
@@ -67,10 +68,14 @@ public class MessageSWebNoticeQueueReceiver {
                 SysFile sysFile;
                 for (SysFileAttach sysFileAttach : msg.getSysFileAttachList()) {
                     sysFile = sysFileService.getSysFileById(sysFileAttach.getFileId());
-                    if(sysFile == null){
+                    if(sysFile != null){
                         sysFileAttach.setRefId(msg.getId());
-                        sysFileAttach.setFileNameRdd(sysFile.getName());
+                        sysFileAttach.setFileNameRdd(sysFile.getFileOriginalName());
                         sysFileAttach.setFilePathRdd(sysFile.getFilePath());
+                        // 初始数据
+                        ConvertBean.serviceModelInitialize(sysFileAttach, msg.getCreateUser());
+
+                        sysFileAttachService.insertSysFileAttach(sysFileAttach);
                     }
                 }
             }
@@ -86,7 +91,7 @@ public class MessageSWebNoticeQueueReceiver {
                 for (String user : userJsonObject.keySet()) {
                     refUserMessage = new SysRefUserMessage();
                     refUserMessage.setMessageId(msg.getId());
-                    refUserMessage.setMessageSoftType(CommonEnumUtil.SOFT_TYPE.SWEB.getValue());
+                    refUserMessage.setMessageSoftType(msg.getMessageSoftType());
                     refUserMessage.setMessageTitleRdd(msg.getMessageTitle());
                     refUserMessage.setMessageTypeRdd(msg.getMessageType());
                     refUserMessage.setMessageSenderNameRdd(msg.getMessageSenderNameRdd());

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/ScheduleQueueReceiver.java

@@ -67,6 +67,7 @@ public class ScheduleQueueReceiver {
 
                 // 添加定时任务日志
                 logTaskTime.setTaskPlanId(taskPlan.getId());
+                logTaskTime.setTaskSoftTypeRdd(taskPlan.getTaskSoftTypeRdd());
                 logTaskTime.setTaskCycleNameRdd(taskPlan.getTaskCycleNameRdd());
                 logTaskTime.setTaskCycleExpsRdd(taskPlan.getTaskCycleExpsRdd());
                 sysTaskPlanService.logInsertSysLogTaskTime(logTaskTime);
@@ -76,6 +77,7 @@ public class ScheduleQueueReceiver {
                         && CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() == taskPlan.getIsNotice()) {
                     // 设置通知邮件内容
                     SysMessage sysMessage = new SysMessage();
+                    sysMessage.setMessageSoftType(logTaskTime.getTaskSoftTypeRdd());
                     sysMessage.setMessageType(taskPlan.getNoticeMethod());
                     sysMessage.setMessageSenderNameRdd("系统管理员");
                     sysMessage.setMessageTitle("任务计划失败通知");

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMessageService.java

@@ -157,11 +157,20 @@ public class SysMessageService implements ISysMessageService {
     @ApiOperation(value = "添加消息并发送")
     public void doSendSysMessage(SysMessage sysMessage) {
         // 判断消息类型推送到对应的队列
-        if(ImppEnumUtil.MESSAGE_TYPE.MAIL.getValue() == sysMessage.getMessageType().intValue()){
+        if(ImppEnumUtil.MESSAGE_TYPE.MAIL.getValue() == sysMessage.getMessageTypeValue()){
             rabbitTemplate.convertAndSend(PlatformConstWords.IMPP_MESSAGE_MAIL_QUEUE,sysMessage);
-        }else{
+        }else if(ImppEnumUtil.MESSAGE_TYPE.LETTER.getValue() == sysMessage.getMessageTypeValue()){
             rabbitTemplate.convertAndSend(PlatformConstWords.IMPP_MESSAGE_LETTER_QUEUE,sysMessage);
             rabbitTemplate.convertAndSend(PlatformConstWords.IMPP_MESSAGE_LETTER_QUEUE_BAK,sysMessage);
+        } else if(ImppEnumUtil.MESSAGE_TYPE.SWEB_NOTICE.getValue() == sysMessage.getMessageTypeValue()){
+            rabbitTemplate.convertAndSend(PlatformConstWords.SWEB_NOTICE_QUEUE,sysMessage);
+        } else {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+                    .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode())
+                    .setErrorDetail("消息类型不存在")
+                    .setErrorSolution("请重新设置消息类型")
+                    .build();
         }
     }