From e2a2dd18d8ce033cd9cf5bd81dbe1af00c63c702 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 12 Aug 2019 17:37:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E5=85=B8=E5=88=86?= =?UTF-8?q?=E7=BB=84=20=E4=BC=98=E5=8C=96redis=E8=B5=84=E6=BA=90=E9=94=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/api/iservice/busi/ISysDictionaryService.java | 8 ++++++++ .../controller/busi/SysDictionaryController.java | 18 ++++++++++++++++++ .../apiservice/controller/busi/SysEnumController.java | 12 ++++++++++++ .../controller/busi/SysLocaleLanguageController.java | 2 +- .../controller/busi/SysLocaleResourceController.java | 12 ++++++------ .../core/apiservice/mq/MessageMailQueueReceiver.java | 3 +++ .../serviceimpl/busi/SysDictionaryService.java | 13 +++++++++++-- 7 files changed, 59 insertions(+), 9 deletions(-) diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDictionaryService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDictionaryService.java index becf970..9180ffa 100644 --- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDictionaryService.java +++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysDictionaryService.java @@ -135,4 +135,12 @@ public interface ISysDictionaryService { */ @ApiOperation(value = "根据parenId查询字典") List findSysDictionaryByParentId(Long parentId); + + /** + * 按条件查询字典 + * @param sysDictionary 查询条件 + * @return 查询结果 + */ + @ApiOperation(value = "按条件查询字典") + List findSysDictionary(SysDictionary sysDictionary); } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java index 679bc5a..4aa5307 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysDictionaryController.java @@ -457,4 +457,22 @@ public class SysDictionaryController extends CoreBaseController{ return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } + + /** + * 按条件查询字典 + * @param sysDictionary 查询条件 + * @return 查询数据 + */ + @GetMapping("/find") + @ApiOperation(value = "按条件查询字典",notes = "按条件查询字典") + public ResultBean findSysDictionary(@RequestBody SysDictionary sysDictionary){ + try { + List dictionaryList = sysDictionaryService.findSysDictionary(sysDictionary); + return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(dictionaryList); + }catch(ImppBusiException busExcep){ + return ResultBean.fail(busExcep); + }catch(Exception e){ + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } + } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysEnumController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysEnumController.java index 1ecaf17..4516827 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysEnumController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysEnumController.java @@ -286,6 +286,7 @@ public class SysEnumController extends CoreBaseController { } /** + * 外部通知方式 * @return 处理结果 */ @GetMapping("/external-notice-method") @@ -296,5 +297,16 @@ public class SysEnumController extends CoreBaseController { return new ResultBean(true, "操作成功", list); } + /** + * 字典分组 + * @return 处理结果 + */ + @GetMapping("/dictionary-group") + @ApiOperation(value = "字典分组", notes = "字典分组") + public ResultBean getDictionaryGroup() { + return new ResultBean(true, "操作成功", + Arrays.asList(ImppEnumUtil.DICTIONARY_GROUP.values())); + } + } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleLanguageController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleLanguageController.java index f7c7ff3..68cbf3b 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleLanguageController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleLanguageController.java @@ -126,7 +126,7 @@ public class SysLocaleLanguageController extends CoreBaseController { sysLocaleLanguageService.deleteSysLocaleLanguageById(Long.parseLong(idStr)); // 移出缓存 - redisCore.deleteKey(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + sysLocaleLanguage.getLanguageCode()); + redisCore.deleteKey(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + ":" + sysLocaleLanguage.getLanguageCode()); return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep); diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java index 78b3b74..99f157a 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysLocaleResourceController.java @@ -246,23 +246,23 @@ public class SysLocaleResourceController extends CoreBaseController { private void updateResourceCache(SysLocaleResource sysLocaleResource,boolean isDelete){ // 判断是否为删除资源 if(isDelete){ - Map langMap = redisRes.getHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + sysLocaleResource.getLanguageCode()); + Map langMap = redisRes.getHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + ":" + sysLocaleResource.getLanguageCode()); if (langMap != null && langMap.size() != 0) { langMap.remove(sysLocaleResource.getResourceKey()); - redisRes.putHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + sysLocaleResource.getLanguageCode(), langMap); + redisRes.putHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + ":" + sysLocaleResource.getLanguageCode(), langMap); } - redisRes.deleteKey(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + sysLocaleResource.getResourceKey()); + redisRes.deleteKey(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + ":" + sysLocaleResource.getResourceKey()); }else { - Map langMap = redisRes.getHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + sysLocaleResource.getLanguageCode()); + Map langMap = redisRes.getHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + ":" + sysLocaleResource.getLanguageCode()); if (langMap != null && langMap.size() != 0) { langMap.put(sysLocaleResource.getResourceKey(), sysLocaleResource.getResourceValue()); - redisRes.putHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + sysLocaleResource.getLanguageCode(), langMap); + redisRes.putHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + ":" + sysLocaleResource.getLanguageCode(), langMap); } HashMap resource = new HashMap(); resource.put(sysLocaleResource.getLanguageCode(), sysLocaleResource.getResourceValue()); - redisRes.putHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + sysLocaleResource.getResourceKey(), resource, 0); + redisRes.putHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + ":" + sysLocaleResource.getResourceKey(), resource, 0); } } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java index 0dc4627..bc3812a 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/MessageMailQueueReceiver.java @@ -57,6 +57,7 @@ public class MessageMailQueueReceiver { @RabbitListener(queues = PlatformConstWords.IMPP_MESSAGE_MAIL_QUEUE) public void processImppMail(String data, Channel channel, Message message) { SysMessage msg = JsonUtilTool.decode(data, SysMessage.class); + Long startTime = System.currentTimeMillis(); try { LOGGER.info("【MQ-IMPP_MESSAGE_MAIL_QUEUE】数据接收成功：{}", msg); if (msg.getMessageSendTime() == null) { @@ -130,6 +131,8 @@ public class MessageMailQueueReceiver { } catch (IOException e1) { e1.printStackTrace(); } + } finally { + LOGGER.info("[Core Email] Email Id:{} , 耗时{}, Message Info :{}", msg.getId(), System.currentTimeMillis() - startTime, JSON.toJSONString(msg)); } } } diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java index 910d9e3..2377a2a 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysDictionaryService.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.core.api.iservice.busi.ISysDictionaryService; import cn.estsh.i3plus.platform.common.exception.ImppExceptionEnum; import cn.estsh.i3plus.platform.common.tool.StringTool; import cn.estsh.i3plus.pojo.base.bean.BaseConstWords; +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; @@ -66,6 +67,7 @@ public class SysDictionaryService implements ISysDictionaryService { sysDictionary.setParentNameRdd(parentSysDictionary.getName()); sysDictionary.setParentCodeRdd(parentSysDictionary.getDictionaryCode()); + sysDictionary.setDictionaryGroup(parentSysDictionary.getDictionaryGroup()); } else { sysDictionary.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue()); } @@ -85,7 +87,7 @@ public class SysDictionaryService implements ISysDictionaryService { @ApiOperation(value = "修改字典") public void updateSysDictionary(SysDictionary sysDictionary) { // 校验唯一 - String hqlPack = CoreHqlPack.packHqlSysDictionaryCode(sysDictionary); + DdlPackBean hqlPack = CoreHqlPack.packHqlSysDictionaryCode(sysDictionary); long repeatCodeCount = sysDictionaryRDao.findByHqlWhereCount(hqlPack); if (sysDictionary.getParentIdVal() == CommonEnumUtil.PARENT.DEFAULT.getValue() &&repeatCodeCount > 0) { throw ImppExceptionBuilder.newInstance() @@ -127,6 +129,7 @@ public class SysDictionaryService implements ISysDictionaryService { newSysDict.setParentNameRdd(parentSysDictionary.getName()); newSysDict.setParentCodeRdd(parentSysDictionary.getDictionaryCode()); + newSysDict.setDictionaryGroup(parentSysDictionary.getDictionaryGroup()); } LOGGER.info("字典 SYS_DICTIONARY sysDictionary:{}", newSysDict); @@ -159,7 +162,7 @@ public class SysDictionaryService implements ISysDictionaryService { public ListPager querySysDictionaryByPager(SysDictionary sysDictionary, Pager pager) { sysDictionary = sysDictionary == null ? new SysDictionary() : sysDictionary; - String hqlPack = CoreHqlPack.packHqlSysDictionary(sysDictionary); + DdlPackBean hqlPack = CoreHqlPack.packHqlSysDictionaryPage(sysDictionary); pager = PagerHelper.getPager(pager, sysDictionaryRDao.findByHqlWhereCount(hqlPack)); return new ListPager(sysDictionaryRDao.findByHqlWherePage(hqlPack + sysDictionary.orderBy(), pager), pager); } @@ -248,4 +251,10 @@ public class SysDictionaryService implements ISysDictionaryService { public List findSysDictionaryByParentId(Long parentId) { return sysDictionaryRDao.findByProperty("parentId", parentId); } + + @Override + @ApiOperation(value = "按条件查询字典") + public List findSysDictionary(SysDictionary sysDictionary) { + return sysDictionaryRDao.findByHqlWhere(CoreHqlPack.packHqlSysDictionary(sysDictionary)); + } }