Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-core

modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMessageService.java

@@ -80,4 +80,11 @@ public interface ISysMessageService {
      * @param refUserMessage
      */
     SysRefUserMessage insertSysRefUserMessage(SysRefUserMessage refUserMessage);
+
+    /**
+     * 添加消息并发送
+     * @param sysMessage
+     * @return
+     */
+    void sendSysMessage(SysMessage sysMessage);
 }

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

@@ -102,14 +102,14 @@ public class SysEnumController extends CoreBaseController{
     @ApiOperation(value = "用户消息状态", notes = "用户消息状态")
     public ResultBean getUserMessageStatus(){
         return new ResultBean(true, "操作成功",
-                Arrays.asList(ImppEnumUtil.USER_MESSAGE_STATUS.values()));
+                Arrays.asList(ImppEnumUtil.MESSAGE_STATUS.values()));
     }
 
     @GetMapping("/user-message-type")
     @ApiOperation(value = "用户消息类型", notes = "用户消息类型")
     public ResultBean getUserMessageType(){
         return new ResultBean(true, "操作成功",
-                Arrays.asList(ImppEnumUtil.USER_MESSAGE_TYPE.values()));
+                Arrays.asList(ImppEnumUtil.MESSAGE_TYPE.values()));
     }
 
     @GetMapping("/tool-conn-type")

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

@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.core.apiservice.controller.busi;
 
 import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService;
-import cn.estsh.i3plus.core.apiservice.mq.I3CoreQueueConfig;
 import cn.estsh.i3plus.platform.common.convert.ConvertBean;
 import cn.estsh.i3plus.platform.common.tool.StringTool;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
@@ -65,12 +64,7 @@ public class SysMessageController extends CoreBaseController {
 
             ConvertBean.modelInitialize(sysMessage,getSessionUser());
 
-            // 判断消息类型推送到对应的队列
-            if(ImppEnumUtil.USER_MESSAGE_TYPE.MAIL.getValue() == sysMessage.getMessageType().intValue()){
-                rabbitTemplate.convertAndSend(I3CoreQueueConfig.IMPP_MESSAGE_MAIL_QUEUE,sysMessage);
-            }else{
-                rabbitTemplate.convertAndSend(I3CoreQueueConfig.IMPP_MESSAGE_LETTER_QUEUE,sysMessage);
-            }
+            sysMessageService.sendSysMessage(sysMessage);
             return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
             LOGGER.error(busExcep.getErrorMsg() + "：{}",busExcep.getErrorDetail(),busExcep);

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

@@ -1,9 +1,11 @@
 package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
 
 import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService;
+import cn.estsh.i3plus.core.apiservice.mq.I3CoreQueueConfig;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.common.PagerHelper;
+import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
 import cn.estsh.i3plus.pojo.platform.bean.SysMessage;
 import cn.estsh.i3plus.pojo.platform.bean.SysRefUserMessage;
 import cn.estsh.i3plus.pojo.platform.repository.SysMessageRepository;
@@ -113,4 +115,14 @@ public class SysMessageService implements ISysMessageService {
     public SysRefUserMessage insertSysRefUserMessage(SysRefUserMessage refUserMessage) {
         return refUserMessageRDao.insert(refUserMessage);
     }
+
+    @Override
+    public void sendSysMessage(SysMessage sysMessage) {
+        // 判断消息类型推送到对应的队列
+        if(ImppEnumUtil.MESSAGE_TYPE.MAIL.getValue() == sysMessage.getMessageType().intValue()){
+            rabbitTemplate.convertAndSend(I3CoreQueueConfig.IMPP_MESSAGE_MAIL_QUEUE,sysMessage);
+        }else{
+            rabbitTemplate.convertAndSend(I3CoreQueueConfig.IMPP_MESSAGE_LETTER_QUEUE,sysMessage);
+        }
+    }
 }

modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/mq/TestMQ.java

@@ -33,7 +33,7 @@ public class TestMQ extends TestBase {
         sysMessage.setMessageTitle("test-系统通知");
         sysMessage.setMessageSenderNameRdd("system");
         sysMessage.setMessageSenderId(-1L);
-        sysMessage.setMessageType(ImppEnumUtil.USER_MESSAGE_TYPE.MAIL.getValue());
+        sysMessage.setMessageType(ImppEnumUtil.MESSAGE_TYPE.MAIL.getValue());
         sysMessage.setMessageSendTime("2018-11-01 16:58:00");
 
         for (int i = 0; i < 50; i++) {

modules/i3plus-core-apiservice/src/test/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestMessageServiceImpl.java

@@ -58,7 +58,7 @@
 //        sysMessage.setMessageTitle("test-系统通知");
 //        sysMessage.setMessageSenderNameRdd("system");
 //        sysMessage.setMessageSenderId(-1L);
-//        sysMessage.setMessageType(ImppEnumUtil.USER_MESSAGE_TYPE.MAIL.getValue());
+//        sysMessage.setMessageType(ImppEnumUtil.MESSAGE_TYPE.MAIL.getValue());
 //        sysMessage.setMessageSendTime("2018-11-01 16:58:00");
 //
 //        for (int i = 0; i < 50; i++) {