From a6f01cf9667958ca3d5c2f2ef28637baa8bf5e6d Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期四, 25 七月 2019 12:20:01 +0800 Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div --- fanli/src/main/java/com/yeshi/fanli/service/impl/msg/MsgConfigServiceImpl.java | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/MsgConfigServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/MsgConfigServiceImpl.java index 7e83bf1..1df7599 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/MsgConfigServiceImpl.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/msg/MsgConfigServiceImpl.java @@ -111,4 +111,46 @@ return new Gson().fromJson(value.getValue(), MsgCommonDTO.class); } + @Override + public void addNotifyMsg(MsgCommonDTO dto) throws ConfigException { + Config value = configService.getConfig(KEY_NOTIFY); + if (StringUtil.isNullOrEmpty(dto.getContent()) || StringUtil.isNullOrEmpty(dto.getParams()) + || dto.getShow() == null) + throw new ConfigException(1, "鍙傛暟涓嶅畬鏁�"); + if (value != null) { + MsgCommonDTO old = new Gson().fromJson(value.getValue(), MsgCommonDTO.class); + old.setStartTime(dto.getStartTime()); + old.setShow(dto.getShow()); + old.setParams(dto.getParams()); + old.setEndTime(dto.getEndTime()); + old.setContent(dto.getContent()); + if (!StringUtil.Md5(dto.getContent() + "#" + dto.getPicture() + "#" + dto.getParams()) + .equalsIgnoreCase(old.getContentMd5())) { + old.setUpdateTime(new Date()); + } + old.setPicture(dto.getPicture()); + Config cf = new Config(); + cf.setId(value.getId()); + cf.setValue(new Gson().toJson(old)); + configService.update(cf); + } else { + dto.setContentMd5(StringUtil.Md5(dto.getContent() + "#" + dto.getPicture() + "#" + dto.getParams())); + dto.setUpdateTime(new Date()); + Config config = new Config(); + config.setCreatetime(System.currentTimeMillis() + ""); + config.setKey(KEY_NOTIFY); + config.setName("娑堟伅-澶у浘閫氱煡"); + config.setValue(new Gson().toJson(dto)); + configService.save(config); + } + } + + @Override + public MsgCommonDTO getNotifyMsg() { + Config value = configService.getConfig(KEY_NOTIFY); + if (value == null) + return null; + return new Gson().fromJson(value.getValue(), MsgCommonDTO.class); + } + } -- Gitblit v1.8.0