Impp 功能完善

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

@@ -10,6 +10,7 @@ import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate;
 import cn.estsh.i3plus.pojo.platform.repository.SysLogUserLoginRepository;
 import cn.estsh.i3plus.pojo.platform.repository.SysUserRepository;
 import cn.estsh.impp.framework.base.controller.CoreBaseController;
+import cn.estsh.impp.framework.boot.auth.AuthUtil;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.license.ImppLicenseTool;
@@ -133,5 +134,22 @@ public class DemoController extends CoreBaseController {
 
 
 
+    @GetMapping(value = "/user-session")
+    @ApiOperation(value = "repository 测试")
+    public ResultBean getUserSessionSize() {
+        try{
+            for (int i = 0; i < 100; i++) {
+                AuthUtil.setSessionObject("Test"+ i,i);
+            }
+            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        } catch (ImppBusiException busExcep) {
+            return ResultBean.fail(busExcep).build();
+        } catch (Exception e) {
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
+
+
 
 }

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

@@ -91,22 +91,13 @@ public class BackstageController extends CoreBaseController {
         }
     }
 
-    @GetMapping(value = "/license")
+    @GetMapping(value = "/reload-license")
     @ApiOperation(value = "重新加载授权数据",notes = "重新加载授权数据")
-    public ResultBean updateLicense(ImppLicense license){
+    public ResultBean reloadLicense(){
         try {
-            ValidatorBean.beginValid(license)
+            ImppLicenseTool.cloneLicense();
-                    .checkNotZero("licenseMaxOrganize",license.getLicenseMaxOrganize())
+            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
-                    .checkNotZero("licenseMaxWarehouse",license.getLicenseMaxWarehouse())
+                    .setResultObject(ImppLicenseTool.getLicense());
-                    .checkNotZero("licenseMaxProductionLine",license.getLicenseMaxProductionLine())
-                    .checkNotZero("licenseMaxUser",license.getLicenseMaxUser())
-                    .checkNotZero("licenseMaxUserSession",license.getLicenseMaxUserSession())
-                    .notNull("licenseUpdateUserName",license.getLicenseUpdateUserName())
-                    .notNull("licenseUpdateDateTime",license.getLicenseUpdateDateTime())
-                    .notNull("licenseDescription",license.getLicenseDescription());
-
-            ImppLicenseTool.updateImppLicense(license);
-            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         }catch(ImppBusiException busExcep){
             return ResultBean.fail(busExcep);
         }catch(Exception e){

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

@@ -1,11 +1,27 @@
 package cn.estsh.i3plus.core.apiservice.controller.base;
 
+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.ImppEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.impp.framework.base.controller.BaseCommonController;
+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 cn.estsh.impp.framework.boot.util.ValidatorBean;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
 /**
  * @Description :通用功能服务
  * @Reference :
@@ -17,4 +33,25 @@ import org.springframework.web.bind.annotation.RestController;
 @Api(tags = "通用功能服务")
 @RequestMapping(PlatformConstWords.BASE_URL +"/common")
 public class CoreCommonController extends BaseCommonController {
+
+    @Resource(name = CommonConstWords.IMPP_REDIS_RES)
+    private ImppRedis redisRes;
+
+
+    @GetMapping("/soft-bean/{id}")
+    @ApiOperation(value = "获取系统配置信息", notes = "获取系统配置信息")
+    public ResultBean findSoftBean(@PathVariable("id") Integer id){
+        try {
+            CommonEnumUtil.SOFT_TYPE softType = CommonEnumUtil.SOFT_TYPE.valueOf(id);
+            ValidatorBean.checkNotNull(softType,"不存在的产品信息");
+            String redisKey = CommonConstWords.REDIS_PREFIX_BEAN_INFO + ":" + softType.getCode();
+            return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode())
+                    .setResultList(redisRes.scan(redisKey + "*",Integer.MAX_VALUE));
+        } catch (ImppBusiException busExcep) {
+            return ResultBean.fail(busExcep);
+        } catch (Exception e) {
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
 }

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

@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @Modify:
  **/
 @RestController
-@Api(tags = "报表服务")
+@Api(tags = "对象历史记录")
 @RequestMapping(CommonConstWords.BASE_URL_CORE+"/pojo-version")
 public class SysPojoVersionController extends CrudBaseController<SysPojoVersion> {
     @Autowired

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

@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @Modify:
  **/
 @RestController
-@Api(tags = "报表服务")
+@Api(tags = "对象历史详情")
 @RequestMapping(CommonConstWords.BASE_URL_CORE+"/pojo-version-detail")
 public class SysPojoVersionDetailController extends CrudBaseController<SysPojoVersionDetail> {
     @Autowired

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

@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @Modify:
  **/
 @RestController
-@Api(tags = "报表服务")
+@Api(tags = "对象历史计划")
 @RequestMapping(CommonConstWords.BASE_URL_CORE+"/pojo-version-plan")
 public class SysPojoVersionPlanDetailController extends CrudBaseController<SysPojoVersionPlan> {
     @Autowired

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

@@ -53,8 +53,8 @@ public class LicenseClickService implements ILicenseClickService {
 
     @Override
     public void checkLicenseNumberLogin() {
-        int count = webSessionManager.getSessionDAO().getActiveSessions().size();
+//        int count = webSessionManager.getSessionDAO().getActiveSessions().size();
-        ImppLicenseTool.checkUserSession(count);
+//        ImppLicenseTool.checkUserSession(count);
     }
 
 }