From a9ca8ea45b856d1750c0c90daa774b3485a025a2 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Tue, 18 Dec 2018 14:30:35 +0800 Subject: [PATCH 1/8] =?UTF-8?q?dev=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus-core-apiservice/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-core-apiservice/src/main/resources/application.properties b/modules/i3plus-core-apiservice/src/main/resources/application.properties index a9e4abc..58de670 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application.properties @@ -2,7 +2,7 @@ spring.application.name=${project.name} #使用配置 -spring.profiles.active=prod +spring.profiles.active=dev ######### 自定义参数 ######### #项目描述信息（swagger中显式），中文使用uncode转码 From c6e88bf0e69b33115bd4dab1eb34188a945cc791 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Tue, 18 Dec 2018 14:36:07 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus-core-apiservice/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-core-apiservice/src/main/resources/application.properties b/modules/i3plus-core-apiservice/src/main/resources/application.properties index 58de670..a9e4abc 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application.properties @@ -2,7 +2,7 @@ spring.application.name=${project.name} #使用配置 -spring.profiles.active=dev +spring.profiles.active=prod ######### 自定义参数 ######### #项目描述信息（swagger中显式），中文使用uncode转码 From 721f6f576b0dca94fa73d3c361876480e47db3b7 Mon Sep 17 00:00:00 2001 From: Silliter Date: Wed, 27 Mar 2019 17:39:42 +0800 Subject: [PATCH 3/8] =?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); } From 6bb5aebb66f3ea88c0ff7f69c788e920b5d08b47 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Thu, 28 Mar 2019 10:24:47 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=BB=A3=E7=A0=81=E6=9F=A5=E8=AF=A2=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/busi/SysDictionaryController.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java index 5da723d..ef2f882 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java @@ -175,6 +175,21 @@ public class SysDictionaryController extends CoreBaseController{ } } + @GetMapping(value = "/find/{code}") + @ApiOperation(value = "根据父级code查询平台字典项", notes = "根据父级code查询平台字典项") + public ResultBean findSysDictionaryByParentCode(@PathVariable("code") String code) { + try { + List sysDictionaryList = sysDictionaryService.findSysDictionaryBySoftTypeAndParentCode( + CommonEnumUtil.SOFT_TYPE.CORE.getValue(),code + ); + return ResultBean.success("操作成功").setResultList(sysDictionaryList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } catch (ImppBusiException busExcep) { + return ResultBean.fail(busExcep); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } + @GetMapping(value = "/find/user-info") @ApiOperation(value = "查询跟用户相关所有字典") public ResultBean findSysDictionaryUserInfo() { @@ -282,7 +297,7 @@ public class SysDictionaryController extends CoreBaseController{ if(group.containsKey(softType.getValue())){ child = new HashMap(); child.put("id",softType.getValue()); - child.put("name",softType.getCode()); + child.put("name",softType.getDescription()); child.put("childList",group.get(softType.getValue())); dictTree.add(child); } From 7f1f76eef23369ca40fd5fecaa57d988c86789c1 Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Thu, 28 Mar 2019 12:07:54 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E7=BB=93=E6=9E=84=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=8C=E8=87=AA=E5=8A=A8=E5=A1=AB=E5=85=85?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/apiservice/serviceimpl/busi/SysTaskPlanService.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) 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 cf95b8d..9e30ce4 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 @@ -140,12 +140,10 @@ public class SysTaskPlanService implements ISysTaskPlanService { @Override @ApiOperation(value = "查询任务计划", notes = "根据任务计划名称与组名称查询") public SysTaskPlan getSysTaskPlanByNameAndGroup(String name, String groupName) { - List sysTaskPlanList = sysTaskPlanRDao.findByProperty(new String[]{"name", "groupName"}, - new Object[]{name, groupName}); - if (sysTaskPlanList != null && sysTaskPlanList.isEmpty()) { - return sysTaskPlanList.get(0); - } - return null; + return sysTaskPlanRDao.getByProperty( + new String[]{"name", "groupName"}, + new Object[]{name, groupName} + ); } @Override From 06a995ab3ea739dcc9a8ed55590bab1074ebf326 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Thu, 28 Mar 2019 13:01:19 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E8=A1=A8=E5=8D=95=E5=B8=83=E5=B1=80?= =?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 | 13 ++++++------ .../serviceimpl/busi/SysTaskPlanService.java | 24 ++++++++++++++++++---- 2 files changed, 26 insertions(+), 11 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 6e325ac..5947c7f 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 @@ -163,8 +163,7 @@ public class SysTaskPlanController extends CoreBaseController{ try { ResultBean resultBean = ResultBean.success("操作成功") .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()) - .setResultObject(sysTaskPlan) - .build(); + .setResultObject(sysTaskPlan); // 数据校验 ValidatorBean.beginValid(sysTaskPlan) .notNull("name", sysTaskPlan.getName()) @@ -188,6 +187,7 @@ public class SysTaskPlanController extends CoreBaseController{ sysTaskPlanService.updateSysTaskPlan(sysTaskPlan); + // 调用对应微服务的检查接口 LOGGER.info("微服定时任务数据校验：name:{}, groupName:{}", sysTaskPlan.getName(), sysTaskPlan.getGroupName()); BaseResultBean baseResultBean = getJobService(sysTaskPlan.getTaskSoftTypeRdd()) .checkJobExists(sysTaskPlan.getName(), sysTaskPlan.getGroupName()); @@ -201,15 +201,13 @@ public class SysTaskPlanController extends CoreBaseController{ resultBean = ResultBean.fail(baseResultBean.getErrorMsg()); } - // 修改对应模块中的定时任务 + // 修改对应微服务的定时任务 LOGGER.info("微服修改定时任务数据：taskPlan", sysTaskPlan.toString()); baseResultBean = getJobService(sysTaskPlan.getTaskSoftTypeRdd()) .editTask(sysTask.getTaskPackage(), sysTask.getTaskClass(), sysTaskPlan.getName(), sysTaskPlan.getGroupName(), sysTaskCycle.getTaskCycleExps(), sysTaskPlan.getTaskPlanParam()); if(!baseResultBean.isSuccess()){ resultBean = ResultBean.fail(baseResultBean.getErrorMsg()); - } else { - } // 是否立即执行 @@ -240,7 +238,7 @@ public class SysTaskPlanController extends CoreBaseController{ sysTaskPlanService.deleteSysTaskPlanById(Long.parseLong(id)); getJobService(sysTaskPlan.getTaskSoftTypeRdd()).deleteTask(sysTaskPlan.getName(),sysTaskPlan.getGroupName()); - return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).build(); + return ResultBean.success().setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -328,7 +326,8 @@ public class SysTaskPlanController extends CoreBaseController{ SysTaskPlan sysTaskPlan = sysTaskPlanService.getSysTaskPlanById(Long.parseLong(id)); // 执行定时任务 - BaseResultBean baseResultBean = getJobService(sysTaskPlan.getTaskSoftTypeRdd()).executeJob(sysTaskPlan.getName(), sysTaskPlan.getGroupName()); + BaseResultBean baseResultBean = getJobService(sysTaskPlan.getTaskSoftTypeRdd()) + .executeJob(sysTaskPlan.getName(), sysTaskPlan.getGroupName()); if(baseResultBean.isSuccess()){ return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }else{ 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 9e30ce4..a7e5fa0 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 @@ -83,10 +83,26 @@ public class SysTaskPlanService implements ISysTaskPlanService { "taskCycleId", oldSysTaskPlan.getTaskCycleId() ); - sysTaskPlan.setTaskPlanExecNum(oldSysTaskPlan.getTaskPlanExecNum()); - sysTaskPlan.setLastRunDateTime(oldSysTaskPlan.getLastRunDateTime()); - sysTaskPlan.setTaskPlanStatus(oldSysTaskPlan.getTaskPlanStatus()); - sysTaskPlanRDao.update(sysTaskPlan); + 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); } @Override From 10c6b8d01183f127004f6597e144e90dabf9479e Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Thu, 28 Mar 2019 16:06:55 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=89=80=E5=B1=9E=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java index 7f03053..f71ef19 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java @@ -134,7 +134,7 @@ public class SysDictionaryService implements ISysDictionaryService { @ApiOperation(value = "根据父级代码查询字典项信息") public List findSysDictionaryBySoftTypeAndParentCode(Integer softType, String parentCode) { LOGGER.info("字典 SYS_DICTIONARY parentCode:{}", parentCode); - return sysDictionaryRDao.findByProperty(new String[]{"softType", "parentCodeRdd"}, new Object[]{softType, parentCode}); + return sysDictionaryRDao.findByProperty(new String[]{"dictionarySoftType", "parentCodeRdd"}, new Object[]{softType, parentCode}); } @Override From 0098aba8c462d855a2f3bc7fbc8ae7f558d9362a Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Thu, 28 Mar 2019 17:58:24 +0800 Subject: [PATCH 8/8] =?UTF-8?q?shiro=E4=BC=9A=E8=AF=9Did=E4=BC=98=E5=8C=96?= =?UTF-8?q?=EF=BC=8C=E8=87=AA=E5=8A=A8update=E8=B5=8B=E5=80=BC=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/core/apiservice/mq/ScheduleQueueReceiver.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d5460e5..e51d7d9 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 @@ -53,7 +53,7 @@ public class ScheduleQueueReceiver { SysTaskPlan taskPlan = sysTaskPlanService.getSysTaskPlanByNameAndGroup(logTaskTime.getName(),logTaskTime.getGroupName()); if (taskPlan != null) { taskPlan.setLastRunDateTime(logTaskTime.getCreateDatetime()); - taskPlan.setTaskPlanExecNum(taskPlan.getTaskPlanExecNum() + 1); + taskPlan.setTaskPlanExecNum(taskPlan.getTaskPlanExecNumValue() + 1); taskPlan.setTaskPlanStatus(logTaskTime.getTaskStatus()); // 更新任务状态以及最后执行时间 sysTaskPlanService.updateSysTaskPlan(taskPlan);