From d656d82622e97f14ab6fb575435e7b6cc8b831d0 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Wed, 27 Mar 2019 15:56:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?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/SysTaskPlanController.java | 28 +++++++++------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskPlanController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskPlanController.java index 3988c6c..6e325ac 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskPlanController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskPlanController.java @@ -109,7 +109,7 @@ public class SysTaskPlanController extends CoreBaseController{ LOGGER.info("定时任务唯一校验 Name:{0}，GroupName:{1}", sysTaskPlan.getName(), sysTaskPlan.getGroupName()); BaseResultBean baseResultBean = getJobService(sysTaskPlan.getTaskSoftTypeRdd()) .checkJobExists(sysTaskPlan.getName(), sysTaskPlan.getGroupName()); - if(baseResultBean.isSuccess()){ + if(baseResultBean.isSuccess() && baseResultBean.getResultObject() != null && ( boolean ) baseResultBean.getResultObject()){ throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setErrorCode(ImppExceptionEnum.BUSINESS_EXCEPTION_DATA_ERROR.getCode()) @@ -161,6 +161,10 @@ public class SysTaskPlanController extends CoreBaseController{ @ApiOperation(value = "修改任务计划", notes = "任务计划") public ResultBean updateSysTaskTime(SysTaskPlan sysTaskPlan, Boolean isExecute) { try { + ResultBean resultBean = ResultBean.success("操作成功") + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) + .setResultObject(sysTaskPlan) + .build(); // 数据校验 ValidatorBean.beginValid(sysTaskPlan) .notNull("name", sysTaskPlan.getName()) @@ -194,11 +198,7 @@ public class SysTaskPlanController extends CoreBaseController{ .setErrorDetail("定时任务不存在") .build(); } else if(!baseResultBean.isSuccess()) { - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) - .setErrorCode(ImppExceptionEnum.CLOUD_CALL_EXCEPTION.getCode()) - .setErrorDetail(baseResultBean.getErrorMsg()) - .build(); + resultBean = ResultBean.fail(baseResultBean.getErrorMsg()); } // 修改对应模块中的定时任务 @@ -207,11 +207,9 @@ public class SysTaskPlanController extends CoreBaseController{ .editTask(sysTask.getTaskPackage(), sysTask.getTaskClass(), sysTaskPlan.getName(), sysTaskPlan.getGroupName(), sysTaskCycle.getTaskCycleExps(), sysTaskPlan.getTaskPlanParam()); if(!baseResultBean.isSuccess()){ - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) - .setErrorCode(ImppExceptionEnum.CLOUD_CALL_EXCEPTION.getCode()) - .setErrorDetail(baseResultBean.getErrorMsg()) - .build(); + resultBean = ResultBean.fail(baseResultBean.getErrorMsg()); + } else { + } // 是否立即执行 @@ -219,14 +217,10 @@ public class SysTaskPlanController extends CoreBaseController{ baseResultBean = getJobService(sysTaskPlan.getTaskSoftTypeRdd()).executeJob(sysTaskPlan.getName(), sysTaskPlan.getGroupName()); if(!baseResultBean.isSuccess()){ - throw ImppExceptionBuilder.newInstance() - .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) - .setErrorCode(ImppExceptionEnum.CLOUD_CALL_EXCEPTION.getCode()) - .setErrorDetail(baseResultBean.getErrorMsg()) - .build(); + resultBean = ResultBean.fail(baseResultBean.getErrorMsg()); } } - return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultObject(sysTaskPlan); + return resultBean; }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ From 721f6f576b0dca94fa73d3c361876480e47db3b7 Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 27 Mar 2019 17:39:42 +0800 Subject: [PATCH 2/2] =?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 --- .../core/apiservice/serviceimpl/busi/SysLabelTemplateService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 9916716..cf51589 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 @@ -55,7 +55,7 @@ public class SysLabelTemplateService implements ISysLabelTemplateService { .setErrorSolution("请检查打印模板") .build(); } - + sysLabelTemplate.setOrganizeCode(AuthUtil.getSessionUser().getUserInfo().getOrganize().getOrganizeCode()); SysLabelTemplate insertResult = sysLabelTemplateRDao.insert(sysLabelTemplate); // 新增打印模板成功 if (insertResult != null) { @@ -71,6 +71,7 @@ public class SysLabelTemplateService implements ISysLabelTemplateService { templateParam.setTemplateId(insertResult.getId()); templateParam.setTemplateParam(paramItem); templateParam.setTemplateParamText(paramItem); + templateParam.setOrganizeCode(AuthUtil.getSessionUser().getUserInfo().getOrganize().getOrganizeCode()); ConvertBean.serviceModelInitialize(templateParam, AuthUtil.getSessionUser().getUserName()); sysLabelTemplateParamRDao.insert(templateParam); }