From ccf3591686c2524d9bf4744003de0c78a99af188 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 6 Aug 2019 10:28:38 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=8E=BB=E7=BB=84=E7=BB=87=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/busi/SysTaskController.java | 12 +---------- .../controller/busi/SysTaskCycleController.java | 24 +++++++++------------- .../controller/busi/SysTaskPlanController.java | 13 +----------- .../serviceimpl/busi/SysTaskCycleService.java | 2 +- .../serviceimpl/busi/SysTaskPlanService.java | 2 +- .../busi/SysTaskTimeRecordingService.java | 2 +- 6 files changed, 15 insertions(+), 40 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskController.java index c0b792a..5ef528e 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysTaskController.java @@ -193,11 +193,7 @@ public class SysTaskController extends CoreBaseController { public ResultBean listSysTask() { try { List sysTaskList; - if(AuthUtil.getUserType().equals(CommonEnumUtil.USER_TYPE.ADMIN)){ - sysTaskList = sysTaskService.listSysTask(); - } else { - sysTaskList = sysTaskService.listSysTaskByOrg(AuthUtil.getOrganize().getOrganizeCode()); - } + sysTaskList = sysTaskService.listSysTask(); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(sysTaskList); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); @@ -216,12 +212,6 @@ public class SysTaskController extends CoreBaseController { @ApiOperation(value = "任务复杂查询", notes = "任务复杂查询,分页，排序") public ResultBean querySysTaskByPager(SysTask sysTask, Pager pager) { try { - if(AuthUtil.getUserType().equals(CommonEnumUtil.USER_TYPE.ADMIN)){ - sysTask.setOrganizeCode(null); - } else { - sysTask.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - } - ListPager sysTaskList = sysTaskService.querySysTaskByPager(sysTask, pager); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setListPager(sysTaskList); } catch (ImppBusiException busExcep) { 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 ac5e5b6..3a40609 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 @@ -98,7 +98,7 @@ public class SysTaskCycleController extends CoreBaseController { } else if (source == CommonEnumUtil.SOFT_TYPE.MES_PCN.getValue()) { quartzJobService = mesPcnScheduleJobCloud; // ANDON - } else if(source == CommonEnumUtil.SOFT_TYPE.ANDON.getValue()){ + } else if (source == CommonEnumUtil.SOFT_TYPE.ANDON.getValue()) { quartzJobService = andonScheduleJobCloud; } return quartzJobService; @@ -106,6 +106,7 @@ public class SysTaskCycleController extends CoreBaseController { /** * 新增任务周期 + * * @param sysTaskCycle 任务周期 * @return 处理结果 */ @@ -138,6 +139,7 @@ public class SysTaskCycleController extends CoreBaseController { /** * 修改任务周期 + * * @param sysTaskCycle 任务周期 * @return 处理结果 */ @@ -192,6 +194,7 @@ public class SysTaskCycleController extends CoreBaseController { /** * 删除任务周期 + * * @param idStr 任务周期id * @return 处理结果 */ @@ -223,18 +226,14 @@ public class SysTaskCycleController extends CoreBaseController { /** * 查询所有任务周期信息 + * * @return 处理结果 */ @GetMapping(value = "/list") @ApiOperation(value = "查询所有任务周期信息", notes = "查询所有任务周期信息") public ResultBean findSysTaskCycle() { try { - List list; - if(AuthUtil.getUserType().equals(CommonEnumUtil.USER_TYPE.ADMIN)){ - list = sysTaskCycleService.listSysTaskCycle(); - } else { - list = sysTaskCycleService.listSysTaskCycleByOrg(AuthUtil.getOrganize().getOrganizeCode()); - } + List list = sysTaskCycleService.listSysTaskCycle(); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(list); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); @@ -245,6 +244,7 @@ public class SysTaskCycleController extends CoreBaseController { /** * 查询根据ID查询任务周期 + * * @param id 任务周期id * @return 处理结果 */ @@ -270,20 +270,15 @@ public class SysTaskCycleController extends CoreBaseController { /** * 任务周期查询，分页，排序 + * * @param sysTaskCycle 查询条件 - * @param pager 分页信息 + * @param pager 分页信息 * @return 处理结果 */ @GetMapping("/query") @ApiOperation(value = "任务周期查询，分页，排序", notes = "任务周期查询，分页，排序") public ResultBean querySysTaskCycleByPager(SysTaskCycle sysTaskCycle, Pager pager) { try { - if(AuthUtil.getUserType().equals(CommonEnumUtil.USER_TYPE.ADMIN)){ - sysTaskCycle.setOrganizeCode(null); - } else { - sysTaskCycle.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - } - ListPager listPager = sysTaskCycleService.querySysTaskCycleByPager(sysTaskCycle, pager); return ResultBean.success("操作成功").setListPager(listPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { @@ -295,6 +290,7 @@ public class SysTaskCycleController extends CoreBaseController { /** * 根据id批量删除任务周期 + * * @param idsStr 任务周期id * @return 处理结果 */ 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 d8e6197..ffca3b0 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 @@ -307,12 +307,7 @@ public class SysTaskPlanController extends CoreBaseController { @ApiOperation(value = "查询所有任务计划", notes = "查询所有任务计划") public ResultBean findSysTaskTimeAll() { try { - List list; - if(AuthUtil.getUserType().equals(CommonEnumUtil.USER_TYPE.ADMIN)) { - list = sysTaskPlanService.listSysTaskPlan(); - } else { - list = sysTaskPlanService.listSysTaskPlanByOrg(AuthUtil.getOrganize().getOrganizeCode()); - } + List list = sysTaskPlanService.listSysTaskPlan(); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(list); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); @@ -392,12 +387,6 @@ public class SysTaskPlanController extends CoreBaseController { @ApiOperation(value = "任务计划复杂查询，分页，排序", notes = "任务计划复杂查询，分页，排序") public ResultBean querySysTaskTimeByPager(SysTaskPlan sysTaskPlan, Pager pager) { try { - if(AuthUtil.getUserType().equals(CommonEnumUtil.USER_TYPE.ADMIN)) { - sysTaskPlan.setOrganizeCode(null); - } else { - sysTaskPlan.setOrganizeCode(AuthUtil.getOrganize().getOrganizeCode()); - } - ListPager taskTimeListPager = sysTaskPlanService.querySysTaskPlanByPager(sysTaskPlan, pager); return ResultBean.success("操作成功").setListPager(taskTimeListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskCycleService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskCycleService.java index 8bff7a5..963cec2 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskCycleService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskCycleService.java @@ -24,7 +24,7 @@ import java.util.List; /** * @Description : 定时任务周期 业务逻辑实现 * @Reference : - * @Author : wei.peng + * @Author : yunhao * @Date : 2018-10-24 20:40 * @Modify : **/ 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 5e2359f..f655546 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 @@ -29,7 +29,7 @@ import java.util.List; /** * @Description : 定时任务业务接口实现 * @Reference : - * @Author : wei.peng + * @Author : yunhao * @Date : 2018-10-22 16:58:43.974 * @Modify : **/ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskTimeRecordingService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskTimeRecordingService.java index 72ab6df..7097bea 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskTimeRecordingService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysTaskTimeRecordingService.java @@ -14,7 +14,7 @@ import java.util.List; /** * @Description : 定时任务执行记录业务接口实现 * @Reference : - * @Author : wei.peng + * @Author : yunhao * @Date : 2018-10-22 16:58:44.011 * @Modify : **/ From 44ae93782baf9eb2cc2719b087897da6ee49fc20 Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Tue, 6 Aug 2019 11:56:52 +0800 Subject: [PATCH 2/3] =?UTF-8?q?Redis=20Bean=20=E5=90=8D=E7=A7=B0=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/core/apiservice/controller/DemoRedisMqController.java | 4 ++-- .../i3plus/core/apiservice/controller/DemoResourceController.java | 3 ++- .../i3plus/core/apiservice/controller/base/SystemController.java | 3 ++- .../core/apiservice/controller/busi/SysDashboardController.java | 2 +- .../i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java | 2 +- .../i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java | 3 ++- .../core/apiservice/serviceimpl/busi/PersonnelServiceService.java | 4 ++-- .../estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java | 3 ++- .../i3plus/core/apiservice/serviceimpl/busi/TestTransService.java | 3 ++- 9 files changed, 16 insertions(+), 11 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoRedisMqController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoRedisMqController.java index b9ba874..28ce40d 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoRedisMqController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoRedisMqController.java @@ -59,7 +59,7 @@ public class DemoRedisMqController extends CoreBaseController{ /** * 缓存 */ - @Resource(name="redisCore") + @Resource(name = CommonConstWords.IMPP_REDIS_CORE) private ImppRedis redisCore; /** @@ -143,7 +143,7 @@ public class DemoRedisMqController extends CoreBaseController{ return new ResultBean(true,"操作成功 ： " + locale.getLanguage() + " " + locale.getCountry()); } - @Resource(name="redisSession") + @Resource(name= CommonConstWords.IMPP_REDIS_SESSION) private ImppRedis redisSession; @GetMapping(value="/set-redis") diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java index 73d9cf6..0ca5362 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/DemoResourceController.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService; import cn.estsh.i3plus.core.api.iservice.busi.ISystemResourceService; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.StringTool; +import cn.estsh.i3plus.platform.common.util.CommonConstWords; import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; @@ -47,7 +48,7 @@ public class DemoResourceController extends CoreBaseController { /** * 缓存 */ - @Resource(name="redisCore") + @Resource(name = CommonConstWords.IMPP_REDIS_CORE) private ImppRedis redisCore; /** diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/SystemController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/SystemController.java index 509349d..2e7d3ee 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/SystemController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/SystemController.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.controller.base; import cn.estsh.i3plus.core.api.iservice.busi.ISysDictionaryService; import cn.estsh.i3plus.icloud.wms.sdk.IWmsCommonCloud; +import cn.estsh.i3plus.platform.common.util.CommonConstWords; import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; @@ -49,7 +50,7 @@ public class SystemController { @Autowired private IWmsCommonCloud wmsCommonCloud; - @Resource(name="redisCore") + @Resource(name = CommonConstWords.IMPP_REDIS_CORE) protected ImppRedis redisCore; @Autowired diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDashboardController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDashboardController.java index 2807e91..e24a3b6 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDashboardController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDashboardController.java @@ -47,7 +47,7 @@ public class SysDashboardController extends CoreBaseController { @Resource(name = "imppSessionManager") private DefaultWebSessionManager webSessionManager; - @Resource(name = "redisCore") + @Resource(name = CommonConstWords.IMPP_REDIS_CORE) private ImppRedis redisCore; /** diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java index 806cf14..a5af288 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemLoginService.java @@ -41,7 +41,7 @@ public class SystemLoginService implements ISystemLoginService { /** * 核心的缓存 */ - @Resource(name="redisCore") + @Resource(name = CommonConstWords.IMPP_REDIS_CORE) protected ImppRedis redisCore; @Override diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java index 95c1ffb..eba6ea0 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/CoreTreeService.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.ICoreTreeService; import cn.estsh.i3plus.core.apiservice.dao.ISysMenuDao; +import cn.estsh.i3plus.platform.common.util.CommonConstWords; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ModelEnumUtil; @@ -59,7 +60,7 @@ public class CoreTreeService implements ICoreTreeService { /** * 核心的缓存 */ - @Resource(name = "redisCore") + @Resource(name = CommonConstWords.IMPP_REDIS_CORE) protected ImppRedis redisCore; @Override diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java index d924e31..63e8809 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/PersonnelServiceService.java @@ -87,10 +87,10 @@ public class PersonnelServiceService implements IPersonnelService { @Autowired private ISysRoleService roleService; - @Resource(name="redisCore") + @Resource(name = CommonConstWords.IMPP_REDIS_CORE) protected ImppRedis redisCore; - @Resource(name="redisRes") + @Resource(name = CommonConstWords.IMPP_REDIS_RES) private ImppRedis redisRes; @Autowired diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java index d292abc..2c6567d 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysUserService.java @@ -9,6 +9,7 @@ import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.tool.EncryptTool; import cn.estsh.i3plus.platform.common.tool.StringTool; import cn.estsh.i3plus.platform.common.tool.TimeTool; +import cn.estsh.i3plus.platform.common.util.CommonConstWords; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.bean.ListPager; import cn.estsh.i3plus.pojo.base.common.Pager; @@ -107,7 +108,7 @@ public class SysUserService implements ISysUserService { /** * 缓存 */ - @Resource(name="redisSession") + @Resource(name= CommonConstWords.IMPP_REDIS_SESSION) private ImppRedis redisSession; @Override diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestTransService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestTransService.java index cbf450a..09131b4 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestTransService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestTransService.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.ITestTransService; import cn.estsh.i3plus.core.apiservice.dao.ITestTransDao; import cn.estsh.i3plus.core.apiservice.dao.ITransDaoSec; +import cn.estsh.i3plus.platform.common.util.CommonConstWords; import cn.estsh.i3plus.pojo.platform.bean.*; import cn.estsh.i3plus.pojo.platform.repository.SysDepartmentRepository; import cn.estsh.i3plus.pojo.platform.repository.SysUserInfoRepository; @@ -35,7 +36,7 @@ public class TestTransService implements ITestTransService { /** * 缓存 */ - @Resource(name="redisCore") + @Resource(name = CommonConstWords.IMPP_REDIS_CORE) private ImppRedis redisCore; @Autowired From 46a47d5570a532203f8fa05ffeb34296407dfc16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 7 Aug 2019 16:10:36 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=8A=9B=E5=87=BA=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E9=94=99=E8=BF=87=E5=A4=84?= =?UTF-8?q?=E7=90=86=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/core/api/iservice/busi/ISysTaskCycleService.java | 2 +- .../i3plus/core/apiservice/controller/busi/SysFileController.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTaskCycleService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTaskCycleService.java index 83dbb04..8125430 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTaskCycleService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysTaskCycleService.java @@ -11,7 +11,7 @@ import java.util.List; /** * @Description : 任务周期业务接口 * @Reference : - * @Author : wei.peng + * @Author : yunhao * @Date : 2018-10-22 16:58:43.771 * @Modify : **/ diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java index 523fdd1..3fe5deb 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysFileController.java @@ -160,7 +160,7 @@ public class SysFileController extends CoreBaseController{ public ResultBean querySysFileByPager(SysFile sysFile, Pager pager){ try { ListPager sysFileListPager = sysFileService.querySysFileByPager(sysFile, pager); - return ResultBean.success("操作成功").setListPager(sysFileListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setListPager(sysFileListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); }catch(Exception e){ @@ -177,7 +177,7 @@ public class SysFileController extends CoreBaseController{ @ApiOperation(value = "批量删除文件资源", notes = "批量删除文件资源") public ResultBean deleteSysFileByIds(String[] ids){ try{ - if(ids.length == 0){ + if (ids.length == 0) { throw ImppExceptionBuilder.newInstance() .setSystemID(CommonEnumUtil.SOFT_TYPE.CORE.getCode()) .setErrorCode(ImppExceptionEnum.VARIFY_EXCEPTION.getCode())