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); + } } }