From 014397a8cf7d7c3159295cec8da4e151e8955851 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 11 Jul 2019 20:37:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../configuration/AppStartSystemInit.java | 16 +++++++----- .../controller/base/SystemController.java | 30 +++++++++++++++++++--- 2 files changed, 37 insertions(+), 9 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/AppStartSystemInit.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/AppStartSystemInit.java index 7df9225..544c9d5 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/configuration/AppStartSystemInit.java +++ b/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 加载系统配置文件到缓存完成】"); } /** 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 07717ff..5d1b078 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 @@ -1,8 +1,10 @@ package cn.estsh.i3plus.core.apiservice.controller.base; import cn.estsh.i3plus.core.api.iservice.busi.ISysDictionaryService; +import cn.estsh.i3plus.icloud.form.sdk.IFormSystemCloud; 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; @@ -48,6 +50,9 @@ public class SystemController { private IWmsCommonCloud wmsCommonCloud; @Autowired + private IFormSystemCloud iFormSystemCloud; + + @Autowired private ISysDictionaryService sysDictionaryService; @GetMapping("/get-properties") @@ -89,13 +94,32 @@ public class SystemController { ValidatorBean.checkIsNumber(id, "参数错误"); CommonEnumUtil.SOFT_TYPE softType = CommonEnumUtil.SOFT_TYPE.valueOf(id); Map resultMap = null; + BaseResultBean resultBean; switch (softType) { - case WMS: - resultMap = wmsCommonCloud.getSystemProperties().getResultMap(); - break; case CORE: resultMap = getStringObjectMap(); break; + case FORM: + resultBean = iFormSystemCloud.getSystemProperties(); + if (resultBean != null && resultBean.isSuccess()) { + resultMap = iFormSystemCloud.getSystemProperties().getResultMap(); + } + break; + case REPORT: + resultMap = getStringObjectMap(); + break; + case GATEWAY: + resultMap = getStringObjectMap(); + break; + case CENTER: + resultMap = getStringObjectMap(); + break; + case WMS: + resultBean = iFormSystemCloud.getSystemProperties(); + if (resultBean != null && resultBean.isSuccess()) { + resultMap = wmsCommonCloud.getSystemProperties().getResultMap(); + } + break; } // 根据字典查询 不查看的配置信息 From 436172c607e228dc134dea426d4ab02dc4b0213c Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 11 Jul 2019 20:45:44 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/apiservice/controller/base/SystemController.java | 12 ------------ 1 file changed, 12 deletions(-) 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 5d1b078..c28a99d 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 @@ -1,7 +1,6 @@ package cn.estsh.i3plus.core.apiservice.controller.base; import cn.estsh.i3plus.core.api.iservice.busi.ISysDictionaryService; -import cn.estsh.i3plus.icloud.form.sdk.IFormSystemCloud; import cn.estsh.i3plus.icloud.wms.sdk.IWmsCommonCloud; import cn.estsh.i3plus.pojo.base.bean.BaseConstWords; import cn.estsh.i3plus.pojo.base.bean.BaseResultBean; @@ -50,9 +49,6 @@ public class SystemController { private IWmsCommonCloud wmsCommonCloud; @Autowired - private IFormSystemCloud iFormSystemCloud; - - @Autowired private ISysDictionaryService sysDictionaryService; @GetMapping("/get-properties") @@ -100,10 +96,6 @@ public class SystemController { resultMap = getStringObjectMap(); break; case FORM: - resultBean = iFormSystemCloud.getSystemProperties(); - if (resultBean != null && resultBean.isSuccess()) { - resultMap = iFormSystemCloud.getSystemProperties().getResultMap(); - } break; case REPORT: resultMap = getStringObjectMap(); @@ -115,10 +107,6 @@ public class SystemController { resultMap = getStringObjectMap(); break; case WMS: - resultBean = iFormSystemCloud.getSystemProperties(); - if (resultBean != null && resultBean.isSuccess()) { - resultMap = wmsCommonCloud.getSystemProperties().getResultMap(); - } break; }