From 695cb6d76b838b1e4cb161bae335faa948dca12a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 27 十月 2021 13:16:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java | 205 ++++++++++++++++++++++++++++++--------------------
1 files changed, 123 insertions(+), 82 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
index e7f1422..a01bcd1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
@@ -1,175 +1,217 @@
package com.ruoyi.system.service.impl;
-import java.util.Collection;
-import java.util.List;
-import javax.annotation.PostConstruct;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
+import cn.hutool.core.convert.Convert;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.annotation.DataSource;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.UserConstants;
-import com.ruoyi.common.core.redis.RedisCache;
-import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
+import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.DataSourceType;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.RedisUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.mapper.SysConfigMapper;
import com.ruoyi.system.service.ISysConfigService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.PostConstruct;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
/**
* 鍙傛暟閰嶇疆 鏈嶅姟灞傚疄鐜�
- *
- * @author ruoyi
+ *
+ * @author Lion Li
*/
@Service
-public class SysConfigServiceImpl implements ISysConfigService
-{
- @Autowired
- private SysConfigMapper configMapper;
-
- @Autowired
- private RedisCache redisCache;
+public class SysConfigServiceImpl extends ServicePlusImpl<SysConfigMapper, SysConfig, SysConfig> implements ISysConfigService {
/**
* 椤圭洰鍚姩鏃讹紝鍒濆鍖栧弬鏁板埌缂撳瓨
*/
@PostConstruct
- public void init()
- {
- List<SysConfig> configsList = configMapper.selectConfigList(new SysConfig());
- for (SysConfig config : configsList)
- {
- redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
- }
+ public void init() {
+ loadingConfigCache();
+ }
+
+ @Override
+ public TableDataInfo<SysConfig> selectPageConfigList(SysConfig config) {
+ Map<String, Object> params = config.getParams();
+ LambdaQueryWrapper<SysConfig> lqw = new LambdaQueryWrapper<SysConfig>()
+ .like(StringUtils.isNotBlank(config.getConfigName()), SysConfig::getConfigName, config.getConfigName())
+ .eq(StringUtils.isNotBlank(config.getConfigType()), SysConfig::getConfigType, config.getConfigType())
+ .like(StringUtils.isNotBlank(config.getConfigKey()), SysConfig::getConfigKey, config.getConfigKey())
+ .apply(StringUtils.isNotEmpty(params.get("beginTime")),
+ "date_format(create_time,'%y%m%d') >= date_format({0},'%y%m%d')",
+ params.get("beginTime"))
+ .apply(StringUtils.isNotEmpty(params.get("endTime")),
+ "date_format(create_time,'%y%m%d') <= date_format({0},'%y%m%d')",
+ params.get("endTime"));
+ return PageUtils.buildDataInfo(page(PageUtils.buildPage(), lqw));
}
/**
* 鏌ヨ鍙傛暟閰嶇疆淇℃伅
- *
+ *
* @param configId 鍙傛暟閰嶇疆ID
* @return 鍙傛暟閰嶇疆淇℃伅
*/
@Override
@DataSource(DataSourceType.MASTER)
- public SysConfig selectConfigById(Long configId)
- {
- SysConfig config = new SysConfig();
- config.setConfigId(configId);
- return configMapper.selectConfig(config);
+ public SysConfig selectConfigById(Long configId) {
+ return baseMapper.selectById(configId);
}
/**
* 鏍规嵁閿悕鏌ヨ鍙傛暟閰嶇疆淇℃伅
- *
+ *
* @param configKey 鍙傛暟key
* @return 鍙傛暟閿��
*/
@Override
- public String selectConfigByKey(String configKey)
- {
- String configValue = Convert.toStr(redisCache.getCacheObject(getCacheKey(configKey)));
- if (StringUtils.isNotEmpty(configValue))
- {
+ public String selectConfigByKey(String configKey) {
+ String configValue = Convert.toStr(RedisUtils.getCacheObject(getCacheKey(configKey)));
+ if (StringUtils.isNotEmpty(configValue)) {
return configValue;
}
- SysConfig config = new SysConfig();
- config.setConfigKey(configKey);
- SysConfig retConfig = configMapper.selectConfig(config);
- if (StringUtils.isNotNull(retConfig))
- {
- redisCache.setCacheObject(getCacheKey(configKey), retConfig.getConfigValue());
+ SysConfig retConfig = baseMapper.selectOne(new LambdaQueryWrapper<SysConfig>()
+ .eq(SysConfig::getConfigKey, configKey));
+ if (StringUtils.isNotNull(retConfig)) {
+ RedisUtils.setCacheObject(getCacheKey(configKey), retConfig.getConfigValue());
return retConfig.getConfigValue();
}
return StringUtils.EMPTY;
}
/**
+ * 鑾峰彇楠岃瘉鐮佸紑鍏�
+ *
+ * @return true寮�鍚紝false鍏抽棴
+ */
+ @Override
+ public boolean selectCaptchaOnOff() {
+ String captchaOnOff = selectConfigByKey("sys.account.captchaOnOff");
+ if (StringUtils.isEmpty(captchaOnOff)) {
+ return true;
+ }
+ return Convert.toBool(captchaOnOff);
+ }
+
+ /**
* 鏌ヨ鍙傛暟閰嶇疆鍒楄〃
- *
+ *
* @param config 鍙傛暟閰嶇疆淇℃伅
* @return 鍙傛暟閰嶇疆闆嗗悎
*/
@Override
- public List<SysConfig> selectConfigList(SysConfig config)
- {
- return configMapper.selectConfigList(config);
+ public List<SysConfig> selectConfigList(SysConfig config) {
+ Map<String, Object> params = config.getParams();
+ LambdaQueryWrapper<SysConfig> lqw = new LambdaQueryWrapper<SysConfig>()
+ .like(StringUtils.isNotBlank(config.getConfigName()), SysConfig::getConfigName, config.getConfigName())
+ .eq(StringUtils.isNotBlank(config.getConfigType()), SysConfig::getConfigType, config.getConfigType())
+ .like(StringUtils.isNotBlank(config.getConfigKey()), SysConfig::getConfigKey, config.getConfigKey())
+ .apply(StringUtils.isNotEmpty(params.get("beginTime")),
+ "date_format(create_time,'%y%m%d') >= date_format({0},'%y%m%d')",
+ params.get("beginTime"))
+ .apply(StringUtils.isNotEmpty(params.get("endTime")),
+ "date_format(create_time,'%y%m%d') <= date_format({0},'%y%m%d')",
+ params.get("endTime"));
+ return baseMapper.selectList(lqw);
}
/**
* 鏂板鍙傛暟閰嶇疆
- *
+ *
* @param config 鍙傛暟閰嶇疆淇℃伅
* @return 缁撴灉
*/
@Override
- public int insertConfig(SysConfig config)
- {
- int row = configMapper.insertConfig(config);
- if (row > 0)
- {
- redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
+ public int insertConfig(SysConfig config) {
+ int row = baseMapper.insert(config);
+ if (row > 0) {
+ RedisUtils.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
}
return row;
}
/**
* 淇敼鍙傛暟閰嶇疆
- *
+ *
* @param config 鍙傛暟閰嶇疆淇℃伅
* @return 缁撴灉
*/
@Override
- public int updateConfig(SysConfig config)
- {
- int row = configMapper.updateConfig(config);
- if (row > 0)
- {
- redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
+ public int updateConfig(SysConfig config) {
+ int row = baseMapper.updateById(config);
+ if (row > 0) {
+ RedisUtils.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
}
return row;
}
/**
* 鎵归噺鍒犻櫎鍙傛暟淇℃伅
- *
+ *
* @param configIds 闇�瑕佸垹闄ょ殑鍙傛暟ID
* @return 缁撴灉
*/
@Override
- public int deleteConfigByIds(Long[] configIds)
- {
- int count = configMapper.deleteConfigByIds(configIds);
- if (count > 0)
- {
- Collection<String> keys = redisCache.keys(Constants.SYS_CONFIG_KEY + "*");
- redisCache.deleteObject(keys);
+ public void deleteConfigByIds(Long[] configIds) {
+ for (Long configId : configIds) {
+ SysConfig config = selectConfigById(configId);
+ if (StringUtils.equals(UserConstants.YES, config.getConfigType())) {
+ throw new ServiceException(String.format("鍐呯疆鍙傛暟銆�%1$s銆戜笉鑳藉垹闄� ", config.getConfigKey()));
+ }
+ RedisUtils.deleteObject(getCacheKey(config.getConfigKey()));
}
- return count;
+ baseMapper.deleteBatchIds(Arrays.asList(configIds));
}
/**
- * 娓呯┖缂撳瓨鏁版嵁
+ * 鍔犺浇鍙傛暟缂撳瓨鏁版嵁
*/
@Override
- public void clearCache()
- {
- Collection<String> keys = redisCache.keys(Constants.SYS_CONFIG_KEY + "*");
- redisCache.deleteObject(keys);
+ public void loadingConfigCache() {
+ List<SysConfig> configsList = selectConfigList(new SysConfig());
+ for (SysConfig config : configsList) {
+ RedisUtils.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
+ }
+ }
+
+ /**
+ * 娓呯┖鍙傛暟缂撳瓨鏁版嵁
+ */
+ @Override
+ public void clearConfigCache() {
+ Collection<String> keys = RedisUtils.keys(Constants.SYS_CONFIG_KEY + "*");
+ RedisUtils.deleteObject(keys);
+ }
+
+ /**
+ * 閲嶇疆鍙傛暟缂撳瓨鏁版嵁
+ */
+ @Override
+ public void resetConfigCache() {
+ clearConfigCache();
+ loadingConfigCache();
}
/**
* 鏍￠獙鍙傛暟閿悕鏄惁鍞竴
- *
+ *
* @param config 鍙傛暟閰嶇疆淇℃伅
* @return 缁撴灉
*/
@Override
- public String checkConfigKeyUnique(SysConfig config)
- {
+ public String checkConfigKeyUnique(SysConfig config) {
Long configId = StringUtils.isNull(config.getConfigId()) ? -1L : config.getConfigId();
- SysConfig info = configMapper.checkConfigKeyUnique(config.getConfigKey());
- if (StringUtils.isNotNull(info) && info.getConfigId().longValue() != configId.longValue())
- {
+ SysConfig info = baseMapper.selectOne(new LambdaQueryWrapper<SysConfig>().eq(SysConfig::getConfigKey, config.getConfigKey()));
+ if (StringUtils.isNotNull(info) && info.getConfigId().longValue() != configId.longValue()) {
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
@@ -177,12 +219,11 @@
/**
* 璁剧疆cache key
- *
+ *
* @param configKey 鍙傛暟閿�
* @return 缂撳瓨閿甼ey
*/
- private String getCacheKey(String configKey)
- {
+ private String getCacheKey(String configKey) {
return Constants.SYS_CONFIG_KEY + configKey;
}
}
--
Gitblit v1.9.3