From 8f6484e47085fde953e4e7c725da6fa56228322b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 12 一月 2022 21:22:26 +0800
Subject: [PATCH] [重磅更新] 重写项目整体结构 数据处理下沉至 Mapper 符合 MVC 规范 减少循环依赖

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssConfigServiceImpl.java |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 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 3ab123a..12779cd 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
@@ -9,12 +9,11 @@
 import com.google.common.collect.Lists;
 import com.ruoyi.common.constant.UserConstants;
 import com.ruoyi.common.core.domain.PageQuery;
-import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.JsonUtils;
-import com.ruoyi.common.utils.redis.RedisUtils;
 import com.ruoyi.common.utils.StringUtils;
+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;
@@ -24,7 +23,6 @@
 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;
 
@@ -39,16 +37,18 @@
  * @date 2021-08-13
  */
 @Slf4j
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RequiredArgsConstructor
 @Service
-public class SysOssConfigServiceImpl extends ServicePlusImpl<SysOssConfigMapper, SysOssConfig, SysOssConfigVo> implements ISysOssConfigService {
+public class SysOssConfigServiceImpl implements ISysOssConfigService {
+
+    private final SysOssConfigMapper baseMapper;
 
     /**
      * 椤圭洰鍚姩鏃讹紝鍒濆鍖栧弬鏁板埌缂撳瓨锛屽姞杞介厤缃被
      */
     @Override
     public void init() {
-        List<SysOssConfig> list = list();
+        List<SysOssConfig> list = baseMapper.selectList();
         // 鍔犺浇OSS鍒濆鍖栭厤缃�
         for (SysOssConfig config : list) {
             String configKey = config.getConfigKey();
@@ -63,13 +63,13 @@
 
     @Override
     public SysOssConfigVo queryById(Integer ossConfigId) {
-        return getVoById(ossConfigId);
+        return baseMapper.selectVoById(ossConfigId);
     }
 
     @Override
     public TableDataInfo<SysOssConfigVo> queryPageList(SysOssConfigBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<SysOssConfig> lqw = buildQueryWrapper(bo);
-        Page<SysOssConfigVo> result = pageVo(pageQuery.build(), lqw);
+        Page<SysOssConfigVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
 
@@ -86,7 +86,7 @@
     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
@@ -98,7 +98,7 @@
         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);
+        return setConfigCache(baseMapper.update(config, luw) > 0, config);
     }
 
     /**
@@ -120,10 +120,10 @@
         }
         List<SysOssConfig> list = Lists.newArrayList();
         for (Long configId : ids) {
-            SysOssConfig config = getById(configId);
+            SysOssConfig config = baseMapper.selectById(configId);
             list.add(config);
         }
-        boolean flag = removeByIds(ids);
+        boolean flag = baseMapper.deleteBatchIds(ids) > 0;
         if (flag) {
             list.stream().forEach(sysOssConfig -> {
                 RedisUtils.deleteObject(getCacheKey(sysOssConfig.getConfigKey()));
@@ -137,7 +137,7 @@
      */
     private String checkConfigKeyUnique(SysOssConfig sysOssConfig) {
         long ossConfigId = StringUtils.isNull(sysOssConfig.getOssConfigId()) ? -1L : sysOssConfig.getOssConfigId();
-        SysOssConfig info = getOne(new LambdaQueryWrapper<SysOssConfig>()
+        SysOssConfig info = baseMapper.selectOne(new LambdaQueryWrapper<SysOssConfig>()
                 .select(SysOssConfig::getOssConfigId, SysOssConfig::getConfigKey)
                 .eq(SysOssConfig::getConfigKey, sysOssConfig.getConfigKey()));
         if (StringUtils.isNotNull(info) && info.getOssConfigId() != ossConfigId) {

--
Gitblit v1.9.3