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

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

@@ -127,6 +127,13 @@ public interface ISysMessageService {
     void updateSysRefUserMessageStatusByIds(Long[] ids,Integer status);
 
     /**
+     * 删除用户消息
+     * @param id
+     */
+    @ApiOperation(value = "删除用户消息")
+    void deleteSysRefUserMessageStatusById(Long id);
+
+    /**
      * 批量删除用户消息
      * @param ids
      */

modules/i3plus-core-apiservice/pom.xml

@@ -26,7 +26,12 @@
 
         <dependency>
             <groupId>i3plus.icloud</groupId>
-            <artifactId>i3plus-icloud-wms</artifactId>
+            <artifactId>i3plus-icloud-mes</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>i3plus.icloud</groupId>
+            <artifactId>i3plus-icloud-mes-pcn</artifactId>
         </dependency>
 
         <!-- 对象 -->

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

@@ -293,7 +293,7 @@ public class SysMessageController extends CoreBaseController {
     @ApiOperation(value = "根据id删除用户消息")
     public ResultBean deleteUserMessageById(@PathVariable("id") String idStr){
         try {
-            sysMessageService.deleteSysRefUserMessageStatusByIds(new Long[]{Long.parseLong(idStr)});
+            sysMessageService.deleteSysRefUserMessageStatusById(Long.parseLong(idStr));
             return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
             return ResultBean.fail(busExcep);
@@ -361,4 +361,22 @@ public class SysMessageController extends CoreBaseController {
             return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
         }
     }
+
+    /**
+     * 用户消息删除
+     * @param idStr 用户消息id
+     * @return 处理结果
+     */
+    @DeleteMapping(value = "/user-message/delete/{id}")
+    @ApiOperation(value = "消息复杂查询，分页，排序",notes = "消息复杂查询，分页，排序")
+    public ResultBean<SysRefUserMessage> deleteSysRefUserMessageById(@PathVariable("id") String idStr){
+        try {
+            sysMessageService.deleteSysRefUserMessageStatusById(Long.parseLong(idStr));
+            return  ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        }catch(ImppBusiException busExcep){
+            return ResultBean.fail(busExcep);
+        }catch(Exception e){
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
 }

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.core.apiservice.controller.busi;
 
 import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskService;
+import cn.estsh.i3plus.icloud.mes.pcn.sdk.IMesPcnCommonCloud;
+import cn.estsh.i3plus.icloud.mes.sdk.IMesCommonCloud;
 import cn.estsh.i3plus.icloud.wms.sdk.IWmsCommonCloud;
 import cn.estsh.i3plus.platform.common.tool.StringTool;
 import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
@@ -16,7 +18,6 @@ import cn.estsh.impp.framework.base.service.ICommonService;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
-import cn.estsh.impp.framework.boot.quartz.IQuartzJobService;
 import cn.estsh.impp.framework.boot.util.ResultBean;
 import cn.estsh.impp.framework.boot.util.ValidatorBean;
 import io.swagger.annotations.Api;
@@ -51,14 +52,27 @@ public class SysTaskController extends CoreBaseController {
     @Autowired
     private IWmsCommonCloud wmsCommonCloud;
 
+    @Autowired
+    private IMesCommonCloud mesCommonCloud;
+
+    @Autowired
+    private IMesPcnCommonCloud mesPcnCommonCloud;
+
     private ICommonService getCommonService(int softType){
         ICommonService commonService = coreCommonService;
 
+        // 平台
         if(softType == CommonEnumUtil.SOFT_TYPE.CORE.getValue()){
-            //平台定时任务
             commonService = coreCommonService;
+            // WMS
         } else if(softType == CommonEnumUtil.SOFT_TYPE.WMS.getValue()){
             commonService = wmsCommonCloud;
+            // MES
+        } else if(softType == CommonEnumUtil.SOFT_TYPE.MES.getValue()){
+            commonService = mesCommonCloud;
+            // MES_PCN
+        } else if(softType == CommonEnumUtil.SOFT_TYPE.MES_PCN.getValue()){
+            commonService = mesPcnCommonCloud;
         }
         return commonService;
     }

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

@@ -3,6 +3,8 @@ package cn.estsh.i3plus.core.apiservice.controller.busi;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskCycleService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskPlanService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskService;
+import cn.estsh.i3plus.icloud.mes.pcn.sdk.IMesPcnScheduleJobCloud;
+import cn.estsh.i3plus.icloud.mes.sdk.IMesScheduleJobCloud;
 import cn.estsh.i3plus.icloud.wms.sdk.IWmsScheduleJobCloud;
 import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
 import cn.estsh.i3plus.pojo.base.bean.BaseResultBean;
@@ -60,6 +62,12 @@ public class SysTaskPlanController extends CoreBaseController{
     @Autowired
     private IWmsScheduleJobCloud wmsScheduleJobCloud;
 
+    @Autowired
+    private IMesScheduleJobCloud mesScheduleJobCloud;
+
+    @Autowired
+    private IMesPcnScheduleJobCloud mesPcnScheduleJobCloud;
+
     /**
      * 根据来源切换定时任务服务
      * @param source CommonEnumUtil.SOFT_TYPE
@@ -68,11 +76,18 @@ public class SysTaskPlanController extends CoreBaseController{
     private IQuartzJobService getJobService(int source){
         IQuartzJobService quartzJobService = scheduleTool;
 
-        if(source == CommonEnumUtil.SOFT_TYPE.CORE.getValue()){
         //平台定时任务
+        if(source == CommonEnumUtil.SOFT_TYPE.CORE.getValue()){
             quartzJobService = scheduleTool;
+            // WMS
         }else if(source == CommonEnumUtil.SOFT_TYPE.WMS.getValue()){
             quartzJobService = wmsScheduleJobCloud;
+            // MES
+        } else if(source == CommonEnumUtil.SOFT_TYPE.MES.getValue()){
+            quartzJobService = mesScheduleJobCloud;
+            // MES_PCN
+        } else if(source == CommonEnumUtil.SOFT_TYPE.MES_PCN.getValue()){
+            quartzJobService = mesPcnScheduleJobCloud;
         }
         return quartzJobService;
     }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/report/CoreReportController.java

@@ -113,6 +113,7 @@ public class CoreReportController extends CoreBaseController {
     public BaseResultBean<ClassModel> listClzModel() {
         LOGGER.info("【类路径：{}】",pojoPackagePath);
         List<String> clzNameList = ClassTool.getClassName(pojoPackagePath, true);
+        LOGGER.info("【类信息：{}】",clzNameList);
         List<ClassModel> clzList = new ArrayList<>(clzNameList.size());
         for(String clzName : clzNameList){
             ClassModel model = getClassModel(clzName);
@@ -168,6 +169,7 @@ public class CoreReportController extends CoreBaseController {
 
     private ClassModel getClassModel(String clzName){
         try {
+            LOGGER.info("【获取类信息：{}】",clzName);
             //注册类
             Class tmpClz = Class.forName(clzName);
             ClassModel classModel = new ClassModel();

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

@@ -4,6 +4,7 @@ import cn.estsh.i3plus.core.api.iservice.busi.IPersonnelService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService;
 import cn.estsh.i3plus.core.apiservice.websocket.MessageWebSocket;
+import cn.estsh.i3plus.platform.common.tool.JsonUtilTool;
 import cn.estsh.i3plus.platform.common.tool.StringTool;
 import cn.estsh.i3plus.platform.common.tool.TimeTool;
 import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
@@ -12,6 +13,7 @@ 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.bean.SysUser;
+import com.alibaba.fastjson.JSON;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.rabbitmq.client.Channel;
 import org.apache.commons.lang3.StringUtils;
@@ -57,14 +59,15 @@ public class MessageLetterQueueReceiver {
     /**
      * 站内信处理队列
      *
-     * @param msg
+     * @param data
      * @param channel
      * @param message 发送：rabbitTemplate.convertAndSend(I3CoreQueueConfig.IMPP_MESSAGE_QUEUE, new SysMessage(....));
      */
     @RabbitListener(queues = PlatformConstWords.IMPP_MESSAGE_LETTER_QUEUE)
-    public void processImppMessage(SysMessage msg, Channel channel, Message message) {
+    public void processImppMessage(String data, Channel channel, Message message) {
-        LOGGER.info("【MQ-{}】 数据接收成功：{}", PlatformConstWords.IMPP_MESSAGE_LETTER_QUEUE, msg);
+        LOGGER.info("【MQ-{}】 数据接收成功：{}", PlatformConstWords.IMPP_MESSAGE_LETTER_QUEUE, data);
         try {
+            SysMessage msg = JsonUtilTool.decode(data, SysMessage.class);
             msg = sysMessageService.insertSysMessage(msg);
 
             if (!StringUtils.isBlank(msg.getMessageReceiversId())) {
@@ -110,7 +113,7 @@ public class MessageLetterQueueReceiver {
                     msg, message.getMessageProperties().getDeliveryTag());
             channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
         } catch (IOException e) {
-            printErrorMessage(e, Exception.class, msg);
+            printErrorMessage(e, Exception.class, data);
 
             try {
                 // 未成功处理，重新发送
@@ -121,7 +124,7 @@ public class MessageLetterQueueReceiver {
         }
     }
 
-    private void printErrorMessage(Exception e, Class zlass, SysMessage msg) {
+    private void printErrorMessage(Exception e, Class zlass, String msg) {
         Long time = System.currentTimeMillis();
         LOGGER.error("【MQ-{}】{} 异常代码:{} 消息内容{},处理出错：{}", PlatformConstWords.IMPP_MESSAGE_LETTER_QUEUE, time, zlass, msg, e.getMessage());
         e.printStackTrace();
@@ -136,7 +139,7 @@ public class MessageLetterQueueReceiver {
         sysMessage.setIsSystem(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
         sysMessage.setMessageReceiverType(ImppEnumUtil.MESSAGE_RECEIVER_TYPE.EXTERNAL.getValue());
         sysMessage.setMessageReceiversNameRdd("yunhao.wang@estsh.com,wei.peng@estsh.com");
-        rabbitTemplate.convertAndSend(PlatformConstWords.IMPP_MESSAGE_MAIL_QUEUE, sysMessage);
+        rabbitTemplate.convertAndSend(PlatformConstWords.IMPP_MESSAGE_MAIL_QUEUE, JSON.toJSONString(sysMessage));
     }
 
 

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

@@ -4,6 +4,7 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysConfigService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService;
 import cn.estsh.i3plus.core.apiservice.util.MailUtil;
+import cn.estsh.i3plus.platform.common.tool.JsonUtilTool;
 import cn.estsh.i3plus.platform.common.tool.TimeTool;
 import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
@@ -11,8 +12,10 @@ 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.bean.SysUser;
+import com.alibaba.fastjson.JSON;
 import com.rabbitmq.client.Channel;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.core.util.JsonUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.amqp.core.Message;
@@ -47,13 +50,14 @@ public class MessageMailQueueReceiver {
     /**
      * 系统邮件处理队列
      *
-     * @param msg     系统消息信息
+     * @param data     系统消息信息
      * @param channel
      * @param message
      */
     @RabbitListener(queues = PlatformConstWords.IMPP_MESSAGE_MAIL_QUEUE)
-    public void processImppMail(SysMessage msg, Channel channel, Message message) {
+    public void processImppMail(String data, Channel channel, Message message) {
         try {
+            SysMessage msg = JsonUtilTool.decode(data, SysMessage.class);
             LOGGER.info("【MQ-IMPP_MESSAGE_MAIL_QUEUE】数据接收成功：{}", msg);
             if (msg.getMessageSendTime() == null) {
                 msg.setMessageSendTime(TimeTool.getNowTime(true));

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

@@ -4,6 +4,7 @@ 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.JsonUtilTool;
 import cn.estsh.i3plus.platform.common.tool.TimeTool;
 import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
@@ -52,15 +53,16 @@ public class MessageSWebNoticeQueueReceiver {
     /**
      * SWEB通知处理队列
      *
-     * @param msg
+     * @param data
      * @param channel
      * @param message
      */
     @RabbitListener(queues = PlatformConstWords.SWEB_NOTICE_QUEUE)
-    public void processImppMail(SysMessage msg, Channel channel, Message message) {
+    public void processImppMail(String data, Channel channel, Message message) {
-        LOGGER.info("【MQ-{}】 数据接收成功：{}", PlatformConstWords.SWEB_NOTICE_QUEUE, msg);
+        LOGGER.info("【MQ-{}】 数据接收成功：{}", PlatformConstWords.SWEB_NOTICE_QUEUE, data);
         try {
             // 添加消息
+            SysMessage msg = JsonUtilTool.decode(data, SysMessage.class);
             msg = sysMessageService.insertSysMessage(msg);
 
             // 添加附件信息

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

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.mq;
 
 import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskPlanService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService;
+import cn.estsh.i3plus.platform.common.tool.JsonUtilTool;
 import cn.estsh.i3plus.platform.common.tool.StringTool;
 import cn.estsh.i3plus.platform.common.tool.TimeTool;
 import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
@@ -10,6 +11,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
 import cn.estsh.i3plus.pojo.platform.bean.SysMessage;
 import cn.estsh.i3plus.pojo.platform.bean.SysTaskPlan;
 import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime;
+import com.alibaba.fastjson.JSON;
 import com.rabbitmq.client.Channel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -48,13 +50,14 @@ public class ScheduleQueueReceiver {
     /**
      * 定时任务通道处理
      *
-     * @param logTaskTime
+     * @param data
      * @param channel
      * @param message
      */
     @RabbitListener(queues = PlatformConstWords.IMPP_SCHEDULE_QUEUE)
-    public void processSchedule(SysLogTaskTime logTaskTime, Channel channel, Message message) {
+    public void processSchedule(String data, Channel channel, Message message) {
         try {
+            SysLogTaskTime logTaskTime = JsonUtilTool.decode(data, SysLogTaskTime.class);
             LOGGER.info("【MQ-IMPP_SCHEDULE_QUEUE】数据接收成功：{}", logTaskTime);
             // 跟新最后执行时间 及 任务状态
             SysTaskPlan taskPlan = sysTaskPlanService.getSysTaskPlanByNameAndGroup(logTaskTime.getName(), logTaskTime.getGroupName());
@@ -105,9 +108,9 @@ public class ScheduleQueueReceiver {
 
                     // 发送到对应处理队列
                     if (taskPlan.getNoticeMethod() != null && ImppEnumUtil.MESSAGE_TYPE.MAIL.getValue() == taskPlan.getNoticeMethod().intValue()) {
-                        rabbitTemplate.convertAndSend(PlatformConstWords.IMPP_MESSAGE_MAIL_QUEUE, sysMessage);
+                        rabbitTemplate.convertAndSend(PlatformConstWords.IMPP_MESSAGE_MAIL_QUEUE, JSON.toJSONString(sysMessage));
                     } else {
-                        rabbitTemplate.convertAndSend(PlatformConstWords.IMPP_MESSAGE_LETTER_QUEUE, sysMessage);
+                        rabbitTemplate.convertAndSend(PlatformConstWords.IMPP_MESSAGE_LETTER_QUEUE, JSON.toJSONString(sysMessage));
                     }
                 }
             }

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

@@ -19,6 +19,7 @@ import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
 import cn.estsh.impp.framework.boot.util.ImppRedis;
+import com.alibaba.fastjson.JSON;
 import com.netflix.discovery.converters.Auto;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
@@ -157,13 +158,17 @@ public class SysMessageService implements ISysMessageService {
     @ApiOperation(value = "添加消息并发送")
     public void doSendSysMessage(SysMessage sysMessage) {
         // 判断消息类型推送到对应的队列
+        // 邮件
         if(ImppEnumUtil.MESSAGE_TYPE.MAIL.getValue() == sysMessage.getMessageTypeValue()){
-            rabbitTemplate.convertAndSend(PlatformConstWords.IMPP_MESSAGE_MAIL_QUEUE,sysMessage);
+            rabbitTemplate.convertAndSend(PlatformConstWords.IMPP_MESSAGE_MAIL_QUEUE, JSON.toJSONString(sysMessage));
+            // 站内信
         }else if(ImppEnumUtil.MESSAGE_TYPE.LETTER.getValue() == sysMessage.getMessageTypeValue()){
-            rabbitTemplate.convertAndSend(PlatformConstWords.IMPP_MESSAGE_LETTER_QUEUE,sysMessage);
+            rabbitTemplate.convertAndSend(PlatformConstWords.IMPP_MESSAGE_LETTER_QUEUE,JSON.toJSONString(sysMessage));
-            rabbitTemplate.convertAndSend(PlatformConstWords.IMPP_MESSAGE_LETTER_QUEUE_BAK,sysMessage);
+            rabbitTemplate.convertAndSend(PlatformConstWords.IMPP_MESSAGE_LETTER_QUEUE_BAK,JSON.toJSONString(sysMessage));
-        } else if(ImppEnumUtil.MESSAGE_TYPE.SWEB_NOTICE.getValue() == sysMessage.getMessageTypeValue()){
+            // SWEB通知及公告
-            rabbitTemplate.convertAndSend(PlatformConstWords.SWEB_NOTICE_QUEUE,sysMessage);
+        } else if(ImppEnumUtil.MESSAGE_TYPE.SWEB_PUBLIC_NOTICE.getValue() == sysMessage.getMessageTypeValue() ||
+                ImppEnumUtil.MESSAGE_TYPE.SWEB_NOTICE.getValue() == sysMessage.getMessageTypeValue()){
+            rabbitTemplate.convertAndSend(PlatformConstWords.SWEB_NOTICE_QUEUE,JSON.toJSONString(sysMessage));
         } else {
             throw ImppExceptionBuilder.newInstance()
                     .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
@@ -221,7 +226,7 @@ public class SysMessageService implements ISysMessageService {
             sysRefUserMessageRDao.update(sysRefUserMessage);
 
             // 阅读数累加1
-            sysMessage.setReadCount(sysMessage.getReadCount() + 1);
+            sysMessage.setReadCount(sysMessage.getReadCountVal() + 1);
             sysMessageRDao.update(sysMessage);
         }
 
@@ -239,10 +244,15 @@ public class SysMessageService implements ISysMessageService {
     }
 
     @Override
+    @ApiOperation(value = "删除用户消息")
+    public void deleteSysRefUserMessageStatusById(Long id) {
+        sysRefUserMessageRDao.deleteById(id);
+    }
+
+    @Override
+    @ApiOperation(value = "批量删除用户消息")
     public void deleteSysRefUserMessageStatusByIds(Long[] ids) {
         sysRefUserMessageRDao.deleteByIds(ids);
     }
 
-    @Resource(name="redisRes")
-    private ImppRedis redisRes;
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/ExcelUtil.java

@@ -14,6 +14,7 @@ import cn.estsh.i3plus.pojo.platform.bean.SysFile;
 import cn.estsh.i3plus.pojo.platform.bean.SysMessage;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
+import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.ApiParam;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFRow;
@@ -438,7 +439,7 @@ public class ExcelUtil {
         sysMessage.setIsSystem(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue());
         sysMessage.setMessageReceiversId(String.valueOf(userId));
 
-        rabbitTemplate.convertAndSend(PlatformConstWords.IMPP_MESSAGE_LETTER_QUEUE,sysMessage);
+        rabbitTemplate.convertAndSend(PlatformConstWords.IMPP_MESSAGE_LETTER_QUEUE, JSON.toJSONString(sysMessage));
     }
 
 }

pom.xml

@@ -63,6 +63,18 @@
                 <version>${project.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>i3plus.icloud</groupId>
+                <artifactId>i3plus-icloud-mes</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>i3plus.icloud</groupId>
+                <artifactId>i3plus-icloud-mes-pcn</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
             <!-- 基础对象调用 -->
             <dependency>
                 <groupId>i3plus.pojo</groupId>