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

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

@@ -63,6 +63,7 @@ public class SysMessageController extends CoreBaseController {
             sysMessage.setMessageSenderNameRdd(getSessionUser().getUserName());
             sysMessage.setMessageSendTime(sdf.format(new Date()));
             sysMessage.setMessageContentType(ImppEnumUtil.MESSAGE_TYPE_CONTENT.HTML.getValue());
+            sysMessage.setMessageReceiverType(ImppEnumUtil.MESSAGE_RECEIVER_TYPE.INTERNAL.getValue());
 
             sysMessageService.doSendSysMessage(sysMessage);
             return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
@@ -309,6 +310,7 @@ public class SysMessageController extends CoreBaseController {
             sysMessage.setMessageSenderNameRdd(getSessionUser().getUserName());
             sysMessage.setMessageSendTime(sdf.format(new Date()));
             sysMessage.setMessageContentType(ImppEnumUtil.MESSAGE_TYPE_CONTENT.HTML.getValue());
+            sysMessage.setMessageReceiverType(ImppEnumUtil.MESSAGE_RECEIVER_TYPE.INTERNAL.getValue());
 
             sysMessageService.doSendSysMessage(sysMessage);
             return ResultBean.success("添加成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());

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

@@ -50,11 +50,13 @@ public class SysTaskController extends CoreBaseController {
                     .notNull("taskPackage", sysTask.getTaskPackage())
                     .notNull("taskClass", sysTask.getTaskClass());
 
-            Class classs= Class.forName(sysTask.getTaskPackage() + sysTask.getTaskClass());
+            // 类校验
-            System.out.println("============类信息：" + classs);
+            Class.forName(sysTask.getTaskPackage() + "." + sysTask.getTaskClass());
 
             sysTaskService.insertSysTask(sysTask);
             return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(sysTask);
+        } catch (ClassNotFoundException e) {
+            return ResultBean.fail("任务类不存在：" + sysTask.getTaskPackage() + "." + sysTask.getTaskClass());
         } catch (ImppBusiException busExcep) {
             return ResultBean.fail(busExcep);
         } catch (Exception e) {

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

@@ -345,6 +345,7 @@ public class SysUserController extends CoreBaseController{
                 message.setMessageSenderNameRdd(getSessionUser().getUserName());
                 message.setMessageReceiversId(user.getId().toString());
                 message.setMessageReceiversNameRdd(user.getUserName());
+                message.setMessageReceiverType(ImppEnumUtil.MESSAGE_RECEIVER_TYPE.INTERNAL.getValue());
 
                 sysMessageService.doSendSysMessage(message);
 
@@ -389,6 +390,7 @@ public class SysUserController extends CoreBaseController{
                 message.setMessageReceiversId(user.getId().toString());
                 message.setMessageReceiversNameRdd(user.getUserName());
                 message.setMessageSendTime(TimeTool.getNowTime(true));
+                message.setMessageReceiverType(ImppEnumUtil.MESSAGE_RECEIVER_TYPE.INTERNAL.getValue());
 
                 sysMessageService.doSendSysMessage(message);
 

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

@@ -53,31 +53,29 @@ public class MessageMailQueueReceiver {
     public void processImppMail(SysMessage msg, Channel channel, Message message) {
         try {
             LOGGER.info("【MQ-IMPP_MESSAGE_MAIL_QUEUE】数据接收成功：{}",msg);
+            if (msg.getMessageSendTime() == null) {
+                msg.setMessageSendTime(TimeTool.getNowTime(true));
+            }
             msg = sysMessageService.insertSysMessage(msg);
+
+            // 设置邮件主题内容及收件人
             mailUtil.init();
+            mailUtil.setSubject(msg.getMessageTitle());
+            mailUtil.setContentType(ImppEnumUtil.MESSAGE_TYPE_CONTENT.valueOfDescription(msg.getMessageContentType()));
+            mailUtil.setBody(msg.getMessageContent());
 
-            if(PlatformConstWords.CONTACT_MAIL.equals(msg.getMessageReceiversId())){
+            if(msg.getMessageReceiverType().intValue() == ImppEnumUtil.MESSAGE_RECEIVER_TYPE.URGENT.getValue()){
                 // 判断是否为系统紧急提示 微服注册状态提示
-
-                mailUtil.setSubject(msg.getMessageTitle());
-                mailUtil.setContentType(ImppEnumUtil.MESSAGE_TYPE_CONTENT.valueOfDescription(msg.getMessageContentType()));
-                mailUtil.setBody(msg.getMessageContent());
-                // 发送给系统配置中的紧急联系人
                 mailUtil.setTo(sysConfigService.getSysConfigByCode(PlatformConstWords.CONTACT_MAIL).getConfigValue());
                 // 次数过于频繁
 //                mailUtil.send();
 
-            } else if(PlatformConstWords.EXTERNAL_MAIL.equals(msg.getMessageReceiversId())){
+            } else if(msg.getMessageReceiverType().intValue() == ImppEnumUtil.MESSAGE_RECEIVER_TYPE.EXTERNAL.getValue()){
                 //判断是否为外部邮件
-
-                mailUtil.setSubject(msg.getMessageTitle());
-                mailUtil.setContentType(ImppEnumUtil.MESSAGE_TYPE_CONTENT.valueOfDescription(msg.getMessageContentType()));
-                mailUtil.setBody(msg.getMessageContent());
                 mailUtil.setTo(StringUtils.split(msg.getMessageReceiversNameRdd(),","));
                 mailUtil.send();
 
-            } else{
+            } else if (msg.getMessageReceiverType().intValue() == ImppEnumUtil.MESSAGE_RECEIVER_TYPE.INTERNAL.getValue()) {
-                // 用户邮件
                 // 收件人信息
                 String[] messageReceiver = msg.getMessageReceiversId().split(",");
                 String[] receiverName = new String[messageReceiver.length];
@@ -101,10 +99,6 @@ public class MessageMailQueueReceiver {
 
                     sysMessageService.insertSysRefUserMessage(refUserMessage);
 
-                    // 设置邮件主题内容及收件人
-                    mailUtil.setSubject(msg.getMessageTitle());
-                    mailUtil.setContentType(ImppEnumUtil.MESSAGE_TYPE_CONTENT.valueOfDescription(msg.getMessageContentType()));
-                    mailUtil.setBody(msg.getMessageContent());
                     mailUtil.setTo(sysUser.getUserEmail());
                     mailUtil.send();
                 }

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

@@ -81,8 +81,10 @@ public class ScheduleQueueReceiver {
 
                     // 是否内部成员
                     if (CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue() == taskPlan.getIsInternalUser()) {
-                        sysMessage.setMessageReceiversId(PlatformConstWords.EXTERNAL_MAIL);
+                        sysMessage.setMessageReceiverType(ImppEnumUtil.MESSAGE_RECEIVER_TYPE.EXTERNAL.getValue());
                         sysMessage.setMessageReceiversNameRdd(taskPlan.getNoticeChannel());
+                    }else{
+                        sysMessage.setMessageReceiverType(ImppEnumUtil.MESSAGE_RECEIVER_TYPE.INTERNAL.getValue());
                     }
 
                     // 发送到对应处理队列

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoJob.java

@@ -46,6 +46,7 @@ public class DemoJob extends BaseImppScheduleJob {
         sysMessage.setMessageContentType(ImppEnumUtil.MESSAGE_TYPE_CONTENT.HTML.getValue());
         sysMessage.setMessageReceiversId(PlatformConstWords.CONTACT_MAIL);
         sysMessage.setMessageReceiversNameRdd(PlatformConstWords.CONTACT_MAIL);
+        sysMessage.setMessageReceiverType(ImppEnumUtil.MESSAGE_RECEIVER_TYPE.URGENT.getValue());
         sysMessageService.doSendSysMessage(sysMessage);
     }
 }

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

@@ -51,12 +51,13 @@ public class SysTaskCycleService implements ISysTaskCycleService {
     @Override
     @ApiOperation(value = "删除任务周期",notes = "根据id删除任务周期")
     public void deleteSysTaskCycleById(Long id) {
-        int refExpressionTriggerList = sysRefTaskCyclePlanRDao.findByPropertyCount("taskCycleId",id);
+        List<SysRefTaskCyclePlan> refExpressionTriggerList = sysRefTaskCyclePlanRDao.findByProperty("taskCycleId",id);
-        if(refExpressionTriggerList != 0){
+        if(refExpressionTriggerList.size() != 0){
             throw ImppExceptionBuilder.newInstance()
                     .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
                     .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
-                    .setErrorDetail("存在关联任务计划，无法删除")
+                    .setErrorDetail("存在关联任务计划【" + refExpressionTriggerList.get(0).getTaskPlanName()
+                                             + refExpressionTriggerList.get(0).getTaskPlanGroupName() + "】，无法删除")
                     .setErrorSolution("请重新选择")
                     .build();
         }
@@ -98,12 +99,13 @@ public class SysTaskCycleService implements ISysTaskCycleService {
     @Override
     @ApiOperation(value = "根据id批量删除任务周期",notes = "根据id批量删除任务周期")
     public void deleteSysTaskCycleByIds(Long[] ids) {
-        int refExpressionTriggerList = sysRefTaskCyclePlanRDao.findByHqlWhereCount(CoreHqlPack.packHqlIds("taskCycleId",ids));
+        List<SysRefTaskCyclePlan> refExpressionTriggerList = sysRefTaskCyclePlanRDao.findByHqlWhere(CoreHqlPack.packHqlIds("taskCycleId",ids));
-        if(refExpressionTriggerList != 0){
+        if(refExpressionTriggerList.size() != 0){
             throw ImppExceptionBuilder.newInstance()
                     .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
                     .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())
-                    .setErrorDetail("存在关联任务计划，无法删除")
+                    .setErrorDetail("存在关联任务计划【" + refExpressionTriggerList.get(0).getTaskPlanName()
+                            + refExpressionTriggerList.get(0).getTaskPlanGroupName() + "】，无法删除")
                     .setErrorSolution("请重新选择")
                     .build();
         }