From 601cc4edd88e4d8c2ae99b1620242443af2613a7 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Tue, 16 Apr 2019 19:51:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=8F=B0-=E7=94=A8=E6=88=B7=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E7=BB=84=E7=BB=87=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=20=E8=A1=A8=E5=8D=95-=E6=8B=A6=E6=88=AA=E5=99=A8=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=89=A7=E8=A1=8C=E9=A1=BA=E5=BA=8F=20=E8=A1=A8?= =?UTF-8?q?=E5=8D=95-=E5=8A=9F=E8=83=BD=E6=98=8E=E7=BB=86=E5=89=8D?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/busi/SysTaskCycleController.java | 15 ++++++- .../controller/busi/SysUserController.java | 17 ++++++++ .../serviceimpl/busi/SysTaskPlanService.java | 49 ++++++++++++---------- 3 files changed, 57 insertions(+), 24 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskCycleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskCycleController.java index 06edc88..f0568a4 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskCycleController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskCycleController.java @@ -24,11 +24,14 @@ import cn.estsh.impp.framework.boot.util.ResultBean; import cn.estsh.impp.framework.boot.util.ValidatorBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.quartz.impl.triggers.CronTriggerImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.text.ParseException; +import java.util.Date; import java.util.List; /** @@ -87,11 +90,17 @@ public class SysTaskCycleController extends CoreBaseController{ .notNull("name", sysTaskCycle.getName()) .notNull("taskCycleExps", sysTaskCycle.getTaskCycleExps()); + CronTriggerImpl trigger = new CronTriggerImpl(); + trigger.setCronExpression(sysTaskCycle.getTaskCycleExps()); + trigger.computeFirstFireTime(null); + sysTaskCycleService.insertSysTaskCycle(sysTaskCycle); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); - }catch(Exception e){ + } catch (ParseException parseException){ + return ResultBean.fail("表达式错误"); + } catch(Exception e){ return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } @@ -106,6 +115,10 @@ public class SysTaskCycleController extends CoreBaseController{ .notNull("name", sysTaskCycle.getName()) .notNull("taskCycleExps", sysTaskCycle.getTaskCycleExps()); + CronTriggerImpl trigger = new CronTriggerImpl(); + trigger.setCronExpression(sysTaskCycle.getTaskCycleExps()); + trigger.computeFirstFireTime(null); + sysTaskCycleService.updateSysTaskCycle(sysTaskCycle); // 查询关联任务计划信息，并进行修改 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 e41dd95..a322bca 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 @@ -449,5 +449,22 @@ public class SysUserController extends CoreBaseController{ } } + @PutMapping("/update-organize") + @ApiOperation(value = "修改用户操作组织id") + public ResultBean updateSysUserOrganize(String idStr, String organizeIdStr){ + try{ + ValidatorBean.checkNotNull(idStr, "id不能为空"); + SysUser sysUser = sysUserService.getSysUserById(Long.parseLong(idStr)); + ValidatorBean.checkNotNull(sysUser, "用户不存在"); + + sysUser.setOrganizeId(Long.parseLong(organizeIdStr)); + sysUserService.updateSysUser(sysUser); + return null; + } catch (ImppBusiException busExcep) { + return ResultBean.fail(busExcep); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskPlanService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskPlanService.java index a7e5fa0..35dc88f 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskPlanService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskPlanService.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysTaskPlanService; +import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; import cn.estsh.i3plus.pojo.base.common.PagerHelper; @@ -13,6 +14,7 @@ import cn.estsh.i3plus.pojo.platform.platrepositorymongo.SysLogTaskTimeRepositor import cn.estsh.i3plus.pojo.platform.repository.SysRefTaskCyclePlanRepository; import cn.estsh.i3plus.pojo.platform.repository.SysTaskPlanRepository; import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack; +import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder; import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.util.ValidatorBean; @@ -75,34 +77,35 @@ public class SysTaskPlanService implements ISysTaskPlanService { @Override @ApiOperation(value = "修改任务计划", notes = "修改任务计划") public void updateSysTaskPlan(SysTaskPlan sysTaskPlan) { - SysTaskPlan oldSysTaskPlan = sysTaskPlanRDao.getById(sysTaskPlan.getId()); + SysTaskPlan originSysTaskPlan = sysTaskPlanRDao.getById(sysTaskPlan.getId()); // 更新关系表 sysRefTaskCyclePlanRDao.updateByProperties(new String[]{"taskPlanName", "taskPlanGroupName"}, - new String[]{oldSysTaskPlan.getName(), oldSysTaskPlan.getGroupName()}, - "taskCycleId", oldSysTaskPlan.getTaskCycleId() + new String[]{originSysTaskPlan.getName(), originSysTaskPlan.getGroupName()}, + "taskCycleId", originSysTaskPlan.getTaskCycleId() ); - oldSysTaskPlan.setTaskCycleId(sysTaskPlan.getTaskCycleId()); - oldSysTaskPlan.setTaskCycleNameRdd(sysTaskPlan.getTaskCycleNameRdd()); - oldSysTaskPlan.setTaskCycleExpsRdd(sysTaskPlan.getTaskCycleExpsRdd()); - oldSysTaskPlan.setTaskCycleNameRdd(sysTaskPlan.getTaskCycleNameRdd()); - oldSysTaskPlan.setTaskPlanExecNum(sysTaskPlan.getTaskPlanExecNum()); - oldSysTaskPlan.setTaskMethodType(sysTaskPlan.getTaskMethodType()); - oldSysTaskPlan.setTaskId(sysTaskPlan.getTaskId()); - oldSysTaskPlan.setTaskNameRdd(sysTaskPlan.getTaskNameRdd()); - oldSysTaskPlan.setTaskSoftTypeRdd(sysTaskPlan.getTaskSoftTypeRdd()); - oldSysTaskPlan.setTaskPlanParam(sysTaskPlan.getTaskPlanParam()); - oldSysTaskPlan.setTaskCycleStartDateTimeRdd(sysTaskPlan.getTaskCycleStartDateTimeRdd()); - oldSysTaskPlan.setTaskCycleEndDateTimeRdd(sysTaskPlan.getTaskCycleEndDateTimeRdd()); - oldSysTaskPlan.setTaskPlanDescription(sysTaskPlan.getTaskPlanDescription()); - oldSysTaskPlan.setLastRunDateTime(sysTaskPlan.getLastRunDateTime()); - oldSysTaskPlan.setIsNotice(sysTaskPlan.getIsNotice()); - oldSysTaskPlan.setIsInternalUser(sysTaskPlan.getIsInternalUser()); - oldSysTaskPlan.setNoticeChannel(sysTaskPlan.getNoticeChannel()); - oldSysTaskPlan.setNoticeMethod(sysTaskPlan.getNoticeMethod()); - oldSysTaskPlan.setTaskPlanStatus(sysTaskPlan.getTaskPlanStatus()); - sysTaskPlanRDao.update(oldSysTaskPlan); + originSysTaskPlan.setTaskCycleId(sysTaskPlan.getTaskCycleId()); + originSysTaskPlan.setTaskCycleNameRdd(sysTaskPlan.getTaskCycleNameRdd()); + originSysTaskPlan.setTaskCycleExpsRdd(sysTaskPlan.getTaskCycleExpsRdd()); + originSysTaskPlan.setTaskCycleNameRdd(sysTaskPlan.getTaskCycleNameRdd()); + originSysTaskPlan.setTaskPlanExecNum(sysTaskPlan.getTaskPlanExecNum()); + originSysTaskPlan.setTaskMethodType(sysTaskPlan.getTaskMethodType()); + originSysTaskPlan.setTaskId(sysTaskPlan.getTaskId()); + originSysTaskPlan.setTaskNameRdd(sysTaskPlan.getTaskNameRdd()); + originSysTaskPlan.setTaskSoftTypeRdd(sysTaskPlan.getTaskSoftTypeRdd()); + originSysTaskPlan.setTaskPlanParam(sysTaskPlan.getTaskPlanParam()); + originSysTaskPlan.setTaskCycleStartDateTimeRdd(sysTaskPlan.getTaskCycleStartDateTimeRdd()); + originSysTaskPlan.setTaskCycleEndDateTimeRdd(sysTaskPlan.getTaskCycleEndDateTimeRdd()); + originSysTaskPlan.setTaskPlanDescription(sysTaskPlan.getTaskPlanDescription()); + originSysTaskPlan.setLastRunDateTime(sysTaskPlan.getLastRunDateTime()); + originSysTaskPlan.setIsNotice(sysTaskPlan.getIsNotice()); + originSysTaskPlan.setIsInternalUser(sysTaskPlan.getIsInternalUser()); + originSysTaskPlan.setNoticeChannel(sysTaskPlan.getNoticeChannel()); + originSysTaskPlan.setNoticeMethod(sysTaskPlan.getNoticeMethod()); + + + sysTaskPlanRDao.update(originSysTaskPlan); } @Override