删除缓存信息

src/main/java/com/usky/dxtop/service/impl/DreUserServiceImpl.java

@@ -44,7 +44,10 @@ public class DreUserServiceImpl extends ServiceImpl<DreUserMapper, DreUser> impl
                 .filter(dreUser -> !dreUser.isDelFlag()).collect(Collectors.toList());
 
         List<DreUser> addList = list.stream()
-                .filter(DreUser::isDelFlag).collect(Collectors.toList());
+                .filter(dreUser -> dreUser.isDelFlag() && null == dreUser.getId()).collect(Collectors.toList());
+
+        List<DreUser> updateList = list.stream()
+                .filter(dreUser -> null != dreUser.getId()).collect(Collectors.toList());
         if (CollectionUtils.isNotEmpty(removeList)){
             LambdaQueryWrapper<DreUser> queryWrapper = Wrappers.lambdaQuery();
             queryWrapper.in(DreUser::getUserId,removeList.stream().map(DreUser::getUserId).collect(Collectors.toList()));
@@ -53,6 +56,9 @@ public class DreUserServiceImpl extends ServiceImpl<DreUserMapper, DreUser> impl
         if (CollectionUtils.isNotEmpty(addList)){
             this.saveBatch(addList);
         }
+        if (CollectionUtils.isNotEmpty(updateList)){
+            this.updateBatchById(updateList);
+        }
     }
 
     @Override

src/main/java/com/usky/dxtop/service/impl/SysConfigServiceImpl.java

@@ -1,14 +1,8 @@
 package com.usky.dxtop.service.impl;
 
-import java.util.Collection;
-import java.util.List;
-import javax.annotation.PostConstruct;
-
 import com.usky.dxtop.common.constant.Constants;
 import com.usky.dxtop.common.constant.UserConstants;
-import com.usky.dxtop.common.core.redis.RedisCache;
 import com.usky.dxtop.common.core.text.Convert;
-
 import com.usky.dxtop.common.exception.CustomException;
 import com.usky.dxtop.common.utils.StringUtils;
 import com.usky.dxtop.mapper.SysConfigMapper;
@@ -17,6 +11,8 @@ import com.usky.dxtop.service.ISysConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 
 /**
  * 参数配置 服务层实现
@@ -28,13 +24,12 @@ public class SysConfigServiceImpl implements ISysConfigService
 {
     @Autowired
     private SysConfigMapper configMapper;
-    @Autowired
-    private RedisCache redisCache;
+//    @Autowired
+//    private RedisCache redisCache;
 
     /**
      * 项目启动时，初始化参数到缓存
      */
-    @PostConstruct
     public void init()
     {
         loadingConfigCache();
@@ -63,18 +58,13 @@ public class SysConfigServiceImpl implements ISysConfigService
     @Override
     public String selectConfigByKey(String configKey)
     {
-        String configValue = Convert.toStr(redisCache.getCacheObject(getCacheKey(configKey)));
-        if (StringUtils.isNotEmpty(configValue))
-        {
-            return configValue;
-        }
         SysConfig config = new SysConfig();
         config.setConfigKey(configKey);
         SysConfig retConfig = configMapper.selectConfig(config);
         if (StringUtils.isNotNull(retConfig))
         {
-            redisCache.setCacheObject(getCacheKey(configKey), retConfig.getConfigValue());
             return retConfig.getConfigValue();
+
         }
         return StringUtils.EMPTY;
     }
@@ -117,10 +107,6 @@ public class SysConfigServiceImpl implements ISysConfigService
     public int insertConfig(SysConfig config)
     {
         int row = configMapper.insertConfig(config);
-        if (row > 0)
-        {
-            redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
-        }
         return row;
     }
 
@@ -134,10 +120,6 @@ public class SysConfigServiceImpl implements ISysConfigService
     public int updateConfig(SysConfig config)
     {
         int row = configMapper.updateConfig(config);
-        if (row > 0)
-        {
-            redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
-        }
         return row;
     }
 
@@ -158,7 +140,6 @@ public class SysConfigServiceImpl implements ISysConfigService
                 throw new CustomException(String.format("内置参数【%1$s】不能删除 ", config.getConfigKey()));
             }
             configMapper.deleteConfigById(configId);
-            redisCache.deleteObject(getCacheKey(config.getConfigKey()));
         }
     }
 
