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

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      :
  **/

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

@@ -57,7 +57,7 @@ public class DemoRedisMqController extends CoreBaseController{
     /**
      * 缓存
      */
-    @Resource(name="redisCore")
+    @Resource(name = CommonConstWords.IMPP_REDIS_CORE)
     private ImppRedis redisCore;
 
     /**
@@ -141,7 +141,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")

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;
 
     /**

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

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;
 
     /**

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

@@ -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())

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());
-            }
             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<SysTask> sysTaskList = sysTaskService.querySysTaskByPager(sysTask, pager);
             return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setListPager(sysTaskList);
         } catch (ImppBusiException busExcep) {

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<SysTaskCycle> list;
+            List<SysTaskCycle> list = sysTaskCycleService.listSysTaskCycle();
-            if(AuthUtil.getUserType().equals(CommonEnumUtil.USER_TYPE.ADMIN)){
-                list = sysTaskCycleService.listSysTaskCycle();
-            } else {
-                list = sysTaskCycleService.listSysTaskCycleByOrg(AuthUtil.getOrganize().getOrganizeCode());
-            }
             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,6 +270,7 @@ public class SysTaskCycleController extends CoreBaseController {
 
     /**
      * 任务周期查询，分页，排序
+     *
      * @param sysTaskCycle 查询条件
      * @param pager        分页信息
      * @return 处理结果
@@ -278,12 +279,6 @@ public class SysTaskCycleController extends CoreBaseController {
     @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 处理结果
      */

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<SysTaskPlan> list;
+            List<SysTaskPlan> list = sysTaskPlanService.listSysTaskPlan();
-            if(AuthUtil.getUserType().equals(CommonEnumUtil.USER_TYPE.ADMIN)) {
-                list = sysTaskPlanService.listSysTaskPlan();
-            } else {
-                list = sysTaskPlanService.listSysTaskPlanByOrg(AuthUtil.getOrganize().getOrganizeCode());
-            }
             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) {

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

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

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

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 :
  **/

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      :
  **/

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 :
  **/

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

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