平台功能优化，移除通用缓存服务

modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDataSourceService.java

@@ -1,8 +1,7 @@
 package cn.estsh.i3plus.core.api.iservice.busi;
 
 import cn.estsh.i3plus.pojo.platform.bean.SysDataSource;
-import cn.estsh.i3plus.pojo.platform.bean.SysPosition;
+import cn.estsh.impp.framework.base.service.ICrudService;
-import cn.estsh.impp.framework.base.service.ICacheCrudService;
 import io.swagger.annotations.ApiOperation;
 
 /**
@@ -12,7 +11,7 @@ import io.swagger.annotations.ApiOperation;
  * @Date : 2018-10-19 16:36
  * @Modify :
  **/
-public interface ISysDataSourceService extends ICacheCrudService<SysDataSource> {
+public interface ISysDataSourceService extends ICrudService<SysDataSource> {
 
     @ApiOperation(value = "数据源检查",notes = "数据源唯一检查(软件类型,数据源代码)")
     void checkSysDataSourceOnly(SysDataSource bean);

modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDepartmentService.java

@@ -3,7 +3,7 @@ package cn.estsh.i3plus.core.api.iservice.busi;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.platform.bean.SysDepartment;
-import cn.estsh.impp.framework.base.service.ICacheCrudService;
+import cn.estsh.impp.framework.base.service.ICrudService;
 import io.swagger.annotations.ApiOperation;
 
 import java.util.List;
@@ -15,7 +15,7 @@ import java.util.List;
  * @Date : 2018-10-24 20:39
  * @Modify :
  **/
-public interface ISysDepartmentService extends ICacheCrudService<SysDepartment> {
+public interface ISysDepartmentService extends ICrudService<SysDepartment> {
 //
 //    /**
 //     * 添加部门

modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysMenuService.java

@@ -2,7 +2,7 @@ package cn.estsh.i3plus.core.api.iservice.busi;
 
 
 import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
-import cn.estsh.impp.framework.base.service.ICacheCrudService;
+import cn.estsh.impp.framework.base.service.ICrudService;
 import io.swagger.annotations.ApiOperation;
 
 import java.util.List;
@@ -14,7 +14,7 @@ import java.util.List;
  * @Date        : 2018-10-22 15:18:14.958
  * @Modify      :
  **/
-public interface ISysMenuService extends ICacheCrudService<SysMenu> {
+public interface ISysMenuService extends ICrudService<SysMenu> {
 
 
     @ApiOperation(value = "功能权限检查",notes = "功能权限检查(权限代码)")

modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysOrganizeService.java

@@ -3,7 +3,7 @@ package cn.estsh.i3plus.core.api.iservice.busi;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.platform.bean.*;
-import cn.estsh.impp.framework.base.service.ICacheCrudService;
+import cn.estsh.impp.framework.base.service.ICrudService;
 import io.swagger.annotations.ApiOperation;
 
 import java.util.List;
@@ -15,7 +15,7 @@ import java.util.List;
  * @Date        : 2018-10-22 16:58:42.941
  * @Modify      :
  **/
-public interface ISysOrganizeService extends ICacheCrudService<SysOrganize> {
+public interface ISysOrganizeService extends ICrudService<SysOrganize> {
 //
 //    /**
 //     * @param organize

modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysPojoVersionPlanService.java

@@ -1,7 +1,7 @@
 package cn.estsh.i3plus.core.api.iservice.busi;
 
 import cn.estsh.i3plus.pojo.platform.bean.SysPojoVersionPlan;
-import cn.estsh.impp.framework.base.service.ICacheCrudService;
+import cn.estsh.impp.framework.base.service.ICrudService;
 import io.swagger.annotations.ApiOperation;
 
 /**
@@ -11,7 +11,7 @@ import io.swagger.annotations.ApiOperation;
  * @CreateDate : 20-4-21 下午2:21
  * @Modify:
  **/
-public interface ISysPojoVersionPlanService extends ICacheCrudService<SysPojoVersionPlan> {
+public interface ISysPojoVersionPlanService extends ICrudService<SysPojoVersionPlan> {
 
     @ApiOperation(value = "版本计划唯一检查")
     void checkSysPojoVersionPlanOnly(SysPojoVersionPlan bean);

modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysPositionService.java

@@ -2,12 +2,9 @@ package cn.estsh.i3plus.core.api.iservice.busi;
 
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
-import cn.estsh.i3plus.pojo.platform.bean.SysPojoVersionPlan;
 import cn.estsh.i3plus.pojo.platform.bean.SysPosition;
-import cn.estsh.i3plus.pojo.platform.bean.SysUser;
+import cn.estsh.impp.framework.base.service.ICrudService;
-import cn.estsh.impp.framework.base.service.ICacheCrudService;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.data.domain.Page;
 
 import java.util.List;
 
@@ -18,7 +15,7 @@ import java.util.List;
  * @Date : 2018-10-19 16:36
  * @Modify :
  **/
-public interface ISysPositionService extends ICacheCrudService<SysPosition> {
+public interface ISysPositionService extends ICrudService<SysPosition> {
 
 //    /**
 //     * 修改数据

modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysRoleService.java

@@ -6,7 +6,7 @@ import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
 import cn.estsh.i3plus.pojo.platform.bean.SysRefRoleMenu;
 import cn.estsh.i3plus.pojo.platform.bean.SysRole;
 import cn.estsh.i3plus.pojo.platform.bean.SysUser;
-import cn.estsh.impp.framework.base.service.ICacheCrudService;
+import cn.estsh.impp.framework.base.service.ICrudService;
 import io.swagger.annotations.ApiOperation;
 
 import java.util.List;
@@ -18,7 +18,7 @@ import java.util.List;
  * @Date        : 2018-10-22 16:58:43.771
  * @Modify      :
  **/
-public interface ISysRoleService extends ICacheCrudService<SysRole> {
+public interface ISysRoleService extends ICrudService<SysRole> {
 
     @ApiOperation(value = "更新角色信息",notes = "根据ID 批量更新角色状态信息")
     void updateSysRoleStatusByIds(Long[] ids, int status, SessionUser user);

modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ITestTransService.java

@@ -2,7 +2,6 @@ package cn.estsh.i3plus.core.api.iservice.busi;
 
 import cn.estsh.i3plus.pojo.platform.bean.TestTransUser;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
@@ -25,6 +24,10 @@ public interface ITestTransService {
     @ApiOperation(value = "测试缓存事务")
     void testRedisTrans(String name, String val);
 
+    void insertRedis();
+
+    void selectRedis();
+
     /******************** 读写分离部分测试 **********************/
 
     @ApiOperation(value = "读写分离测试读")

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

@@ -47,7 +47,7 @@ public class DemoController extends CoreBaseController {
     @ApiOperation(value = "添加操作日志", notes = "添加操作日志，可用于国际化")
     public ResultBean putRedisList(boolean isUpdate) {
         try {
-            pojoVersionPlanService.refreshCache(isUpdate);
+//            pojoVersionPlanService.refreshCache(isUpdate);
             return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         } catch (ImppBusiException busExcep) {
             return ResultBean.fail(busExcep).build();
@@ -61,7 +61,7 @@ public class DemoController extends CoreBaseController {
     @ApiOperation(value = "添加操作日志", notes = "添加操作日志，可用于国际化")
     public ResultBean gutRedisList() {
         try {
-            pojoVersionPlanService.cloneCache();
+//            pojoVersionPlanService.cloneCache();
             return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         } catch (ImppBusiException busExcep) {
             return ResultBean.fail(busExcep).build();

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.core.apiservice.controller.base;
 
+import cn.estsh.i3plus.core.api.iservice.busi.ITestTransService;
 import cn.estsh.i3plus.platform.common.tool.HttpClientTool;
+import cn.estsh.i3plus.platform.common.util.CommonConstWords;
 import cn.estsh.i3plus.platform.plugin.opc.pojo.OpcUAParam;
 import cn.estsh.i3plus.platform.plugin.opc.service.OpcUAService;
 import cn.estsh.i3plus.pojo.base.annotation.AnnoIgnoreLog;
@@ -9,20 +11,24 @@ import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.impp.framework.base.controller.CoreBaseController;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
+import cn.estsh.impp.framework.boot.util.ImppRedis;
 import cn.estsh.impp.framework.boot.util.ResultBean;
 import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.Setter;
 import org.eclipse.milo.opcua.sdk.client.api.subscriptions.UaMonitoredItem;
 import org.eclipse.milo.opcua.sdk.client.api.subscriptions.UaSubscription;
 import org.eclipse.milo.opcua.stack.core.types.builtin.DataValue;
 import org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.UInteger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.Map;
@@ -45,6 +51,104 @@ public class PressureTestController extends CoreBaseController {
 
     public static Map<UInteger,OpcUAParam> upcSub = new Hashtable<>();
 
+    @Resource(name = CommonConstWords.IMPP_REDIS_RES)
+    public ImppRedis imppRedis;
+
+    @Autowired
+    private ITestTransService testTransService;
+
+    @GetMapping("/s-redis-put")
+    @ApiOperation(value = "redisPut", notes = "redisPut")
+    public ResultBean sredisPut(){
+        try {
+            testTransService.insertRedis();
+            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        }catch(ImppBusiException busExcep){
+            return ResultBean.fail(busExcep);
+        }catch(Exception e){
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
+    @GetMapping("/s-redis-put-test")
+    @ApiOperation(value = "redisPutTest", notes = "redisPutTest")
+    public ResultBean sredisPutTest(){
+        try {
+            testTransService.selectRedis();
+            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        }catch(ImppBusiException busExcep){
+            return ResultBean.fail(busExcep);
+        }catch(Exception e){
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
+    @GetMapping("/redis-put")
+    @ApiOperation(value = "redisPut", notes = "redisPut")
+    public ResultBean redisPut(){
+        try {
+            for (int i = 0; i < 1000; i++) {
+                imppRedis.putObject(i + "", i);
+            }
+            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        }catch(ImppBusiException busExcep){
+            return ResultBean.fail(busExcep);
+        }catch(Exception e){
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
+    @GetMapping("/redis-put-test")
+    @ApiOperation(value = "redisPutTest", notes = "redisPutTest")
+    public ResultBean redisPutTest(){
+        try {
+            for (int i = 0; i < 1000; i++) {
+//                imppRedis.putObjectTest(i + "", i);
+            }
+            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        }catch(ImppBusiException busExcep){
+            return ResultBean.fail(busExcep);
+        }catch(Exception e){
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
+    @GetMapping("/redis-put-run")
+    @ApiOperation(value = "redisPutThread", notes = "redisPutThread")
+    public ResultBean redisPutThread(Boolean isTest){
+        try {
+            RedisTest.setImppRedis(imppRedis);
+            RedisTest.setTest(isTest);
+            for (int i = 0; i < 10; i++) {
+                new RedisTest().run();
+            }
+            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        }catch(ImppBusiException busExcep){
+            return ResultBean.fail(busExcep);
+        }catch(Exception e){
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
+    static class RedisTest implements Runnable{
+
+        @Setter
+        public static ImppRedis imppRedis;
+        @Setter
+        public static boolean isTest;
+
+        @Override
+        public void run() {
+            for (int i = 0; i < 200; i++) {
+                if(isTest) {
+                    imppRedis.putObject("runnable" + i, i);
+                }else{
+//                    imppRedis.putObjectTest("runnable" + i, i);
+                }
+            }
+        }
+
+    }
     private OpcUAService getOpcUaService(OpcUAParam opcUAParam){
         if(!uaServiceMap.containsKey(opcUAParam.getServerUrl())){
             OpcUAService opcService = new OpcUAService();

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

@@ -71,6 +71,20 @@ public class SysRoleController extends CrudBaseController<SysRole> {
         return role;
     }
 
+    @Override
+    public SysRole validatorUpdateBean(SysRole role) throws Exception {
+        //条件验证
+        ValidatorBean.beginValid(role)
+                .notNull("id", role.getId())
+                .notNull("name", role.getName());
+
+        sysRoleService.checkSysRoleOnly(role);
+
+        //新增初始化
+        ConvertBean.modelUpdate(role, AuthUtil.getSessionUser());
+        return role;
+    }
+
     @GetMapping(value = "/list-user")
     @ApiOperation(value = "查询角色", notes = "查询用户所拥有的角色信息")
     public ResultBean findSysRoleByUser() {
@@ -271,12 +285,7 @@ public class SysRoleController extends CrudBaseController<SysRole> {
             ValidatorBean.checkNotNull(roleId, "角色roleId 不能为空");
             ValidatorBean.checkNotNull(softType, "产品类型 不能为空");
 
-            List<SysRefRoleMenu> sysRefRoleMenuList;
+            List<SysRefRoleMenu> sysRefRoleMenuList = sysRoleService.findSysRefRoleMenuByRoleId(roleId, softType);
-            if (CommonEnumUtil.USER_TYPE.ADMIN.getCode().equals(AuthUtil.getSessionUser().getUserType())) {
-                sysRefRoleMenuList = sysRoleService.findSysRefRoleMenuByRoleId(-1L, softType);
-            }else{
-                sysRefRoleMenuList = sysRoleService.findSysRefRoleMenuByRoleId(roleId, softType);
-            }
 
             return ResultBean.success("操作成功")
                     .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/daoimpl/UserPermissionDaoImpl.java

@@ -2,7 +2,6 @@ package cn.estsh.i3plus.core.apiservice.daoimpl;
 
 import cn.estsh.i3plus.core.api.iservice.busi.ISysLocaleResourceService;
 import cn.estsh.i3plus.core.apiservice.dao.IUserPermissionDao;
-import cn.estsh.i3plus.platform.common.util.CommonConstWords;
 import cn.estsh.i3plus.pojo.platform.bean.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java

@@ -213,7 +213,7 @@ public class SystemInitService implements ISystemInitService {
                     resMap.put(res.getResourceKey(), res.getResourceValue());
                 }
 
-
+                pager.refresh(pager.getCurrentPage());
                 LOGGER.info("【加载WEB资源】数据分类中 {} / {} ", pager.getEndRow(), pager.getTotalRows());
             } while (pager.hasNext());
 
@@ -273,7 +273,7 @@ public class SystemInitService implements ISystemInitService {
                     resMap.put(res.getLanguageCode(), res.getResourceValue());
                 }
 
-                pager.resetEndRow();
+                pager.refresh(pager.getCurrentPage());
                 LOGGER.info("【加载资源】数据分类中 {} / {} ", pager.getEndRow(), pager.getTotalRows());
             } while (pager.hasNext());
 

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDataSourceService.java

@@ -2,27 +2,18 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
 
 import cn.estsh.i3plus.core.api.iservice.busi.ISysDataSourceService;
 import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
-import cn.estsh.i3plus.platform.common.util.CommonConstWords;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
-import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil;
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.platform.bean.SysDataSource;
 import cn.estsh.i3plus.pojo.platform.repository.SysDataSourceRepository;
 import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
-import cn.estsh.impp.framework.base.service.CacheCrudService;
+import cn.estsh.impp.framework.base.service.CrudService;
-import cn.estsh.impp.framework.boot.datasource.ImppJdbcTemplateFactory;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
-import cn.estsh.impp.framework.boot.util.ImppRedis;
-import com.alibaba.fastjson.JSON;
-import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-import java.util.Objects;
-
 /**
  * @Description :
  * @Reference :
@@ -31,7 +22,7 @@ import java.util.Objects;
  * @Modify:
  **/
 @Service
-public class SysDataSourceService extends CacheCrudService<SysDataSource> implements ISysDataSourceService {
+public class SysDataSourceService extends CrudService<SysDataSource> implements ISysDataSourceService {
 
     @Autowired
     private SysDataSourceRepository dataSourceRDao;
@@ -58,21 +49,21 @@ public class SysDataSourceService extends CacheCrudService<SysDataSource> implem
         }
     }
 
-    @Override
+//    @Override
-    public void packAfterRefreshCache() {
+//    public void packAfterRefreshCache() {
-        List<SysDataSource> list = getMemCacheDataSource();
+//        List<SysDataSource> list = getMemCacheDataSource();
-        ImppRedis imppRedis = getRedisBusiCache();
+//        ImppRedis imppRedis = getRedisBusiCache();
-        if(CollectionUtils.isNotEmpty(list)){
+//        if(CollectionUtils.isNotEmpty(list)){
-            if(Objects.nonNull(imppRedis)){
+//            if(Objects.nonNull(imppRedis)){
-                for (SysDataSource source : list) {
+//                for (SysDataSource source : list) {
-                    String redisKey = ImppJdbcTemplateFactory.getDataSourceName(source.getSourceName());
+//                    String redisKey = ImppJdbcTemplateFactory.getDataSourceName(source.getSourceName());
-                    imppRedis.putObject(redisKey, JSON.toJSONString(source), -1);
+//                    imppRedis.putObject(redisKey, JSON.toJSONString(source), -1);
-                }
+//                }
-            }else{
+//            }else{
-                LOGGER.info("同步数据到错误:无法获取Redis连接信息");
+//                LOGGER.info("同步数据到错误:无法获取Redis连接信息");
-            }
+//            }
-        }
+//        }
-    }
+//    }
 
     @Override
     public DdlPackBean getFindPagerPackBean(SysDataSource bean) {

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDepartmentService.java

@@ -2,25 +2,16 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
 
 import cn.estsh.i3plus.core.api.iservice.busi.IPersonnelService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysDepartmentService;
-import cn.estsh.i3plus.core.api.iservice.busi.ISysMenuService;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.base.common.PagerHelper;
-import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.platform.bean.SysDepartment;
-import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
-import cn.estsh.i3plus.pojo.platform.bean.SysOrganize;
 import cn.estsh.i3plus.pojo.platform.repository.*;
 import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
-import cn.estsh.impp.framework.base.service.CacheCrudService;
+import cn.estsh.impp.framework.base.service.CrudService;
-import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
-import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
-import cn.estsh.impp.framework.boot.util.ValidatorBean;
-import io.swagger.annotations.ApiOperation;
-import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,7 +28,7 @@ import java.util.Objects;
  * @Modify :
  **/
 @Service
-public class SysDepartmentService extends CacheCrudService<SysDepartment> implements ISysDepartmentService {
+public class SysDepartmentService extends CrudService<SysDepartment> implements ISysDepartmentService {
 
     public static final Logger LOGGER = LoggerFactory.getLogger(SysDepartmentService.class);
 
@@ -304,15 +295,18 @@ public class SysDepartmentService extends CacheCrudService<SysDepartment> implem
 
     @Override
     public List<SysDepartment> findByOrganizeIdList(List<Long> organizeIdList) {
-        List<SysDepartment> result = findCacheIndex(organizeIdList.hashCode());
+//        List<SysDepartment> result = findCacheIndex(organizeIdList.hashCode());
-        if(CollectionUtils.isEmpty(result)){
+//        if(CollectionUtils.isEmpty(result)){
+//
+//            DdlPackBean packBean = DdlPackBean.getDdlPackBean();
+//            DdlPreparedPack.getInPackList(organizeIdList,"organizeId",packBean);
+//            result = departmentRDao.findByHqlWhere(packBean);
+//            putCacheIndex(result,organizeIdList.hashCode());
+//        }
 
-            DdlPackBean packBean = DdlPackBean.getDdlPackBean();
+        DdlPackBean packBean = DdlPackBean.getDdlPackBean();
-            DdlPreparedPack.getInPackList(organizeIdList,"organizeId",packBean);
+        DdlPreparedPack.getInPackList(organizeIdList,"organizeId",packBean);
-            result = departmentRDao.findByHqlWhere(packBean);
+        return departmentRDao.findByHqlWhere(packBean);
-            putCacheIndex(result,organizeIdList.hashCode());
-        }
-        return result;
     }
 
     @Override

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysMenuService.java

@@ -14,7 +14,7 @@ import cn.estsh.i3plus.pojo.platform.bean.SysMenu;
 import cn.estsh.i3plus.pojo.platform.repository.SysMenuRepository;
 import cn.estsh.i3plus.pojo.platform.repository.SysRefRoleMenuRepository;
 import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
-import cn.estsh.impp.framework.base.service.CacheCrudService;
+import cn.estsh.impp.framework.base.service.CrudService;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
@@ -36,7 +36,7 @@ import static cn.estsh.i3plus.platform.common.util.CommonConstWords.RESOURCE_PRE
  * @Modify :
  **/
 @Service
-public class SysMenuService extends CacheCrudService<SysMenu> implements ISysMenuService {
+public class SysMenuService extends CrudService<SysMenu> implements ISysMenuService {
 
     public static final Logger LOGGER = LoggerFactory.getLogger(SysMenuService.class);
 

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysOrganizeService.java

@@ -2,34 +2,18 @@ package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
 
 import cn.estsh.i3plus.core.api.iservice.busi.IPersonnelService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysOrganizeService;
-import cn.estsh.i3plus.core.api.iservice.busi.ISysPojoVersionPlanService;
-import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
-import cn.estsh.i3plus.pojo.base.bean.ListPager;
-import cn.estsh.i3plus.pojo.base.common.Pager;
-import cn.estsh.i3plus.pojo.base.common.PagerHelper;
-import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
-import cn.estsh.i3plus.pojo.platform.bean.SessionUser;
 import cn.estsh.i3plus.pojo.platform.bean.SysOrganize;
-import cn.estsh.i3plus.pojo.platform.bean.SysPojoVersionPlan;
-import cn.estsh.i3plus.pojo.platform.bean.SysRefUserDepartment;
 import cn.estsh.i3plus.pojo.platform.repository.*;
 import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
-import cn.estsh.impp.framework.base.service.CacheCrudService;
+import cn.estsh.impp.framework.base.service.CrudService;
-import cn.estsh.impp.framework.boot.auth.AuthUtil;
-import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
-import cn.estsh.impp.framework.boot.util.ValidatorBean;
-import io.swagger.annotations.ApiOperation;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
 
-import java.util.List;
 import java.util.Objects;
 
 /**
@@ -40,7 +24,7 @@ import java.util.Objects;
  * @Modify :
  **/
 @Service
-public class SysOrganizeService extends CacheCrudService<SysOrganize> implements ISysOrganizeService {
+public class SysOrganizeService extends CrudService<SysOrganize> implements ISysOrganizeService {
 
     public static final Logger LOGGER = LoggerFactory.getLogger(SysOrganizeService.class);
 
@@ -250,17 +234,18 @@ public class SysOrganizeService extends CacheCrudService<SysOrganize> implements
 
     @Override
     public SysOrganize get(SysOrganize bean) {
-        SysOrganize result = getCacheIndex(bean.hashCode());
+//        SysOrganize result = getCacheIndex(bean.hashCode());
-        if(Objects.isNull(result)){
+//        if(Objects.isNull(result)){
             DdlPackBean packBean = DdlPackBean.getDdlPackBean(bean);
             DdlPreparedPack.getNumEqualPack(bean.getParentId(),"parentId",packBean);
             DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(),"organizeCode",packBean);
 
-            result = organizeRDao.getByProperty(packBean);
+            return organizeRDao.getByProperty(packBean);
-            setCacheIndex(result,bean.hashCode());
+//            result = organizeRDao.getByProperty(packBean);
-        }
+//            setCacheIndex(result,bean.hashCode());
-
+//        }
-        return result;
+//
+//        return result;
     }
 
 

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPojoVersionPlanService.java

@@ -8,7 +8,7 @@ import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.platform.bean.SysPojoVersionPlan;
 import cn.estsh.i3plus.pojo.platform.repository.SysPojoVersionPlanRepository;
-import cn.estsh.impp.framework.base.service.CacheCrudService;
+import cn.estsh.impp.framework.base.service.CrudService;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -21,7 +21,7 @@ import org.springframework.stereotype.Service;
  * @Modify:
  **/
 @Service
-public class SysPojoVersionPlanService extends CacheCrudService<SysPojoVersionPlan> implements ISysPojoVersionPlanService {
+public class SysPojoVersionPlanService extends CrudService<SysPojoVersionPlan> implements ISysPojoVersionPlanService {
 
     @Autowired
     private SysPojoVersionPlanRepository pojoVersionPlanRDao;

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysPositionService.java

@@ -1,8 +1,7 @@
 package cn.estsh.i3plus.core.apiservice.serviceimpl.busi;
 
-import cn.estsh.i3plus.core.api.iservice.busi.IPersonnelService;
-import cn.estsh.i3plus.core.api.iservice.busi.ISysPojoVersionPlanService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISysPositionService;
+import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.bean.ListPager;
 import cn.estsh.i3plus.pojo.base.common.Pager;
@@ -10,19 +9,13 @@ import cn.estsh.i3plus.pojo.base.common.PagerHelper;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
-import cn.estsh.i3plus.pojo.base.tool.HqlPack;
-import cn.estsh.i3plus.pojo.platform.bean.SysPojoVersionPlan;
 import cn.estsh.i3plus.pojo.platform.bean.SysPosition;
 import cn.estsh.i3plus.pojo.platform.repository.SysPositionRepository;
-import cn.estsh.i3plus.pojo.platform.repository.SysRefUserPositionRepository;
 import cn.estsh.i3plus.pojo.platform.repository.SysUserInfoRepository;
-import cn.estsh.i3plus.pojo.platform.repository.SysUserRepository;
 import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
-import cn.estsh.impp.framework.base.service.CacheCrudService;
+import cn.estsh.impp.framework.base.service.CrudService;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
-import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum;
 import cn.estsh.impp.framework.boot.util.ValidatorBean;
-import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,7 +31,7 @@ import java.util.List;
  * @Modify :
  **/
 @Service
-public class SysPositionService extends CacheCrudService<SysPosition> implements ISysPositionService {
+public class SysPositionService extends CrudService<SysPosition> implements ISysPositionService {
     public static final Logger LOGGER = LoggerFactory.getLogger(SysPositionService.class);
 
     @Autowired

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysRoleService.java

@@ -19,7 +19,7 @@ import cn.estsh.i3plus.pojo.platform.repository.SysRefRoleMenuRepository;
 import cn.estsh.i3plus.pojo.platform.repository.SysRefUserRoleRepository;
 import cn.estsh.i3plus.pojo.platform.repository.SysRoleRepository;
 import cn.estsh.i3plus.pojo.platform.sqlpack.CoreHqlPack;
-import cn.estsh.impp.framework.base.service.CacheCrudService;
+import cn.estsh.impp.framework.base.service.CrudService;
 import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.util.ValidatorBean;
@@ -46,7 +46,7 @@ import static cn.estsh.i3plus.platform.common.util.PlatformConstWords.SQL_SERVER
  * @Modify      :
  **/
 @Service
-public class SysRoleService extends CacheCrudService<SysRole> implements ISysRoleService {
+public class SysRoleService extends CrudService<SysRole> implements ISysRoleService {
 
     public static final Logger LOGGER = LoggerFactory.getLogger(SysRoleService.class);
 
@@ -268,23 +268,23 @@ public class SysRoleService extends CacheCrudService<SysRole> implements ISysRol
     }
 
 
-    @Override
+//    @Override
-    public void packAfterRefreshCache() {
+//    public void packAfterRefreshCache() {
-        if(isCache()){
+//        if(isCache()){
-            List<SysRole> roles = super.findAll();
+//            List<SysRole> roles = super.findAll();
-
+//
-            if(CollectionUtils.isNotEmpty(roles)){
+//            if(CollectionUtils.isNotEmpty(roles)){
-                List<Long> idList = new ArrayList<>();
+//                List<Long> idList = new ArrayList<>();
-                for (SysRole role : roles) {
+//                for (SysRole role : roles) {
-                    List<SysRefRoleMenu> refRoleMenuList = findSysRefRoleMenuByRoleId(role.getId());
+//                    List<SysRefRoleMenu> refRoleMenuList = findSysRefRoleMenuByRoleId(role.getId());
-
+//
-                    if(CollectionUtils.isNotEmpty(refRoleMenuList)){
+//                    if(CollectionUtils.isNotEmpty(refRoleMenuList)){
-                        idList.clear();
+//                        idList.clear();
-                        refRoleMenuList.forEach(ref -> idList.add(ref.getMenuId()));
+//                        refRoleMenuList.forEach(ref -> idList.add(ref.getMenuId()));
-                        role.setMenuIdList(idList);
+//                        role.setMenuIdList(idList);
-                    }
+//                    }
-                }
+//                }
-            }
+//            }
-        }
+//        }
-    }
+//    }
 }

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestTransService.java

@@ -13,7 +13,6 @@ import cn.estsh.impp.framework.boot.util.ImppRedis;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.jpa.repository.Lock;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -57,6 +56,9 @@ public class TestTransService implements ITestTransService {
     @Autowired
     private TestTransUserRepository testTransUserRepository;
 
+    @Resource(name = CommonConstWords.IMPP_REDIS_RES)
+    public ImppRedis imppRedis;
+
     @Override
     public void testListTran(int type,String name) {
         if(type == 1) {
@@ -153,6 +155,7 @@ public class TestTransService implements ITestTransService {
 
     }
 
+    @Override
     public void testRedisTrans(String name, String val){
         System.out.println("==========" + redisCore.getObject(name));
 
@@ -161,6 +164,21 @@ public class TestTransService implements ITestTransService {
     }
 
     @Override
+    public void insertRedis() {
+        sysDepartmentRDao.insert(new SysDepartment());
+        for (int i = 0; i < 1000; i++) {
+            imppRedis.putObject(i + "", i);
+        }
+    }
+
+    @Override
+    public void selectRedis() {
+        for (int i = 0; i < 1000; i++) {
+            imppRedis.putObject(i + "", i);
+        }
+    }
+
+    @Override
     public List<TestTransUser> listRead() {
         List<TestTransUser> ul = testTransUserRepository.list();
         testTransUserRepository.flush();