From a6fb88d74c20cc28043d75e8a5097fce49cf9a78 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 15 十月 2021 15:19:42 +0800
Subject: [PATCH] update [重大更新]全业务 增加 接口文档注解 格式化代码

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java |  196 ++++++++++++++++++++++++++----------------------
 1 files changed, 105 insertions(+), 91 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java
index 5a6e8de..df3f6d1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java
@@ -5,14 +5,15 @@
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.google.common.collect.Lists;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.ruoyi.common.core.page.PagePlus;
 import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.JsonUtils;
 import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.RedisUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.oss.constant.CloudConstant;
 import com.ruoyi.system.domain.SysOssConfig;
@@ -21,6 +22,7 @@
 import com.ruoyi.system.mapper.SysOssConfigMapper;
 import com.ruoyi.system.service.ISysOssConfigService;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -30,35 +32,34 @@
 import java.util.List;
 
 /**
- * 浜戝瓨鍌ㄩ厤缃甋ervice涓氬姟灞傚鐞�
+ * 瀵硅薄瀛樺偍閰嶇疆Service涓氬姟灞傚鐞�
  *
  * @author Lion Li
  * @author 瀛よ垷鐑熼洦
  * @date 2021-08-13
  */
+@Slf4j
 @RequiredArgsConstructor(onConstructor_ = @Autowired)
 @Service
 public class SysOssConfigServiceImpl extends ServicePlusImpl<SysOssConfigMapper, SysOssConfig, SysOssConfigVo> implements ISysOssConfigService {
 
-	private final RedisCache redisCache;
-
-	/**
-	 * 椤圭洰鍚姩鏃讹紝鍒濆鍖栧弬鏁板埌缂撳瓨锛屽姞杞介厤缃被
-	 */
-	@PostConstruct
-	public void init() {
-		List<SysOssConfig> list = list();
-		for (SysOssConfig config : list) {
-			String configKey = config.getConfigKey();
-			if ("0".equals(config.getStatus())) {
-				redisCache.setCacheObject(CloudConstant.CACHE_CONFIG_KEY, configKey);
-			}
-			setConfigCache(true, config);
-		}
-	}
+    /**
+     * 椤圭洰鍚姩鏃讹紝鍒濆鍖栧弬鏁板埌缂撳瓨锛屽姞杞介厤缃被
+     */
+    @PostConstruct
+    public void init() {
+        List<SysOssConfig> list = list();
+        for (SysOssConfig config : list) {
+            String configKey = config.getConfigKey();
+            if ("0".equals(config.getStatus())) {
+                RedisUtils.setCacheObject(CloudConstant.CACHE_CONFIG_KEY, configKey);
+            }
+            setConfigCache(true, config);
+        }
+    }
 
     @Override
-    public SysOssConfigVo queryById(Integer ossConfigId){
+    public SysOssConfigVo queryById(Integer ossConfigId) {
         return getVoById(ossConfigId);
     }
 
@@ -73,103 +74,116 @@
         LambdaQueryWrapper<SysOssConfig> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getConfigKey()), SysOssConfig::getConfigKey, bo.getConfigKey());
         lqw.like(StringUtils.isNotBlank(bo.getBucketName()), SysOssConfig::getBucketName, bo.getBucketName());
