Merge remote-tracking branch 'remotes/origin/dev' into test

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(

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());
 

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)));