From 03d3f53fed462568f339ecf3fa6410c3e2eb2457 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Wed, 6 Mar 2019 20:01:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E4=BC=98=E5=8C=96=20?= =?UTF-8?q?=E8=A7=A3=E5=86=B3bug=20=E9=82=AE=E4=BB=B6=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/busi/SysMessageController.java | 2 ++ .../controller/busi/SysTaskController.java | 6 +++-- .../controller/busi/SysUserController.java | 2 ++ .../apiservice/mq/MessageMailQueueReceiver.java | 28 +++++++++------------- .../core/apiservice/mq/ScheduleQueueReceiver.java | 4 +++- .../core/apiservice/schedulejob/DemoJob.java | 1 + .../serviceimpl/busi/SysTaskCycleService.java | 14 ++++++----- 7 files changed, 31 insertions(+), 26 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java index fc68c91..9059c0f 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMessageController.java +++ b/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()); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskController.java index 79c548f..a8b27d8 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskController.java +++ b/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) { diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java index e898673..6be7b5b 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysUserController.java +++ b/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); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java index e9dec84..3c3197d 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java +++ b/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(); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/ScheduleQueueReceiver.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/ScheduleQueueReceiver.java index 4d091be..d5460e5 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/ScheduleQueueReceiver.java +++ b/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()); } // 发送到对应处理队列 diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoJob.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoJob.java index 4d3de1d..5cbd413 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/DemoJob.java +++ b/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); } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskCycleService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskCycleService.java index df6de10..46aec15 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskCycleService.java +++ b/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); - if(refExpressionTriggerList != 0){ + List refExpressionTriggerList = sysRefTaskCyclePlanRDao.findByProperty("taskCycleId",id); + 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)); - if(refExpressionTriggerList != 0){ + List refExpressionTriggerList = sysRefTaskCyclePlanRDao.findByHqlWhere(CoreHqlPack.packHqlIds("taskCycleId",ids)); + 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(); }