From 7ca830ae71df7a2fbbeb5e6f9fe52693e829169f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 26 Aug 2019 16:25:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=89=93=E5=8D=B0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=EF=BC=8C=E5=8A=A0=E5=85=A5=E7=99=BD=E5=90=8D=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/base/WhiteController.java | 22 ++++++++++++++++++++++ .../core/apiservice/mq/ScheduleQueueReceiver.java | 2 +- .../serviceimpl/base/SystemInitService.java | 8 ++++++-- 3 files changed, 29 insertions(+), 3 deletions(-) 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 03d3ba8..ccee317 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 @@ -79,6 +79,9 @@ public class WhiteController extends CoreBaseController { @Autowired private ISysOrganizeService sysOrganizeService; + @Autowired + private ISysLabelTemplateService sysLabelTemplateService; + @Resource(name="redisRes") private ImppRedis redisRes; @@ -371,4 +374,23 @@ public class WhiteController extends CoreBaseController { return ImppExceptionBuilder.newInstance().buildExceptionResult(e); } } + + /** + * 查询全部打印模板 + * @return 处理结果 + */ + @GetMapping(value = "/sys-label-template/list") + @ApiOperation(value = "查询全部打印模板",notes = "查询全部打印模板") + public ResultBean findSysConfigAll(){ + try { + List sysLabelTemplateList = sysLabelTemplateService.ListSysLabelTemplate(); + return ResultBean.success("操作成功") + .setResultList(sysLabelTemplateList) + .setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + }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/mq/ScheduleQueueReceiver.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/ScheduleQueueReceiver.java index cd8ec35..4ce777e 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/ScheduleQueueReceiver.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/mq/ScheduleQueueReceiver.java @@ -122,7 +122,7 @@ public class ScheduleQueueReceiver { //信息已处理 channel.basicAck(message.getMessageProperties().getDeliveryTag(), false); } catch (IOException e) { - LOGGER.error("【MQ-IMPP_MESSAGE_MAIL_QUEUE】处理出错：{}", e.getMessage(), e); + LOGGER.error("【MQ-IMPP_SCHEDULE_QUEUE】处理出错：{}", e.getMessage(), e); //丢弃这条消息 try { // 未成功处理，重新发送 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 8f822ee..da20711 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 @@ -140,12 +140,16 @@ public class SystemInitService implements ISystemInitService { for (String key : resMap.keySet()) { //放入缓存 - redisRes.putHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + ":"+ key,resMap.get(key),0); + if(webLangMap.get(key) != null) { + 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); + if(webLangMap.get(key) != null){ + redisRes.putHashMap(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + ":" + key,webLangMap.get(key),0); + } } }