用户权限调整

modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/AppStartSystemInit.java

@@ -6,10 +6,7 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysUserInfoService;
 import cn.estsh.i3plus.core.api.iservice.busi.ISystemResourceService;
 import cn.estsh.i3plus.platform.common.util.CommonConstWords;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
-import cn.estsh.i3plus.pojo.platform.bean.SysLocaleLanguage;
-import cn.estsh.i3plus.pojo.platform.bean.SysLocaleResource;
-import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
-import cn.estsh.impp.framework.boot.exception.ImppExceptionEnum;
+import cn.estsh.impp.framework.boot.configuration.SystemConfig;
 import cn.estsh.impp.framework.boot.util.ImppRedis;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -17,9 +14,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
+
 import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
 
 /**
  * @Description :
@@ -47,6 +43,9 @@ public class AppStartSystemInit implements CommandLineRunner {
     private ImppRedis redisRes;
 
     @Autowired
+    private SystemConfig systemConfig;
+
+    @Autowired
     private ISystemResourceService systemResourceService;
 
     @Autowired
@@ -64,6 +63,11 @@ public class AppStartSystemInit implements CommandLineRunner {
 
         LOGGER.info("【IMPP-Core开始加载基础信息...】");
         systemInitService.putAndLoadAll();
+
+        // 加载系统配置文件
+        LOGGER.info("【IMPP-Core 加载系统配置文件到缓存中 ...】");
+        systemConfig.loadSystemConfig(CommonEnumUtil.SOFT_TYPE.CORE.getCode());
+        LOGGER.info("【IMPP-Core 加载系统配置文件到缓存完成】");
     }
 
     /**

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

@@ -3,6 +3,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.pojo.base.bean.BaseConstWords;
+import cn.estsh.i3plus.pojo.base.bean.BaseResultBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
 import cn.estsh.i3plus.pojo.platform.bean.SysDictionary;
@@ -89,13 +90,24 @@ public class SystemController {
             ValidatorBean.checkIsNumber(id, "参数错误");
             CommonEnumUtil.SOFT_TYPE softType = CommonEnumUtil.SOFT_TYPE.valueOf(id);
             Map<String, Object> resultMap = null;
+            BaseResultBean resultBean;
             switch (softType) {
-                case WMS:
-                    resultMap = wmsCommonCloud.getSystemProperties().getResultMap();
-                    break;
                 case CORE:
                     resultMap = getStringObjectMap();
                     break;
+                case FORM:
+                    break;
+                case REPORT:
+                    resultMap = getStringObjectMap();
+                    break;
+                case GATEWAY:
+                    resultMap = getStringObjectMap();
+                    break;
+                case CENTER:
+                    resultMap = getStringObjectMap();
+                    break;
+                case WMS:
+                    break;
             }
 
             // 根据字典查询 不查看的配置信息