From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/service/impl/msg/MsgConfigServiceImpl.java | 46 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 44 insertions(+), 2 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..7669f5c 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
@@ -9,7 +9,7 @@
import com.google.gson.Gson;
import com.yeshi.fanli.dto.msg.MsgCommonDTO;
import com.yeshi.fanli.entity.common.Config;
-import com.yeshi.fanli.exception.ConfigException;
+import com.yeshi.fanli.exception.config.ConfigException;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.msg.MsgConfigService;
@@ -54,7 +54,7 @@
Config config = new Config();
config.setCreatetime(System.currentTimeMillis() + "");
config.setKey(KEY_ZHUSHOU);
- config.setName("娑堟伅-杩斿埄鍒稿皬鍔╂墜");
+ config.setName("娑堟伅-鏉挎牀蹇渷灏忓姪鎵�");
config.setValue(new Gson().toJson(dto));
configService.save(config);
}
@@ -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