From b38151a0bb0484221ba7b9ad3a1aa773105e1b14 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 06 十二月 2022 11:32:35 +0800
Subject: [PATCH] !260 单元格合并判断cellValue是否相等方法调整 Merge pull request !260 from zendwang/dev
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java | 223 ++++++++++++++++++++++++++++---------------------------
1 files changed, 113 insertions(+), 110 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 a67abe5..8ceff7c 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,70 +2,77 @@
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.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.common.constant.CacheNames;
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.domain.PageQuery;
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.StringUtils;
-import com.ruoyi.oss.constant.CloudConstant;
+import com.ruoyi.common.utils.redis.CacheUtils;
+import com.ruoyi.common.utils.redis.RedisUtils;
+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.ISysOssConfigService;
import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import javax.annotation.PostConstruct;
import java.util.Collection;
import java.util.List;
/**
- * 浜戝瓨鍌ㄩ厤缃甋ervice涓氬姟灞傚鐞�
+ * 瀵硅薄瀛樺偍閰嶇疆Service涓氬姟灞傚鐞�
*
* @author Lion Li
* @author 瀛よ垷鐑熼洦
* @date 2021-08-13
*/
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@Slf4j
+@RequiredArgsConstructor
@Service
-public class SysOssConfigServiceImpl extends ServicePlusImpl<SysOssConfigMapper, SysOssConfig, SysOssConfigVo> implements ISysOssConfigService {
+public class SysOssConfigServiceImpl implements ISysOssConfigService {
- private final RedisCache redisCache;
+ private final SysOssConfigMapper baseMapper;
- /**
- * 椤圭洰鍚姩鏃讹紝鍒濆鍖栧弬鏁板埌缂撳瓨锛屽姞杞介厤缃被
- */
- @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);
- }
- }
-
+ /**
+ * 椤圭洰鍚姩鏃讹紝鍒濆鍖栧弬鏁板埌缂撳瓨锛屽姞杞介厤缃被
+ */
@Override
- public SysOssConfigVo queryById(Integer ossConfigId){
- return getVoById(ossConfigId);
+ public void init() {
+ List<SysOssConfig> list = baseMapper.selectList();
+ // 鍔犺浇OSS鍒濆鍖栭厤缃�
+ for (SysOssConfig config : list) {
+ String configKey = config.getConfigKey();
+ if ("0".equals(config.getStatus())) {
+ RedisUtils.setCacheObject(OssConstant.DEFAULT_CONFIG_KEY, configKey);
+ }
+ setConfigCache(true, config);
+ }
+ // 鍒濆鍖朞SS宸ュ巶
+ OssFactory.init();
}
@Override
- public TableDataInfo<SysOssConfigVo> queryPageList(SysOssConfigBo bo) {
- PagePlus<SysOssConfig, SysOssConfigVo> result = pageVo(PageUtils.buildPagePlus(), buildQueryWrapper(bo));
- return PageUtils.buildDataInfo(result);
+ public SysOssConfigVo queryById(Long ossConfigId) {
+ return baseMapper.selectVoById(ossConfigId);
+ }
+
+ @Override
+ public TableDataInfo<SysOssConfigVo> queryPageList(SysOssConfigBo bo, PageQuery pageQuery) {
+ LambdaQueryWrapper<SysOssConfig> lqw = buildQueryWrapper(bo);
+ Page<SysOssConfigVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+ return TableDataInfo.build(result);
}
@@ -73,108 +80,104 @@
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(baseMapper.insert(config) > 0, config);
}
@Override
public Boolean updateByBo(SysOssConfigBo bo) {
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);
+ LambdaUpdateWrapper<SysOssConfig> luw = new LambdaUpdateWrapper<>();
+ luw.set(ObjectUtil.isNull(config.getPrefix()), SysOssConfig::getPrefix, "");
+ luw.set(ObjectUtil.isNull(config.getRegion()), SysOssConfig::getRegion, "");
+ luw.set(ObjectUtil.isNull(config.getExt1()), SysOssConfig::getExt1, "");
+ luw.set(ObjectUtil.isNull(config.getRemark()), SysOssConfig::getRemark, "");
+ luw.eq(SysOssConfig::getOssConfigId, config.getOssConfigId());
+ return setConfigCache(baseMapper.update(config, luw) > 0, 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("绯荤粺鍐呯疆, 涓嶅彲鍒犻櫎!");
- }
- }
- boolean flag = removeByIds(ids);
- if (flag) {
- for (Long configId : ids) {
- SysOssConfig config = getById(configId);
- redisCache.deleteObject(getCacheKey(config.getConfigKey()));
- }
- }
- return flag;
+ if (isValid) {
+ if (CollUtil.containsAny(ids, OssConstant.SYSTEM_DATA_IDS)) {
+ throw new ServiceException("绯荤粺鍐呯疆, 涓嶅彲鍒犻櫎!");
+ }
+ }
+ List<SysOssConfig> list = CollUtil.newArrayList();
+ for (Long configId : ids) {
+ SysOssConfig config = baseMapper.selectById(configId);
+ list.add(config);
+ }
+ boolean flag = baseMapper.deleteBatchIds(ids) > 0;
+ if (flag) {
+ list.forEach(sysOssConfig ->
+ CacheUtils.evict(CacheNames.SYS_OSS_CONFIG, 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 = ObjectUtil.isNull(sysOssConfig.getOssConfigId()) ? -1L : sysOssConfig.getOssConfigId();
+ SysOssConfig info = baseMapper.selectOne(new LambdaQueryWrapper<SysOssConfig>()
+ .select(SysOssConfig::getOssConfigId, SysOssConfig::getConfigKey)
+ .eq(SysOssConfig::getConfigKey, sysOssConfig.getConfigKey()));
+ if (ObjectUtil.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(OssConstant.DEFAULT_CONFIG_KEY, sysOssConfig.getConfigKey());
+ }
+ return row;
+ }
- /**
- * 璁剧疆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) {
+ CacheUtils.put(CacheNames.SYS_OSS_CONFIG, config.getConfigKey(), JsonUtils.toJsonString(config));
+ RedisUtils.publish(OssConstant.DEFAULT_CONFIG_KEY, config.getConfigKey(), msg -> {
+ log.info("鍙戝竷鍒锋柊OSS閰嶇疆 => " + msg);
+ });
+ }
+ return flag;
+ }
}
--
Gitblit v1.9.3