From 741a5b275ba3d1a9099d2c5dce94e7a192db66c1 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 11 十月 2021 09:37:06 +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/SysOssConfigServiceImpl.java | 160 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 99 insertions(+), 61 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 fdce385..848f4d6 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
@@ -1,52 +1,61 @@
package com.ruoyi.system.service.impl;
import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.ruoyi.common.constant.Constants;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.constant.UserConstants;
-import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.redis.RedisCache;
-import com.ruoyi.common.exception.CustomException;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.PageUtils;
+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.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.system.mapper.SysConfigMapper;
-import com.ruoyi.system.service.ISysConfigService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.system.domain.SysOssConfig;
import com.ruoyi.system.domain.bo.SysOssConfigBo;
import com.ruoyi.system.domain.vo.SysOssConfigVo;
-import com.ruoyi.system.domain.SysOssConfig;
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;
-import java.util.List;
-import java.util.Map;
+import javax.annotation.PostConstruct;
import java.util.Collection;
+import java.util.List;
/**
- * 浜戝瓨鍌ㄩ厤缃甋ervice涓氬姟灞傚鐞�
+ * 瀵硅薄瀛樺偍閰嶇疆Service涓氬姟灞傚鐞�
*
- * @author ruoyi
- * @date 2021-08-11
+ * @author Lion Li
+ * @author 瀛よ垷鐑熼洦
+ * @date 2021-08-13
*/
+@Slf4j
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
@Service
public class SysOssConfigServiceImpl extends ServicePlusImpl<SysOssConfigMapper, SysOssConfig, SysOssConfigVo> implements ISysOssConfigService {
- @Autowired
- private ISysConfigService iSysConfigService;
- @Autowired
- private SysConfigMapper sysConfigMapper;
- @Autowired
- private RedisCache redisCache;
+ /**
+ * 椤圭洰鍚姩鏃讹紝鍒濆鍖栧弬鏁板埌缂撳瓨锛屽姞杞介厤缃被
+ */
+ @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){
@@ -61,53 +70,68 @@
private LambdaQueryWrapper<SysOssConfig> buildQueryWrapper(SysOssConfigBo bo) {
- Map<String, Object> params = bo.getParams();
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());
- 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);
}
/**
* 淇濆瓨鍓嶇殑鏁版嵁鏍￠獙
- *
- * @param entity 瀹炰綋绫绘暟鎹�
*/
private void validEntityBeforeSave(SysOssConfig entity){
- //TODO 鍋氫竴浜涙暟鎹牎楠�,濡傚敮涓�绾︽潫
+ 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) {
- return removeByIds(ids);
+ public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+ if(isValid) {
+ if (CollUtil.containsAny(ids, CloudConstant.SYSTEM_DATA_IDS)) {
+ throw new ServiceException("绯荤粺鍐呯疆, 涓嶅彲鍒犻櫎!");
+ }
+ }
+ boolean flag = removeByIds(ids);
+ if (flag) {
+ for (Long configId : ids) {
+ SysOssConfig config = getById(configId);
+ RedisUtils.deleteObject(getCacheKey(config.getConfigKey()));
+ }
+ }
+ return flag;
}
/**
* 鍒ゆ柇configKey鏄惁鍞竴
- * @param bo
- * @return
*/
- @Override
- public String checkConfigKeyUnique(SysOssConfigBo bo) {
- Long ossConfigId = StringUtils.isNull(bo.getOssConfigId()) ? -1L : bo.getOssConfigId();
+ 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, bo.getConfigKey()).last("limit 1"));
- if (StringUtils.isNotNull(info) && info.getOssConfigId().longValue() != ossConfigId.longValue()) {
+ .eq(SysOssConfig::getConfigKey, sysOssConfig.getConfigKey()));
+ if (StringUtils.isNotNull(info) && info.getOssConfigId() != ossConfigId) {
return UserConstants.NOT_UNIQUE;
}
return UserConstants.UNIQUE;
@@ -115,20 +139,18 @@
/**
* 鍚敤绂佺敤鐘舵��
- * @param sysOssConfig
- * @return
*/
@Override
- public int updateOssConfigStatus(SysOssConfig sysOssConfig) {
- LambdaQueryWrapper<SysConfig> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(SysConfig::getConfigKey, CloudConstant.CLOUD_STORAGE_CONFIG_KEY);
- SysConfig sysConfig = sysConfigMapper.selectOne(queryWrapper);
-
- if(ObjectUtil.isNotNull(sysConfig)){
- sysConfig.setConfigValue(sysOssConfig.getConfigKey());
- iSysConfigService.updateConfig(sysConfig);
+ @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 baseMapper.updateById(sysOssConfig);
+ return row;
}
/**
@@ -138,8 +160,24 @@
* @return 缂撳瓨閿甼ey
*/
private String getCacheKey(String configKey) {
- return Constants.SYS_CONFIG_KEY + configKey;
+ return CloudConstant.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(CloudConstant.CACHE_CONFIG_KEY, config.getConfigKey(), msg -> {
+ log.info("鍙戝竷鍒锋柊OSS閰嶇疆 => " + msg);
+ });
+ }
+ return flag;
+ }
}
--
Gitblit v1.9.3