From f4e0d6da4ded45a9de706e3477bd50ec019916f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Wed, 5 Jun 2019 19:45:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96=20?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1-=E5=85=AC=E7=94=A8?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81=20=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../configuration/AppStartSystemInit.java | 97 +++++++++++----------- .../controller/base/WhiteController.java | 2 +- .../apiservice/schedulejob/CoreMessagePushJob.java | 38 +++++++++ .../serviceimpl/base/SystemInitService.java | 10 +-- 4 files changed, 93 insertions(+), 54 deletions(-) create mode 100644 modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/CoreMessagePushJob.java 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 6e0f541..7df9225 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 @@ -88,56 +88,57 @@ public class AppStartSystemInit implements CommandLineRunner { /** * 初始化资源信息，并缓存 + * 调整至cn.estsh.i3plus.core.apiservice.serviceimpl.base.SystemInitService */ public void packIMPPResources() { - /** - * 整体数据结构： - * code - * 先根据code查询，判断是否存在，然后通过语言获取对应的值 - */ - HashMap> resMap = new HashMap(); - HashMap lanMap = null; - HashMap> webLangMap = new HashMap<>(); - HashMap webResMap; - - //语言数量 - List langList = systemResourceService.listSysLocaleLanguage(null); - - //查询所有资源 - List resourceList = systemResourceService.listSysLocaleResource(null); - LOGGER.info("【加载平台资源】共有{}个资源，{}种语言。", resourceList.size(), langList.size()); - for (SysLocaleResource res : resourceList) { - //遍历资源，放入map中 - lanMap = resMap.get(res.getResourceKey()); - //判断是否已存在资源信息 - if (lanMap == null) { - lanMap = new HashMap(); - //将key/代码放入 - resMap.put(res.getResourceKey(), lanMap); - } - //根据语言放入 - lanMap.put(res.getLanguageCode(), res.getResourceValue()); - - // web 资源 - if (!webLangMap.containsKey(res.getLanguageCode())) { - webLangMap.put(res.getLanguageCode(), new HashMap<>()); - } - // 放入资源信息 - webResMap = webLangMap.get(res.getLanguageCode()); - webResMap.put(res.getResourceKey(), res.getResourceValue()); - } - - for (String key : resMap.keySet()) { - //放入缓存 - redisRes.putHashMap(key, resMap.get(key), 0); - } - - for (String key : webLangMap.keySet()) { - //放入缓存 - redisRes.putHashMap(key, webLangMap.get(key), 0); - } - - LOGGER.info("【资源配置文件已全部加载：{}个】", resMap.size()); +// /** +// * 整体数据结构： +// * code +// * 先根据code查询，判断是否存在，然后通过语言获取对应的值 +// */ +// HashMap> resMap = new HashMap(); +// HashMap lanMap = null; +// HashMap> webLangMap = new HashMap<>(); +// HashMap webResMap; +// +// //语言数量 +// List langList = systemResourceService.listSysLocaleLanguage(null); +// +// //查询所有资源 +// List resourceList = systemResourceService.listSysLocaleResource(null); +// LOGGER.info("【加载平台资源】共有{}个资源，{}种语言。", resourceList.size(), langList.size()); +// for (SysLocaleResource res : resourceList) { +// //遍历资源，放入map中 +// lanMap = resMap.get(res.getResourceKey()); +// //判断是否已存在资源信息 +// if (lanMap == null) { +// lanMap = new HashMap(); +// //将key/代码放入 +// resMap.put(res.getResourceKey(), lanMap); +// } +// //根据语言放入 +// lanMap.put(res.getLanguageCode(), res.getResourceValue()); +// +// // web 资源 +// if (!webLangMap.containsKey(res.getLanguageCode())) { +// webLangMap.put(res.getLanguageCode(), new HashMap<>()); +// } +// // 放入资源信息 +// webResMap = webLangMap.get(res.getLanguageCode()); +// webResMap.put(res.getResourceKey(), res.getResourceValue()); +// } +// +// for (String key : resMap.keySet()) { +// //放入缓存 +// redisRes.putHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + ":" + key, resMap.get(key), 0); +// } +// +// for (String key : webLangMap.keySet()) { +// //放入缓存 +// redisRes.putHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + ":" + key, webLangMap.get(key), 0); +// } +// +// LOGGER.info("【资源配置文件已全部加载：{}个】", resMap.size()); /* //资源集合 diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java index 90ecf76..9bfd0b2 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.core.apiservice.controller.base; import cn.estsh.i3plus.core.api.iservice.base.ISystemInitService; import cn.estsh.i3plus.core.api.iservice.base.ISystemLoginService; import cn.estsh.i3plus.core.api.iservice.busi.*; +import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.platform.common.tool.ServletRequestTool; import cn.estsh.i3plus.platform.common.tool.StringTool; import cn.estsh.i3plus.platform.common.tool.TimeTool; @@ -16,7 +17,6 @@ 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.exception.ImppExceptionEnum; import cn.estsh.impp.framework.boot.fastdfs.FastDFSClient; import cn.estsh.impp.framework.boot.util.ImppRedis; import cn.estsh.impp.framework.boot.util.ResultBean; diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/CoreMessagePushJob.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/CoreMessagePushJob.java new file mode 100644 index 0000000..93815e0 --- /dev/null +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/schedulejob/CoreMessagePushJob.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.core.apiservice.schedulejob; + +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.impp.framework.base.schedule.BaseImppScheduleJob; +import cn.estsh.impp.framework.boot.init.ApplicationProperties; +import io.swagger.annotations.ApiOperation; +import org.quartz.JobExecutionContext; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.amqp.rabbit.core.RabbitTemplate; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * @Description : 通用消息推送job + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-05-04 16:02 + * @Modify: + **/ +@ApiOperation("通用消息推送job") +public class CoreMessagePushJob extends BaseImppScheduleJob { + public static final Logger LOGGER = LoggerFactory.getLogger(CoreMessagePushJob.class); + + public CoreMessagePushJob() { + super(CoreMessagePushJob.class,"通用消息推送job"); + } + + /** + * rabbitMQ队列 + */ + @Autowired + private RabbitTemplate rabbitTemplate; + + @Override + public void executeImppJob(JobExecutionContext context, ApplicationProperties applicationProperties) { + rabbitTemplate.convertAndSend(getJobParam(),CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); + } +} diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java index 38923a2..20b5200 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/base/SystemInitService.java @@ -64,7 +64,7 @@ public class SystemInitService implements ISystemInitService { String redisKey = null; List list = configRDao.findAll(); for (SysConfig config : list) { - redisKey = CommonConstWords.REDIS_PREFIX_CACHE_CONFIG + "_" + config.getConfigCode(); + redisKey = CommonConstWords.REDIS_PREFIX_CACHE_CONFIG + ":" + config.getConfigCode(); //存放于缓存 putDataToCache(redisKey, config,SysConfig.class); @@ -84,12 +84,12 @@ public class SystemInitService implements ISystemInitService { for (String key : parentCodeMap.keySet()) { //存放于缓存 - putDataToCache(CommonConstWords.REDIS_PREFIX_CACHE_DICTIONARY + "_" + key, + putDataToCache(CommonConstWords.REDIS_PREFIX_CACHE_DICTIONARY + ":" + key, parentCodeMap.get(key),List.class); } for (long key : parentIdMap.keySet()) { - putDataToCache(CommonConstWords.REDIS_PREFIX_CACHE_DICTIONARY + "_" + key, + putDataToCache(CommonConstWords.REDIS_PREFIX_CACHE_DICTIONARY + ":" + key, parentIdMap.get(key),List.class); } } @@ -142,12 +142,12 @@ public class SystemInitService implements ISystemInitService { for (String key : resMap.keySet()) { //放入缓存 - redisRes.putHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + key,resMap.get(key),0); + redisRes.putHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + ":"+ key,resMap.get(key),0); } for(String key : webLangMap.keySet()){ //放入缓存 - redisRes.putHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + key,webLangMap.get(key),0); + redisRes.putHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + ":" + key,webLangMap.get(key),0); } }