From 209654fdff7206c2638d9fbe26eb0fb17a68adb4 Mon Sep 17 00:00:00 2001
From: zendwang <wangzhenxian@idadt.com>
Date: 星期四, 02 十二月 2021 20:13:47 +0800
Subject: [PATCH] fix selectPostListByUserId方法出参调整为Long
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java | 137 +++++++++++++++++++++++++++++----------------
1 files changed, 88 insertions(+), 49 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 7f694ae..bbd09a1 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,23 +1,23 @@
package com.ruoyi.system.service.impl;
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.mybatisplus.core.ServicePlusImpl;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.service.ConfigService;
import com.ruoyi.common.enums.DataSourceType;
-import com.ruoyi.common.exception.CustomException;
+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.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;
@@ -26,23 +26,21 @@
/**
* 鍙傛暟閰嶇疆 鏈嶅姟灞傚疄鐜�
*
- * @author ruoyi
+ * @author Lion Li
*/
@Service
-public class SysConfigServiceImpl extends ServiceImpl<SysConfigMapper, SysConfig> implements ISysConfigService {
+public class SysConfigServiceImpl extends ServicePlusImpl<SysConfigMapper, SysConfig, SysConfig> implements ISysConfigService, ConfigService {
- @Autowired
- private RedisCache redisCache;
-
- /**
- * 椤圭洰鍚姩鏃讹紝鍒濆鍖栧弬鏁板埌缂撳瓨
- */
- @PostConstruct
- public void init() {
- List<SysConfig> configsList = baseMapper.selectList(new LambdaQueryWrapper<>());
- for (SysConfig config : configsList) {
- redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
- }
+ @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())
+ .between(params.get("beginTime") != null && params.get("endTime") != null,
+ SysConfig::getCreateTime, params.get("beginTime"), params.get("endTime"));
+ return PageUtils.buildDataInfo(page(PageUtils.buildPage(), lqw));
}
/**
@@ -65,17 +63,31 @@
*/
@Override
public String selectConfigByKey(String configKey) {
- String configValue = Convert.toStr(redisCache.getCacheObject(getCacheKey(configKey)));
- if (Validator.isNotEmpty(configValue)) {
+ String configValue = RedisUtils.getCacheObject(getCacheKey(configKey));
+ if (StringUtils.isNotEmpty(configValue)) {
return configValue;
}
SysConfig retConfig = baseMapper.selectOne(new LambdaQueryWrapper<SysConfig>()
- .eq(SysConfig::getConfigKey, configKey));
- if (Validator.isNotNull(retConfig)) {
- redisCache.setCacheObject(getCacheKey(configKey), retConfig.getConfigValue());
+ .eq(SysConfig::getConfigKey, configKey));
+ if (StringUtils.isNotNull(retConfig)) {
+ RedisUtils.setCacheObject(getCacheKey(configKey), retConfig.getConfigValue());
return retConfig.getConfigValue();
}
- return StrUtil.EMPTY;
+ 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);
}
/**
@@ -86,12 +98,12 @@
*/
@Override
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.between(params.get("beginTime") != null && params.get("endTime") != null,
+ 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())
+ .between(params.get("beginTime") != null && params.get("endTime") != null,
SysConfig::getCreateTime, params.get("beginTime"), params.get("endTime"));
return baseMapper.selectList(lqw);
}
@@ -106,7 +118,7 @@
public int insertConfig(SysConfig config) {
int row = baseMapper.insert(config);
if (row > 0) {
- redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
+ RedisUtils.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
}
return row;
}
@@ -121,7 +133,7 @@
public int updateConfig(SysConfig config) {
int row = baseMapper.updateById(config);
if (row > 0) {
- redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
+ RedisUtils.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
}
return row;
}
@@ -133,28 +145,44 @@
* @return 缁撴灉
*/
@Override
- public int deleteConfigByIds(Long[] configIds) {
+ public void 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()));
+ if (StringUtils.equals(UserConstants.YES, config.getConfigType())) {
+ throw new ServiceException(String.format("鍐呯疆鍙傛暟銆�%1$s銆戜笉鑳藉垹闄� ", config.getConfigKey()));
}
+ RedisUtils.deleteObject(getCacheKey(config.getConfigKey()));
}
- int count = baseMapper.deleteBatchIds(Arrays.asList(configIds));
- if (count > 0) {
- Collection<String> keys = redisCache.keys(Constants.SYS_CONFIG_KEY + "*");
- redisCache.deleteObject(keys);
- }
- 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();
}
/**
@@ -165,15 +193,26 @@
*/
@Override
public String checkConfigKeyUnique(SysConfig config) {
- Long configId = Validator.isNull(config.getConfigId()) ? -1L : config.getConfigId();
+ Long configId = StringUtils.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()) {
+ if (StringUtils.isNotNull(info) && info.getConfigId().longValue() != configId.longValue()) {
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
}
/**
+ * 鏍规嵁鍙傛暟 key 鑾峰彇鍙傛暟鍊�
+ *
+ * @param configKey 鍙傛暟 key
+ * @return 鍙傛暟鍊�
+ */
+ @Override
+ public String getConfigValue(String configKey) {
+ return selectConfigByKey(configKey);
+ }
+
+ /**
* 璁剧疆cache key
*
* @param configKey 鍙傛暟閿�
--
Gitblit v1.9.3