@@ -168,11 +149,11 @@ public class SysConfigServiceImpl implements ISysConfigService
     @Override
     public void loadingConfigCache()
     {
-        List<SysConfig> configsList = configMapper.selectConfigList(new SysConfig());
-        for (SysConfig config : configsList)
-        {
-            redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
-        }
+//        List<SysConfig> configsList = configMapper.selectConfigList(new SysConfig());
+//        for (SysConfig config : configsList)
+//        {
+//            redisCache.setCacheObject(getCacheKey(config.getConfigKey()), config.getConfigValue());
+//        }
     }
 
     /**
@@ -181,8 +162,8 @@ public class SysConfigServiceImpl implements ISysConfigService
     @Override
     public void clearConfigCache()
     {
-        Collection<String> keys = redisCache.keys(Constants.SYS_CONFIG_KEY + "*");
-        redisCache.deleteObject(keys);
+//        Collection<String> keys = redisCache.keys(Constants.SYS_CONFIG_KEY + "*");
+//        redisCache.deleteObject(keys);
     }
 
     /**

src/main/java/com/usky/dxtop/service/impl/SysDictDataServiceImpl.java

@@ -1,15 +1,13 @@
 package com.usky.dxtop.service.impl;
 
-import java.util.List;
-
-
-import com.usky.dxtop.common.utils.DictUtils;
 import com.usky.dxtop.mapper.SysDictDataMapper;
 import com.usky.dxtop.model.SysDictData;
 import com.usky.dxtop.service.ISysDictDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 
 /**
  * 字典 业务层处理
@@ -70,10 +68,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService
     {
         for (Long dictCode : dictCodes)
         {
-            SysDictData data = selectDictDataById(dictCode);
             dictDataMapper.deleteDictDataById(dictCode);
-            List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(data.getDictType());
-            DictUtils.setDictCache(data.getDictType(), dictDatas);
         }
     }
 
@@ -87,11 +82,6 @@ public class SysDictDataServiceImpl implements ISysDictDataService
     public int insertDictData(SysDictData data)
     {
         int row = dictDataMapper.insertDictData(data);
-        if (row > 0)
-        {
-            List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(data.getDictType());
-            DictUtils.setDictCache(data.getDictType(), dictDatas);
-        }
         return row;
     }
 
@@ -105,11 +95,6 @@ public class SysDictDataServiceImpl implements ISysDictDataService
     public int updateDictData(SysDictData data)
     {
         int row = dictDataMapper.updateDictData(data);
-        if (row > 0)
-        {
-            List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(data.getDictType());
-            DictUtils.setDictCache(data.getDictType(), dictDatas);
-        }
         return row;
     }
 }

src/main/java/com/usky/dxtop/service/impl/SysDictTypeServiceImpl.java

@@ -1,10 +1,6 @@
 package com.usky.dxtop.service.impl;
 
-import java.util.List;
-import javax.annotation.PostConstruct;
-
 import com.usky.dxtop.common.constant.UserConstants;
-
 import com.usky.dxtop.common.exception.CustomException;
 import com.usky.dxtop.common.utils.DictUtils;
 import com.usky.dxtop.common.utils.StringUtils;
@@ -17,6 +13,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import javax.annotation.PostConstruct;
+import java.util.List;
+
 
 /**
  * 字典 业务层处理
@@ -73,17 +72,11 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
     @Override
     public List<SysDictData> selectDictDataByType(String dictType)
     {
-        List<SysDictData> dictDatas = DictUtils.getDictCache(dictType);
+        List<SysDictData> dictDatas  = dictDataMapper.selectDictDataByType(dictType);
         if (StringUtils.isNotEmpty(dictDatas))
         {
             return dictDatas;
         }
-        dictDatas = dictDataMapper.selectDictDataByType(dictType);
-        if (StringUtils.isNotEmpty(dictDatas))
-        {
-            DictUtils.setDictCache(dictType, dictDatas);
-            return dictDatas;
-        }
         return null;
     }
 
@@ -128,7 +121,6 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
                 throw new CustomException(String.format("%1$s已分配,不能删除", dictType.getDictName()));
             }
             dictTypeMapper.deleteDictTypeById(dictId);
-            DictUtils.removeDictCache(dictType.getDictType());
         }
     }
 
@@ -138,12 +130,12 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
     @Override
     public void loadingDictCache()
     {
-        List<SysDictType> dictTypeList = dictTypeMapper.selectDictTypeAll();
-        for (SysDictType dictType : dictTypeList)
-        {
-            List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(dictType.getDictType());
-            DictUtils.setDictCache(dictType.getDictType(), dictDatas);
-        }
+//        List<SysDictType> dictTypeList = dictTypeMapper.selectDictTypeAll();
+//        for (SysDictType dictType : dictTypeList)
+//        {
+//            List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(dictType.getDictType());
+//            DictUtils.setDictCache(dictType.getDictType(), dictDatas);
+//        }
     }
 
     /**
@@ -175,10 +167,6 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
     public int insertDictType(SysDictType dict)
     {
         int row = dictTypeMapper.insertDictType(dict);
-        if (row > 0)
-        {
-            DictUtils.setDictCache(dict.getDictType(), null);
-        }
         return row;
     }
 
@@ -195,11 +183,6 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
         SysDictType oldDict = dictTypeMapper.selectDictTypeById(dict.getDictId());
         dictDataMapper.updateDictDataType(oldDict.getDictType(), dict.getDictType());
         int row = dictTypeMapper.updateDictType(dict);
-        if (row > 0)
-        {
-            List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(dict.getDictType());
-            DictUtils.setDictCache(dict.getDictType(), dictDatas);
-        }
         return row;
     }
 

src/main/java/com/usky/dxtop/service/vo/DreUserVO.java

@@ -172,4 +172,7 @@ public class DreUserVO {
 
 
     private Boolean isSend;
+
+
+    private Long dreUserId;
 }

src/main/resources/mapper/DreUserMapper.xml

@@ -9,7 +9,7 @@
         <result column="is_send" property="isSend" />
     </resultMap>
     <select id="page" resultType="com.usky.dxtop.service.vo.DreUserVO">
-        select s.*,du.is_send as isSend
+        select s.*,du.is_send as isSend,du.id as dreUserId
         from staff as s
         inner join dre_user as du
          on s.s_id = du.user_id
@@ -24,7 +24,7 @@
         order by s.id desc
     </select>
     <select id="list" resultType="com.usky.dxtop.service.vo.DreUserVO">
-        select s.*,du.is_send as isSend
+        select s.*,du.is_send as isSend,du.id as dreUserId
         from staff as s
         inner join dre_user as du
         on s.s_id = du.user_id