From 6502f2107229bd0e19a0ce5dd748b9e6e5e11367 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 26 十一月 2021 13:57:28 +0800
Subject: [PATCH] update 修改不规范命名
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java | 180 ++++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 120 insertions(+), 60 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 95f0869..9940bea 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
@@ -2,47 +2,67 @@
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.ObjectUtil;
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.exception.CustomException;
+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.SysConfig;
+import com.ruoyi.oss.constant.OssConstant;
+import com.ruoyi.oss.factory.OssFactory;
import com.ruoyi.system.domain.SysOssConfig;
import com.ruoyi.system.domain.bo.SysOssConfigBo;
import com.ruoyi.system.domain.vo.SysOssConfigVo;
import com.ruoyi.system.mapper.SysOssConfigMapper;
-import com.ruoyi.system.service.ISysConfigService;
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;
import java.util.Collection;
+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 ISysConfigService iSysConfigService;
+ /**
+ * 椤圭洰鍚姩鏃讹紝鍒濆鍖栧弬鏁板埌缂撳瓨锛屽姞杞介厤缃被
+ */
+ @Override
+ public void init() {
+ List<SysOssConfig> list = list();
+ // 鍔犺浇OSS鍒濆鍖栭厤缃�
+ for (SysOssConfig config : list) {
+ String configKey = config.getConfigKey();
+ if ("0".equals(config.getStatus())) {
+ RedisUtils.setCacheObject(OssConstant.CACHE_CONFIG_KEY, configKey);
+ }
+ setConfigCache(true, config);
+ }
+ // 鍒濆鍖朞SS宸ュ巶
+ OssFactory.init();
+ }
@Override
- public SysOssConfigVo queryById(Integer ossConfigId){
+ public SysOssConfigVo queryById(Integer ossConfigId) {
return getVoById(ossConfigId);
}
@@ -57,76 +77,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 add = BeanUtil.toBean(bo, SysOssConfig.class);
- validEntityBeforeSave(add);
- return save(add);
+ SysOssConfig config = BeanUtil.toBean(bo, SysOssConfig.class);
+ validEntityBeforeSave(config);
+ return setConfigCache(save(config), config);
}
@Override
public Boolean updateByBo(SysOssConfigBo bo) {
- SysOssConfig update = BeanUtil.toBean(bo, SysOssConfig.class);
- validEntityBeforeSave(update);
- return updateById(update);
+ SysOssConfig config = BeanUtil.toBean(bo, SysOssConfig.class);
+ validEntityBeforeSave(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 CustomException("鎿嶄綔閰嶇疆'" + 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<Integer> ids, Boolean isValid) {
- if(isValid) {
- if (CollUtil.containsAny(ids, CollUtil.newArrayList(1, 2, 3, 4))) {
- throw new CustomException("绯荤粺鍐呯疆, 涓嶅彲鍒犻櫎!");
- }
- }
- return removeByIds(ids);
+ public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+ if (isValid) {
+ if (CollUtil.containsAny(ids, OssConstant.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) {
+ 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) {
- SysConfig sysConfig = iSysConfigService.getOne(new LambdaQueryWrapper<SysConfig>()
- .eq(SysConfig::getConfigKey, CloudConstant.CLOUD_STORAGE_CONFIG_KEY));
- if(ObjectUtil.isNotNull(sysConfig)){
- sysConfig.setConfigValue(bo.getConfigKey());
- iSysConfigService.updateConfig(sysConfig);
- } else {
- throw new CustomException("缂哄皯'浜戝瓨鍌ㄩ厤缃甂EY'鍙傛暟!");
- }
- SysOssConfig sysOssConfig = BeanUtil.toBean(bo, SysOssConfig.class);
- baseMapper.update(null, new LambdaUpdateWrapper<SysOssConfig>()
- .set(SysOssConfig::getStatus, "1"));
- return baseMapper.updateById(sysOssConfig);
- }
+ /**
+ * 鍚敤绂佺敤鐘舵��
+ */
+ @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(OssConstant.CACHE_CONFIG_KEY, sysOssConfig.getConfigKey());
+ }
+ return row;
+ }
+ /**
+ * 璁剧疆cache key
+ *
+ * @param configKey 鍙傛暟閿�
+ * @return 缂撳瓨閿甼ey
+ */
+ private String getCacheKey(String configKey) {
+ return OssConstant.SYS_OSS_KEY + configKey;
+ }
+
+ /**
+ * 濡傛灉鎿嶄綔鎴愬姛 鍒欐洿鏂扮紦瀛�
+ *
+ * @param flag 鎿嶄綔鐘舵��
+ * @param config 閰嶇疆
+ * @return 杩斿洖鎿嶄綔鐘舵��
+ */
+ private boolean setConfigCache(boolean flag, SysOssConfig config) {
+ if (flag) {
+ RedisUtils.setCacheObject(
+ getCacheKey(config.getConfigKey()),
+ JsonUtils.toJsonString(config));
+ RedisUtils.publish(OssConstant.CACHE_CONFIG_KEY, config.getConfigKey(), msg -> {
+ log.info("鍙戝竷鍒锋柊OSS閰嶇疆 => " + msg);
+ });
+ }
+ return flag;
+ }
}
--
Gitblit v1.9.3