From 4500db395fdad42c7689e17ef6e3965a6caebdcc Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期一, 12 四月 2021 17:02:55 +0800 Subject: [PATCH] update ruoyi原生改为 MP lombok 格式 update SysConfig 模块代码 --- ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java | 112 ++++++++++++++++++++++++------------------------------- 1 files changed, 49 insertions(+), 63 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 2497f1d..7f694ae 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 @@ -3,6 +3,8 @@ 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; @@ -16,19 +18,18 @@ 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; @@ -37,49 +38,40 @@ * 椤圭洰鍚姩鏃讹紝鍒濆鍖栧弬鏁板埌缂撳瓨 */ @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 (Validator.isNotEmpty(configValue)) - { + if (Validator.isNotEmpty(configValue)) { return configValue; } - SysConfig config = new SysConfig(); - config.setConfigKey(configKey); - SysConfig retConfig = configMapper.selectConfig(config); - if (Validator.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(); } @@ -88,28 +80,32 @@ /** * 鏌ヨ鍙傛暟閰嶇疆鍒楄〃 - * + * * @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.between(params.get("beginTime") != null && params.get("endTime") != null, + SysConfig::getCreateTime, params.get("beginTime"), 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; @@ -117,16 +113,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; @@ -134,24 +128,20 @@ /** * 鎵归噺鍒犻櫎鍙傛暟淇℃伅 - * + * * @param configIds 闇�瑕佸垹闄ょ殑鍙傛暟ID * @return 缁撴灉 */ @Override - public int deleteConfigByIds(Long[] configIds) - { - for (Long configId : configIds) - { + public int deleteConfigByIds(Long[] configIds) { + for (Long configId : configIds) { SysConfig config = selectConfigById(configId); - if (StrUtil.equals(UserConstants.YES, config.getConfigType())) - { + if (StrUtil.equals(UserConstants.YES, config.getConfigType())) { throw new CustomException(String.format("鍐呯疆鍙傛暟銆�%1$s銆戜笉鑳藉垹闄� ", config.getConfigKey())); } } - int count = configMapper.deleteConfigByIds(configIds); - if (count > 0) - { + int count = baseMapper.deleteBatchIds(Arrays.asList(configIds)); + if (count > 0) { Collection<String> keys = redisCache.keys(Constants.SYS_CONFIG_KEY + "*"); redisCache.deleteObject(keys); } @@ -162,25 +152,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) - { + public String checkConfigKeyUnique(SysConfig config) { Long configId = Validator.isNull(config.getConfigId()) ? -1L : config.getConfigId(); - SysConfig info = configMapper.checkConfigKeyUnique(config.getConfigKey()); - if (Validator.isNotNull(info) && info.getConfigId().longValue() != configId.longValue()) - { + 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; @@ -188,12 +175,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