行政区域增加redis缓存

delivery-module-system/delivery-module-system-biz/src/main/java/com/unis/module/system/controller/admin/arealevel/AreaLevelController.java

@@ -77,7 +77,7 @@ public class AreaLevelController {
     @Operation(summary = "获得行政区划")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('system:area-level:query')")
-    public CommonResult<AreaLevelRespVO> getAreaLevel(@RequestParam("id") Integer id) {
+    public CommonResult<AreaLevelRespVO> getAreaLevel(@RequestParam("id") Long id) {
         AreaLevelDO areaLevel = areaLevelService.getAreaLevel(id);
         return success(BeanUtils.toBean(areaLevel, AreaLevelRespVO.class));
     }
@@ -146,7 +146,7 @@ public class AreaLevelController {
             return error(400, "无此用户");
         }
 
-        return success(areaLevelService.getLoginUserXzqhConcise(user.getAreaCode(),user));
+        return success(areaLevelService.getLoginUserXzqhConcise(user.getAreaCode()));
 
     }
 

delivery-module-system/delivery-module-system-biz/src/main/java/com/unis/module/system/service/arealevel/AreaLevelService.java

@@ -45,7 +45,7 @@ public interface AreaLevelService {
      * @return 行政区划
      */
 
-    AreaLevelDO getAreaLevel(Integer id);
+    AreaLevelDO getAreaLevel(Long id);
 
 
     /**
@@ -68,5 +68,5 @@ public interface AreaLevelService {
     List<AreaLevelDO> getAreaListByParentCode(String parentCode);
 
     List<AreaLevelDO> getAreaLevelListAll(AdminUserDO user);
-    List<AreaLevelDO> getLoginUserXzqhConcise(String areaCode,AdminUserDO user);
+    List<AreaLevelDO> getLoginUserXzqhConcise(String areaCode);
 }

delivery-module-system/delivery-module-system-biz/src/main/java/com/unis/module/system/service/arealevel/AreaLevelServiceImpl.java

@@ -6,6 +6,7 @@ import com.unis.framework.security.core.LoginUser;
 import com.unis.framework.security.core.util.SecurityFrameworkUtils;
 import com.unis.module.system.dal.dataobject.user.AdminUserDO;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -14,6 +15,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 import com.unis.module.system.controller.admin.arealevel.vo.*;
 import com.unis.module.system.dal.dataobject.arealevel.AreaLevelDO;
@@ -39,31 +41,97 @@ public class AreaLevelServiceImpl implements AreaLevelService {
     @Resource
     private AreaLevelMapper areaLevelMapper;
 
+    @Resource
+    private RedisTemplate<String, Object> redisTemplate;
+
+    private static final String ALL_AREA_LEVEL_KEY = "all_area_levels";
+
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Long createAreaLevel(AreaLevelSaveReqVO createReqVO) {
-        // 插入
-        AreaLevelDO areaLevel = BeanUtils.toBean(createReqVO, AreaLevelDO.class);
-        areaLevel.setId(YitIdHelper.nextId());
-        areaLevelMapper.insert(areaLevel);
-        // 返回
-        return areaLevel.getId();
+        try {
+            // 插入
+            AreaLevelDO areaLevel = BeanUtils.toBean(createReqVO, AreaLevelDO.class);
+            areaLevel.setId(YitIdHelper.nextId());
+            areaLevelMapper.insert(areaLevel);
+
+            // 删除缓存
+            redisTemplate.delete(ALL_AREA_LEVEL_KEY);
+
+            // 重新获取并设置缓存
+            List<AreaLevelDO> allAreaLevels = areaLevelMapper.selectList();
+            // 将数据存入 Redis，设置过期时间为不过期
+            AreaLevelDO areaLevelDO = new AreaLevelDO();
+            areaLevelDO.setAreaLevel(0);
+            areaLevelDO.setAreaCode("0");
+            areaLevelDO.setAreaName("国家粮食交易中心");
+            areaLevelDO.setId(0L);
+            allAreaLevels.add(areaLevelDO);
+            redisTemplate.opsForValue().set(ALL_AREA_LEVEL_KEY, allAreaLevels);
+
+            // 返回
+            return areaLevel.getId();
+        } catch (Exception e) {
+            // 发生异常时回滚数据库事务
+            throw e;
+        }
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void updateAreaLevel(AreaLevelSaveReqVO updateReqVO) {
-        // 校验存在
-        validateAreaLevelExists(updateReqVO.getId());
-        // 更新
-        AreaLevelDO updateObj = BeanUtils.toBean(updateReqVO, AreaLevelDO.class);
-        areaLevelMapper.updateById(updateObj);
+        try {
+            // 校验存在
+            validateAreaLevelExists(updateReqVO.getId());
+            // 更新
+            AreaLevelDO updateObj = BeanUtils.toBean(updateReqVO, AreaLevelDO.class);
+            areaLevelMapper.updateById(updateObj);
+
+            // 删除缓存
+            redisTemplate.delete(ALL_AREA_LEVEL_KEY);
+
+            // 重新获取并设置缓存
+            List<AreaLevelDO> allAreaLevels = areaLevelMapper.selectList();
+            // 将数据存入 Redis，设置过期时间为不过期
+            AreaLevelDO areaLevelDO = new AreaLevelDO();
+            areaLevelDO.setAreaLevel(0);
+            areaLevelDO.setAreaCode("0");
+            areaLevelDO.setAreaName("国家粮食交易中心");
+            areaLevelDO.setId(0L);
+            allAreaLevels.add(areaLevelDO);
+            redisTemplate.opsForValue().set(ALL_AREA_LEVEL_KEY, allAreaLevels);
+        } catch (Exception e) {
+            // 发生异常时回滚数据库事务
+            throw e;
+        }
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void deleteAreaLevel(Long id) {
-        // 校验存在
-        validateAreaLevelExists(id);
-        // 删除
-        areaLevelMapper.deleteById(id);
+        try {
+            // 校验存在
+            validateAreaLevelExists(id);
+            // 删除
+            areaLevelMapper.deleteById(id);
+
+            // 删除缓存
+            redisTemplate.delete(ALL_AREA_LEVEL_KEY);
+
+            // 重新获取并设置缓存
+            List<AreaLevelDO> allAreaLevels = areaLevelMapper.selectList();
+            // 将数据存入 Redis，设置过期时间为不过期
+            AreaLevelDO areaLevelDO = new AreaLevelDO();
+            areaLevelDO.setAreaLevel(0);
+            areaLevelDO.setAreaCode("0");
+            areaLevelDO.setAreaName("国家粮食交易中心");
+            areaLevelDO.setId(0L);
+            allAreaLevels.add(areaLevelDO);
+            redisTemplate.opsForValue().set(ALL_AREA_LEVEL_KEY, allAreaLevels);
+        } catch (Exception e) {
+            // 发生异常时回滚数据库事务
+            throw e;
+        }
     }
 
     private void validateAreaLevelExists(Long id) {
@@ -73,77 +141,133 @@ public class AreaLevelServiceImpl implements AreaLevelService {
     }
 
     @Override
-    public AreaLevelDO getAreaLevel(Integer id) {
-        return areaLevelMapper.selectById(id);
+    public AreaLevelDO getAreaLevel(Long id) {
+        AreaLevelDO resp = new AreaLevelDO();
+
+        List<AreaLevelDO> allAreaLevels = (List<AreaLevelDO>) redisTemplate.opsForValue().get(ALL_AREA_LEVEL_KEY);
+        if (allAreaLevels != null) {
+            for (AreaLevelDO allAreaLevel : allAreaLevels) {
+                if (Objects.equals(id, allAreaLevel.getId())) {
+                    resp = allAreaLevel;
+                    break;
+                }
+            }
+        }else {
+            resp = areaLevelMapper.selectById(id);
+        }
+        return resp;
     }
 
     @Override
     public List<AreaLevelDO> getAreaShengLevel() {
-        return areaLevelMapper.selectShengLevel();
+        List<AreaLevelDO> respList;
+
+        List<AreaLevelDO> allAreaLevels = (List<AreaLevelDO>) redisTemplate.opsForValue().get(ALL_AREA_LEVEL_KEY);
+        if (allAreaLevels != null) {
+            respList = allAreaLevels.stream().filter(areaLevelDO -> areaLevelDO.getAreaLevel() == 1).collect(Collectors.toList());
+        }else {
+            respList = areaLevelMapper.selectShengLevel();
+        }
+        return respList;
 
     }
 
     @Override
     public List<AreaLevelDO> getAreaListByParentCode(String parentCode) {
-        return areaLevelMapper.selectListByParentCode(parentCode);
+        List<AreaLevelDO> respList;
+
+        List<AreaLevelDO> allAreaLevels = (List<AreaLevelDO>) redisTemplate.opsForValue().get(ALL_AREA_LEVEL_KEY);
+        if (allAreaLevels != null) {
+            respList = allAreaLevels.stream().filter(areaLevelDO -> parentCode.equals(areaLevelDO.getParentCode())).collect(Collectors.toList());
+        }else {
+            respList = areaLevelMapper.selectListByParentCode(parentCode);
+        }
+        return respList;
     }
 
     @Override
     public List<AreaLevelDO> getAreaLevelListAll(AdminUserDO user) {
-        log.info("user: {}", user);
-        //国家局或者管理员
-        if (ObjectUtil.isEmpty(user.getAreaLevel()) || user.getAreaLevel() == 0) {
+        // 尝试从 Redis 中获取所有行政区划数据
+        List<AreaLevelDO> allAreaLevels = (List<AreaLevelDO>) redisTemplate.opsForValue().get(ALL_AREA_LEVEL_KEY);
+        if (allAreaLevels == null) {
+            // 如果 Redis 中没有数据，则从数据库中获取
+            allAreaLevels = areaLevelMapper.selectList();
+            // 将数据存入 Redis，设置过期时间为不过期
             AreaLevelDO areaLevelDO = new AreaLevelDO();
             areaLevelDO.setAreaLevel(0);
             areaLevelDO.setAreaCode("0");
             areaLevelDO.setAreaName("国家粮食交易中心");
             areaLevelDO.setId(0L);
-            List<AreaLevelDO> temp = areaLevelMapper.selectList();
-            temp.add(areaLevelDO);
-            return  temp;
+            allAreaLevels.add(areaLevelDO);
+            redisTemplate.opsForValue().set(ALL_AREA_LEVEL_KEY, allAreaLevels);
+        }
 
+        // 国家局或者管理员
+        if (ObjectUtil.isEmpty(user.getAreaLevel()) || user.getAreaLevel() == 0) {
+            return allAreaLevels;
         }
         // 省一级用户
         else if (user.getAreaLevel() == 1) {
-            AreaLevelDO areaLevelDO = areaLevelMapper.selectListByAreaCode(user.getAreaCode());
-            List<AreaLevelDO> temp = getSubAreasRecursively(user.getAreaCode());
-            temp.add(areaLevelDO);
+            AreaLevelDO areaLevelDO = getAreaLevelFromList(allAreaLevels, user.getAreaCode());
+            List<AreaLevelDO> temp = getSubAreasRecursivelyFromList(allAreaLevels, user.getAreaCode());
+            if (areaLevelDO != null) {
+                temp.add(areaLevelDO);
+            }
             return temp;
         }
         // 市一级用户
         else if (user.getAreaLevel() == 2) {
-            AreaLevelDO areaLevelDO = areaLevelMapper.selectListByAreaCode(user.getAreaCode());
-            List<AreaLevelDO> temp = getSubAreasRecursively(user.getAreaCode());
-            temp.add(areaLevelDO);
+            AreaLevelDO areaLevelDO = getAreaLevelFromList(allAreaLevels, user.getAreaCode());
+            List<AreaLevelDO> temp = getSubAreasRecursivelyFromList(allAreaLevels, user.getAreaCode());
+            if (areaLevelDO != null) {
+                temp.add(areaLevelDO);
+            }
             return temp;
         }
         // 县一级用户
         else if (user.getAreaLevel() == 3) {
             // 县级是最低级别，只返回自身
-            AreaLevelDO areaLevelDO = areaLevelMapper.selectListByAreaCode(user.getAreaCode());
-            return Collections.singletonList(areaLevelDO);
+            AreaLevelDO areaLevelDO = getAreaLevelFromList(allAreaLevels, user.getAreaCode());
+            if (areaLevelDO != null) {
+                return Collections.singletonList(areaLevelDO);
+            }
         }
         // 返回空列表或其他默认行为
         return Collections.emptyList();
     }
 
-    @Override
-    public List<AreaLevelDO> getLoginUserXzqhConcise(String areaCode,AdminUserDO user) {
-//        AreaLevelDO areaLevelDO = new AreaLevelDO();
-
-        return areaLevelMapper.selectListByParentCode(areaCode);
+    private AreaLevelDO getAreaLevelFromList(List<AreaLevelDO> allAreaLevels, String areaCode) {
+        for (AreaLevelDO areaLevel : allAreaLevels) {
+            if (areaCode.equals(areaLevel.getAreaCode())) {
+                return areaLevel;
+            }
+        }
+        return null;
     }
 
-    private List<AreaLevelDO> getSubAreasRecursively(String parentCode) {
-        List<AreaLevelDO> subAreas = areaLevelMapper.selectListByParentCode(parentCode);
-        if (ObjectUtil.isEmpty(subAreas) || subAreas.isEmpty()) {
-            return subAreas;
+    private List<AreaLevelDO> getSubAreasRecursivelyFromList(List<AreaLevelDO> allAreaLevels, String parentCode) {
+        List<AreaLevelDO> subAreas = new ArrayList<>();
+        for (AreaLevelDO areaLevel : allAreaLevels) {
+            if (parentCode.equals(areaLevel.getParentCode())) {
+                subAreas.add(areaLevel);
+                subAreas.addAll(getSubAreasRecursivelyFromList(allAreaLevels, areaLevel.getAreaCode()));
+            }
         }
-        List<AreaLevelDO> allSubAreas = new ArrayList<>(subAreas);
-        for (AreaLevelDO area : subAreas) {
-            allSubAreas.addAll(getSubAreasRecursively(area.getAreaCode()));
+        return subAreas;
+    }
+
+    @Override
+    public List<AreaLevelDO> getLoginUserXzqhConcise(String areaCode) {
+        List<AreaLevelDO> respList;
+
+        List<AreaLevelDO> allAreaLevels = (List<AreaLevelDO>) redisTemplate.opsForValue().get(ALL_AREA_LEVEL_KEY);
+        if (allAreaLevels != null) {
+            respList = allAreaLevels.stream().filter(areaLevelDO -> areaCode.equals(areaLevelDO.getParentCode())).collect(Collectors.toList());
+        }else {
+            respList = areaLevelMapper.selectListByParentCode(areaCode);
         }
-        return allSubAreas;
+
+        return respList;
     }
 
     @Override