-		lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysOssConfig::getStatus, bo.getStatus());
-		return lqw;
+        lqw.eq(StringUtils.isNotBlank(bo.getStatus()), SysOssConfig::getStatus, bo.getStatus());
+        return lqw;
     }
 
     @Override
     public Boolean insertByBo(SysOssConfigBo bo) {
         SysOssConfig config = BeanUtil.toBean(bo, SysOssConfig.class);
         validEntityBeforeSave(config);
-		return setConfigCache(save(config), config);
+        return setConfigCache(save(config), config);
     }
 
     @Override
     public Boolean updateByBo(SysOssConfigBo bo) {
         SysOssConfig config = BeanUtil.toBean(bo, SysOssConfig.class);
         validEntityBeforeSave(config);
-		return setConfigCache(updateById(config), config);
+        LambdaUpdateWrapper<SysOssConfig> luw = new LambdaUpdateWrapper<>();
+        luw.set(StringUtils.isBlank(config.getPrefix()), SysOssConfig::getPrefix, "");
+        luw.set(StringUtils.isBlank(config.getRegion()), SysOssConfig::getRegion, "");
+        luw.set(StringUtils.isBlank(config.getExt1()), SysOssConfig::getExt1, "");
+        luw.eq(SysOssConfig::getOssConfigId, config.getOssConfigId());
+        return setConfigCache(update(config, luw), config);
     }
 
     /**
      * 淇濆瓨鍓嶇殑鏁版嵁鏍¢獙
      */
-    private void validEntityBeforeSave(SysOssConfig entity){
-		if (StringUtils.isNotEmpty(entity.getConfigKey())
-			&& UserConstants.NOT_UNIQUE.equals(checkConfigKeyUnique(entity))) {
-			throw new ServiceException("鎿嶄綔閰嶇疆'" + entity.getConfigKey() + "'澶辫触, 閰嶇疆key宸插瓨鍦�!");
-		}
+    private void validEntityBeforeSave(SysOssConfig entity) {
+        if (StringUtils.isNotEmpty(entity.getConfigKey())
+                && UserConstants.NOT_UNIQUE.equals(checkConfigKeyUnique(entity))) {
+            throw new ServiceException("鎿嶄綔閰嶇疆'" + entity.getConfigKey() + "'澶辫触, 閰嶇疆key宸插瓨鍦�!");
+        }
     }
 
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-    	if(isValid) {
-			if (CollUtil.containsAny(ids, CloudConstant.SYSTEM_DATA_IDS)) {
-				throw new ServiceException("绯荤粺鍐呯疆, 涓嶅彲鍒犻櫎!");
-			}
-		}
+        if (isValid) {
+            if (CollUtil.containsAny(ids, CloudConstant.SYSTEM_DATA_IDS)) {
+                throw new ServiceException("绯荤粺鍐呯疆, 涓嶅彲鍒犻櫎!");
+            }
+        }
+        List<SysOssConfig> list = Lists.newArrayList();
+        for (Long configId : ids) {
+            SysOssConfig config = getById(configId);
+            list.add(config);
+        }
         boolean flag = removeByIds(ids);
-    	if (flag) {
-			for (Long configId : ids) {
-				SysOssConfig config = getById(configId);
-				redisCache.deleteObject(getCacheKey(config.getConfigKey()));
-			}
-		}
-    	return flag;
+        if (flag) {
+            list.stream().forEach(sysOssConfig -> {
+                RedisUtils.deleteObject(getCacheKey(sysOssConfig.getConfigKey()));
+            });
+        }
+        return flag;
     }
 
-	/**
-	 * 鍒ゆ柇configKey鏄惁鍞竴
-	 */
-	private String checkConfigKeyUnique(SysOssConfig sysOssConfig) {
-		long ossConfigId = StringUtils.isNull(sysOssConfig.getOssConfigId()) ? -1L : sysOssConfig.getOssConfigId();
-		SysOssConfig info = getOne(new LambdaQueryWrapper<SysOssConfig>()
-			.select(SysOssConfig::getOssConfigId, SysOssConfig::getConfigKey)
-			.eq(SysOssConfig::getConfigKey, sysOssConfig.getConfigKey()));
-		if (StringUtils.isNotNull(info) && info.getOssConfigId() != ossConfigId) {
-			return UserConstants.NOT_UNIQUE;
-		}
-		return UserConstants.UNIQUE;
-	}
+    /**
+     * 鍒ゆ柇configKey鏄惁鍞竴
+     */
+    private String checkConfigKeyUnique(SysOssConfig sysOssConfig) {
+        long ossConfigId = StringUtils.isNull(sysOssConfig.getOssConfigId()) ? -1L : sysOssConfig.getOssConfigId();
+        SysOssConfig info = getOne(new LambdaQueryWrapper<SysOssConfig>()
+                .select(SysOssConfig::getOssConfigId, SysOssConfig::getConfigKey)
+                .eq(SysOssConfig::getConfigKey, sysOssConfig.getConfigKey()));
+        if (StringUtils.isNotNull(info) && info.getOssConfigId() != ossConfigId) {
+            return UserConstants.NOT_UNIQUE;
+        }
+        return UserConstants.UNIQUE;
+    }
 
