修复bug

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

@@ -79,9 +79,10 @@ public interface ISysLocaleResourceService {
 
     /**
      * 批量转换缺失资源
-     * @param missResourceModelList
+     * @param missResourceModelList 缺失资源信息
+     * @param userName 用户名称
      */
     @ApiOperation(value = "批量转换缺失资源")
-    void doConversionMissResourceByKeys(List<MissResourceModel> missResourceModelList) ;
+    void doConversionMissResourceByKeys(List<MissResourceModel> missResourceModelList,String userName) ;
 
 }

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

@@ -1,11 +1,10 @@
 package cn.estsh.i3plus.core.api.iservice.busi;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoIgnoreLog;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
-import cn.estsh.i3plus.pojo.platform.bean.SysTask;
 import cn.estsh.i3plus.pojo.platform.bean.SysTaskPlan;
-import cn.estsh.i3plus.pojo.platform.bean.SysTaskCycle;
 import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime;
 import io.swagger.annotations.ApiOperation;
 
@@ -93,8 +92,10 @@ public interface ISysTaskPlanService {
 
     /**
      * 修改任务计划信息，不会更新quartz数据库
+     * 忽略日志打印
      * @param sysTaskPlan
      */
+    @AnnoIgnoreLog
     @ApiOperation(value = "修改任务计划信息",notes = "修改任务计划信息，不会更新quartz数据库")
     void updateSysTaskPlan(SysTaskPlan sysTaskPlan);
 }

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

@@ -64,6 +64,10 @@ public class MessageSWebNoticeQueueReceiver {
         // 添加消息
         SysMessage msg = JsonUtilTool.decode(data, SysMessage.class);
         try {
+            if (msg!= null &&StringUtils.isBlank(msg.getCreateUser())) {
+                ConvertBean.serviceModelInitialize(msg, msg.getMessageSenderNameRdd());
+            }
+
             msg = sysMessageService.insertSysMessage(msg);
 
             // 添加附件信息
@@ -90,20 +94,23 @@ public class MessageSWebNoticeQueueReceiver {
                 try {
                     userJsonArray = JSON.parseArray(msg.getMessageReceiversId());
                 }catch (JSONException e){
-                    LOGGER.error(" JSON转换错误【{0}】：{1}", msg.getMessageReceiversId(), e.getMessage());
+                    LOGGER.error("JSON转换错误【{0}】", msg.getMessageReceiversId(), e.getMessage());
                 }
                 JSONObject userJsonObject;
 
                 List<SysRefUserMessage> insertList = new ArrayList<>(userJsonArray.size());
-                List<String> receiversId = new ArrayList();
+                List<Long> receiversId = new ArrayList<>();
-                List<String> receiversName = new ArrayList();
+                List<String> receiversName = new ArrayList<>();
                 SysRefUserMessage refUserMessage;
-
                 for (Object user : userJsonArray) {
                     // 约定格式：[{'id':'111','name':'张三'},{'id':'121','name':'张三2'}]
                     userJsonObject = ( JSONObject )user;
-                    receiversId.add(userJsonObject.get("id").toString());
+                    if (userJsonObject.containsKey("id")) {
-                    receiversName.add(userJsonObject.get("name").toString());
+                        receiversId.add(userJsonObject.getLongValue("id"));
+                    }
+                    if (userJsonObject.containsKey("name")) {
+                        receiversName.add(userJsonObject.getString("name"));
+                    }
 
                     refUserMessage = new SysRefUserMessage();
                     refUserMessage.setMessageId(msg.getId());
@@ -111,8 +118,8 @@ public class MessageSWebNoticeQueueReceiver {
                     refUserMessage.setMessageTitleRdd(msg.getMessageTitle());
                     refUserMessage.setMessageTypeRdd(msg.getMessageType());
                     refUserMessage.setMessageSenderNameRdd(msg.getMessageSenderNameRdd());
-                    refUserMessage.setReceiverId(Long.parseLong(userJsonObject.get("id").toString()));
+                    refUserMessage.setReceiverId(userJsonObject.getLongValue("id"));
-                    refUserMessage.setReceiverNameRdd(userJsonObject.get("name").toString());
+                    refUserMessage.setReceiverNameRdd(userJsonObject.getString("name"));
                     refUserMessage.setMessageStatus(ImppEnumUtil.MESSAGE_STATUS.UNREAD.getValue());
                     refUserMessage.setReceiverTime(TimeTool.getNowTime(true));
                     refUserMessage.setIsUrgent(msg.getIsUrgent());