From c65a86e7cbf1eefa71d98d0a3097b33a7d05b316 Mon Sep 17 00:00:00 2001 From: Silliter Date: Fri, 29 Mar 2019 15:29:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/core/apiservice/serviceimpl/busi/SysLabelTemplateService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLabelTemplateService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLabelTemplateService.java index cf51589..61e849d 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLabelTemplateService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysLabelTemplateService.java @@ -168,6 +168,7 @@ public class SysLabelTemplateService implements ISysLabelTemplateService { } @Override + @ApiOperation(value = "根据模板编号查询模板信息",notes = "根据模板编号查询模板信息") public LabelTemplateModel getLabelTemplateInfoById(String labelTemplateId) { LabelTemplateModel templateModel = new LabelTemplateModel(); templateModel.setLabelTemplate(sysLabelTemplateRDao.getById(Long.parseLong(labelTemplateId))); From 841d6e4d102c91ad30103bf61ce50781726d44ba Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Mon, 1 Apr 2019 18:02:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=20=E5=8A=9F=E8=83=BD=E6=9D=83=E9=99=90=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=8E=A5=E5=8F=A3=20=E5=BE=AE=E6=9C=8D=E8=B0=83?= =?UTF-8?q?=E6=95=B4=20=E5=B9=B3=E5=8F=B0=E8=A7=92=E8=89=B2=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=96=B9=E6=B3=95=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/core/apiservice/mq/ScheduleQueueReceiver.java | 1 + 1 file changed, 1 insertion(+) 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 e51d7d9..1c55c81 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 @@ -69,6 +69,7 @@ public class ScheduleQueueReceiver { && CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue() == taskPlan.getIsNotice()) { // 设置通知邮件内容 SysMessage sysMessage = new SysMessage(); + sysMessage.setMessageType(ImppEnumUtil.MESSAGE_TYPE.MAIL.getValue()); sysMessage.setMessageSenderNameRdd("系统管理员"); sysMessage.setMessageTitle("任务计划失败通知"); sysMessage.setMessageContent( From 9487810c727953e05104a17539e0e15203e6b025 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Tue, 2 Apr 2019 18:02:31 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E9=80=9A=E7=9F=A5=E6=B5=8B=E8=AF=95=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/core/apiservice/schedulejob/DemoJob.java | 11 +++++++++++ 1 file changed, 11 insertions(+) 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 5cbd413..20dc15b 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 @@ -3,9 +3,12 @@ package cn.estsh.i3plus.core.apiservice.schedulejob; import cn.estsh.i3plus.core.api.iservice.busi.ISysMessageService; import cn.estsh.i3plus.platform.common.tool.TimeTool; import cn.estsh.i3plus.platform.common.util.PlatformConstWords; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.SysMessage; import cn.estsh.impp.framework.base.schedule.BaseImppScheduleJob; +import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; +import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.init.ApplicationProperties; import com.alibaba.fastjson.JSON; import io.swagger.annotations.ApiOperation; @@ -34,6 +37,14 @@ public class DemoJob extends BaseImppScheduleJob { @Override public void executeImppJob(JobExecutionContext context, ApplicationProperties applicationProperties) { + if(getJobParam() != null && "error".equals(getJobParam())){ + throw ImppExceptionBuilder.newInstance() + .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) + .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode()) + .setErrorDetail("定时任务异常测试！") + .setErrorSolution("请检查异常通知邮件") + .build(); + } System.out.println("定时任务被执行"); LOGGER.info("projectName：{},port:{}",applicationProperties.getApplicationName(),applicationProperties.getServerPort());