-	/**
-	 * 鍚敤绂佺敤鐘舵��
-	 */
-	@Override
-	@Transactional(rollbackFor = Exception.class)
-	public int updateOssConfigStatus(SysOssConfigBo bo) {
-		SysOssConfig sysOssConfig = BeanUtil.toBean(bo, SysOssConfig.class);
-		int row = baseMapper.update(null, new LambdaUpdateWrapper<SysOssConfig>()
-			.set(SysOssConfig::getStatus, "1"));
-		row += baseMapper.updateById(sysOssConfig);
-		if (row > 0) {
-			redisCache.setCacheObject(CloudConstant.CACHE_CONFIG_KEY, sysOssConfig.getConfigKey());
-		}
-		return row;
-	}
+    /**
+     * 鍚敤绂佺敤鐘舵��
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int updateOssConfigStatus(SysOssConfigBo bo) {
+        SysOssConfig sysOssConfig = BeanUtil.toBean(bo, SysOssConfig.class);
+        int row = baseMapper.update(null, new LambdaUpdateWrapper<SysOssConfig>()
+                .set(SysOssConfig::getStatus, "1"));
+        row += baseMapper.updateById(sysOssConfig);
+        if (row > 0) {
+            RedisUtils.setCacheObject(CloudConstant.CACHE_CONFIG_KEY, sysOssConfig.getConfigKey());
+        }
+        return row;
+    }
 
-	/**
-	 * 璁剧疆cache key
-	 *
-	 * @param configKey 鍙傛暟閿�
-	 * @return 缂撳瓨閿甼ey
-	 */
-	private String getCacheKey(String configKey) {
-		return CloudConstant.SYS_OSS_KEY + configKey;
-	}
+    /**
+     * 璁剧疆cache key
+     *
+     * @param configKey 鍙傛暟閿�
+     * @return 缂撳瓨閿甼ey
+     */
+    private String getCacheKey(String configKey) {
+        return CloudConstant.SYS_OSS_KEY + configKey;
+    }
 
-	/**
-	 * 濡傛灉鎿嶄綔鎴愬姛 鍒欐洿鏂扮紦瀛�
-	 * @param flag 鎿嶄綔鐘舵��
-	 * @param config 閰嶇疆
-	 * @return 杩斿洖鎿嶄綔鐘舵��
-	 */
-	private boolean setConfigCache(boolean flag, SysOssConfig config) {
-		if (flag) {
-			redisCache.setCacheObject(
-				getCacheKey(config.getConfigKey()),
-				JsonUtils.toJsonString(config));
-		}
-		return flag;
-	}
+    /**
+     * 濡傛灉鎿嶄綔鎴愬姛 鍒欐洿鏂扮紦瀛�
+     *
+     * @param flag   鎿嶄綔鐘舵��
+     * @param config 閰嶇疆
+     * @return 杩斿洖鎿嶄綔鐘舵��
+     */
+    private boolean setConfigCache(boolean flag, SysOssConfig config) {
+        if (flag) {
+            RedisUtils.setCacheObject(
+                    getCacheKey(config.getConfigKey()),
+                    JsonUtils.toJsonString(config));
+            RedisUtils.publish(CloudConstant.CACHE_CONFIG_KEY, config.getConfigKey(), msg -> {
+                log.info("鍙戝竷鍒锋柊OSS閰嶇疆 => " + msg);
+            });
+        }
+        return flag;
+    }
 }

--
Gitblit v1.9.3