From be2b83596b0589cf4f5dcc47bbb3ef40a4876ea9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 29 六月 2020 16:41:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/config/ConfigServiceImpl.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 53 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/config/ConfigServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/config/ConfigServiceImpl.java
index b9d37cc..ed14aee 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/config/ConfigServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/config/ConfigServiceImpl.java
@@ -1,6 +1,7 @@
package com.yeshi.fanli.service.impl.config;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -19,6 +20,7 @@
import com.yeshi.fanli.entity.config.AppHomeFloatImg;
import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.entity.xcx.XCXSettingConfig;
+import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
@@ -31,6 +33,7 @@
@Resource
private ConfigMapper configMapper;
+
@Cacheable(value = "config")
public List<Config> getAllList() {
@@ -52,6 +55,9 @@
@Transactional
public void update(List<Config> list) {
for (Config config : list) {
+ if (config.getValue() == null) {
+ config.setValue("");
+ }
config.setCreatetime(new Date().getTime() + "");
configMapper.updateByPrimaryKeySelective(config);
}
@@ -59,6 +65,9 @@
@CacheEvict(value = "config", allEntries = true)
public void update(Config config) {
+ if (config.getValue() == null)
+ config.setValue("");
+
config.setCreatetime(new Date().getTime() + "");
configMapper.updateByPrimaryKeySelective(config);
}
@@ -183,6 +192,40 @@
return value;
}
+
+ @Cacheable(value = "config", key = "'isRobotCloudOpen'+'-'+#key")
+ @Override
+ public boolean isRobotCloudOpen(String key) {
+ String value = get(key);
+ if (StringUtil.isNullOrEmpty(value))
+ return false;
+ if ("1".equalsIgnoreCase(value.trim())) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+
+
+ @Cacheable(value = "config", key = "'getTestUsers'")
+ @Override
+ public List<String> getTestUsers() {
+ String value = get(ConfigKeyEnum.testUserArray.getKey());
+ if (StringUtil.isNullOrEmpty(value))
+ return null;
+ try {
+ return Arrays.asList(value.split(","));
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ }
+ return null;
+ }
+
+
+
+
+
@Override
public Config getConfig(long id) {
return configMapper.selectByPrimaryKey(id);
@@ -262,4 +305,14 @@
config.setCreatetime(currentTime + "");
configMapper.updateByPrimaryKeySelective(config);
}
+
+
+ @Override
+ public Config getConfigBykeyNoCache(String key) {
+ List<Config> list = configMapper.listByKey(key, null, null);
+ if (list.size() == 0) {
+ return null;
+ }
+ return list.get(0);
+ }
}
--
Gitblit v1.8.0