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

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

@@ -107,4 +107,12 @@ public interface ISysTaskPlanService {
      */
     @ApiOperation(value = "修改任务计划信息",notes = "修改任务计划信息，不会更新quartz数据库")
     void updateSysTaskPlan(SysTaskPlan sysTaskPlan);
+
+
+    /**
+     * 批量删除任务计划信息
+     * @param ids
+     */
+    @ApiOperation(value = "批量删除任务计划信息",notes = "批量删除任务计划信息")
+    void deleteSysTaskPlanByIds(Long[] ids);
 }

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

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.controller.busi;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskCycleService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskPlanService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskService;
+import cn.estsh.i3plus.platform.common.tool.StringTool;
 import cn.estsh.i3plus.platform.common.util.PlatformConstWords;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
@@ -221,4 +222,20 @@ public class SysTaskPlanController extends CoreBaseController{
             return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
         }
     }
+
+    @DeleteMapping("/batch-delete")
+    @ApiOperation(value = "根据id批量删除任务计划",notes = "根据id批量删除任务计划")
+    public ResultBean deleteSysTaskPlanByIds(String[] idsStr) {
+        try {
+            // 数据校验
+            ValidatorBean.checkNotNull(idsStr, "任务计划id 不能为空");
+
+            sysTaskPlanService.deleteSysTaskPlanByIds(StringTool.getArrayLong(idsStr));
+            return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        }catch(ImppBusiException busExcep){
+            return ResultBean.fail(busExcep);
+        }catch(Exception e){
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
 }

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

@@ -23,6 +23,7 @@ import org.springframework.stereotype.Service;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 
@@ -68,12 +69,14 @@ public class SysTaskPlanService implements ISysTaskPlanService {
                         .build();
             }
 
+            sysTaskPlan = sysTaskPlanRDao.insert(sysTaskPlan);
+
             SysRefTaskCyclePlan refTaskCyclePlan = new SysRefTaskCyclePlan();
             refTaskCyclePlan.setTaskCycleId(sysTaskCycle.getId());
+            refTaskCyclePlan.setTaskPlanId(sysTaskPlan.getId());
             refTaskCyclePlan.setTaskPlanName(sysTaskPlan.getName());
             refTaskCyclePlan.setTaskPlanGroupName(sysTaskPlan.getGroupName());
 
-            sysTaskPlan = sysTaskPlanRDao.insert(sysTaskPlan);
             // 添加表达式与触发器关系表
             sysRefTaskCyclePlanRDao.insert(refTaskCyclePlan);
 
@@ -330,4 +333,54 @@ public class SysTaskPlanService implements ISysTaskPlanService {
     public void updateSysTaskPlan(SysTaskPlan sysTaskPlan) {
         sysTaskPlanRDao.update(sysTaskPlan);
     }
+
+    @Override
+    @ApiOperation(value = "批量删除任务计划信息", notes = "批量删除任务计划信息")
+    public void deleteSysTaskPlanByIds(Long[] ids) {
+        try {
+            List<SysTaskPlan> sysTaskPlan = sysTaskPlanRDao.findByHqlWhere(CoreHqlPack.packHqlIds("id", ids));
+            List<TriggerKey> triggerKeyList = new ArrayList<>();
+
+            //数据校验
+            if (sysTaskPlan == null || sysTaskPlan.size() == 0) {
+                throw ImppExceptionBuilder.newInstance()
+                        .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+                        .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode())
+                        .setErrorDetail("任务计划不存在")
+                        .setErrorSolution("请重新选择任务计划")
+                        .build();
+            } else {
+                for (int i = 0; i < sysTaskPlan.size(); i++) {
+                    triggerKeyList.add(TriggerKey.triggerKey(sysTaskPlan.get(i).getName(), sysTaskPlan.get(i).getGroupName()));
+                }
+            }
+
+            sysTaskPlanRDao.deleteByIds(ids);
+
+            // 删除关系表数据
+            sysRefTaskCyclePlanRDao.deleteByPropertyIn("taskPlanId", ids);
+
+            // 检查定时人计划是否存在，并暂停
+            for (TriggerKey trigger : triggerKeyList) {
+                if (scheduler.checkExists(trigger)) {
+                    scheduler.pauseTrigger(trigger);
+                } else {
+                    throw ImppExceptionBuilder.newInstance()
+                            .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+                            .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION_DATA_NOT_EXIT.getCode())
+                            .setErrorDetail("定时任务不存在")
+                            .setErrorSolution("请重新选择")
+                            .build();
+                }
+            }
+
+            // 取消调度任务
+            scheduler.unscheduleJobs(triggerKeyList);
+        } catch (SchedulerException e) {
+            throw ImppExceptionBuilder.newInstance()
+                    .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode())
+                    .setErrorCode(ImppExceptionEnum.TASK_EXCEPTION.getCode())
+                    .build();
+        }
+    }
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/util/MailUtil.java

@@ -200,6 +200,9 @@ public class MailUtil {
             msg.setSubject( MimeUtility.encodeText(this.title, MimeUtility.mimeCharset("gb2312"), null));
             msg.setSubject(this.title);
 
+            // 消息主体内容 处理
+            this.content = this.content == null ? "" : this.content;
+
             msg.setContent(this.content, this.content_type);
 
             msg.saveChanges();