From c33c3de43afabebbc685f0738843a7ac53ae50c5 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 11 五月 2021 17:14:53 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java | 137 +++++++++++++++++++++++----------------------
1 files changed, 69 insertions(+), 68 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..d5aeec2 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,31 +1,35 @@
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 cn.hutool.core.lang.Validator;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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.enums.DataSourceType;
-import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.exception.CustomException;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.mapper.SysConfigMapper;
import com.ruoyi.system.service.ISysConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+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
*/
@Service
-public class SysConfigServiceImpl implements ISysConfigService
-{
- @Autowired
- private SysConfigMapper configMapper;
+public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig> implements ISysConfigService {
@Autowired
private RedisCache redisCache;
@@ -34,79 +38,78 @@
* 椤圭洰鍚姩鏃讹紝鍒濆鍖栧弬鏁板埌缂撳瓨
*/
@PostConstruct
- public void init()
- {
- List<SysConfig> configsList = configMapper.selectConfigList(new SysConfig());
- for (SysConfig config : configsList)
- {
+ public void init() {
+ List<SysConfig> configsList = baseMapper.selectList(new LambdaQueryWrapper<>());
+ for (SysConfig config : configsList) {
redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
}
}
/**
* 鏌ヨ鍙傛暟閰嶇疆淇℃伅
- *
+ *
* @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)
- {
+ public String selectConfigByKey(String configKey) {
String configValue = Convert.toStr(redisCache.getCacheObject(getCacheKey(configKey)));
- if (StringUtils.isNotEmpty(configValue))
- {
+ if (Validator.isNotEmpty(configValue)) {
return configValue;
}
- SysConfig config = new SysConfig();
- config.setConfigKey(configKey);
- SysConfig retConfig = configMapper.selectConfig(config);
- if (StringUtils.isNotNull(retConfig))
- {
+ SysConfig retConfig = baseMapper.selectOne(new LambdaQueryWrapper<SysConfig>()
+ .eq(SysConfig::getConfigKey, configKey));
+ if (Validator.isNotNull(retConfig)) {
redisCache.setCacheObject(getCacheKey(configKey), retConfig.getConfigValue());
return retConfig.getConfigValue();
}
- return StringUtils.EMPTY;
+ return StrUtil.EMPTY;
}
/**
* 鏌ヨ鍙傛暟閰嶇疆鍒楄〃
- *
+ *
* @param config 鍙傛暟閰嶇疆淇℃伅
* @return 鍙傛暟閰嶇疆闆嗗悎
*/
@Override
- public List<SysConfig> selectConfigList(SysConfig config)
- {
- return configMapper.selectConfigList(config);
+ public List<SysConfig> selectConfigList(SysConfig config) {
+ LambdaQueryWrapper<SysConfig> lqw = new LambdaQueryWrapper<>();
+ lqw.like(StrUtil.isNotBlank(config.getConfigName()), SysConfig::getConfigName, config.getConfigName());
+ lqw.eq(StrUtil.isNotBlank(config.getConfigType()), SysConfig::getConfigType, config.getConfigType());
+ lqw.like(StrUtil.isNotBlank(config.getConfigKey()), SysConfig::getConfigKey, config.getConfigKey());
+ Map<String, Object> params = config.getParams();
+ lqw.apply(Validator.isNotEmpty(params.get("beginTime")),
+ "date_format(create_time,'%y%m%d') >= date_format(#{0},'%y%m%d')",
+ params.get("beginTime"));
+ lqw.apply(Validator.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)
- {
+ public int insertConfig(SysConfig config) {
+ int row = baseMapper.insert(config);
+ if (row > 0) {
redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
}
return row;
@@ -114,16 +117,14 @@
/**
* 淇敼鍙傛暟閰嶇疆
- *
+ *
* @param config 鍙傛暟閰嶇疆淇℃伅
* @return 缁撴灉
*/
@Override
- public int updateConfig(SysConfig config)
- {
- int row = configMapper.updateConfig(config);
- if (row > 0)
- {
+ public int updateConfig(SysConfig config) {
+ int row = baseMapper.updateById(config);
+ if (row > 0) {
redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
}
return row;
@@ -131,16 +132,20 @@
/**
* 鎵归噺鍒犻櫎鍙傛暟淇℃伅
- *
+ *
* @param configIds 闇�瑕佸垹闄ょ殑鍙傛暟ID
* @return 缁撴灉
*/
@Override
- public int deleteConfigByIds(Long[] configIds)
- {
- int count = configMapper.deleteConfigByIds(configIds);
- if (count > 0)
- {
+ public int deleteConfigByIds(Long[] configIds) {
+ for (Long configId : configIds) {
+ SysConfig config = selectConfigById(configId);
+ if (StrUtil.equals(UserConstants.YES, config.getConfigType())) {
+ throw new CustomException(String.format("鍐呯疆鍙傛暟銆�%1$s銆戜笉鑳藉垹闄� ", config.getConfigKey()));
+ }
+ }
+ int count = baseMapper.deleteBatchIds(Arrays.asList(configIds));
+ if (count > 0) {
Collection<String> keys = redisCache.keys(Constants.SYS_CONFIG_KEY + "*");
redisCache.deleteObject(keys);
}
@@ -151,25 +156,22 @@
* 娓呯┖缂撳瓨鏁版嵁
*/
@Override
- public void clearCache()
- {
+ public void clearCache() {
Collection<String> keys = redisCache.keys(Constants.SYS_CONFIG_KEY + "*");
redisCache.deleteObject(keys);
}
/**
* 鏍￠獙鍙傛暟閿悕鏄惁鍞竴
- *
+ *
* @param config 鍙傛暟閰嶇疆淇℃伅
* @return 缁撴灉
*/
@Override
- 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())
- {
+ public String checkConfigKeyUnique(SysConfig config) {
+ Long configId = Validator.isNull(config.getConfigId()) ? -1L : config.getConfigId();
+ SysConfig info = baseMapper.selectOne(new LambdaQueryWrapper<SysConfig>().eq(SysConfig::getConfigKey, config.getConfigKey()));
+ if (Validator.isNotNull(info) && info.getConfigId().longValue() != configId.longValue()) {
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
@@ -177,12 +179,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