Merge branch 'master' of http://101.36.160.140:21044/delivery-warehouse-java/delivery-depot-admin into liuj_pc_dev

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/task/vo/TaskDkxxRespVO.java

@@ -7,6 +7,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Schema(description = "APP - 打卡信息 Response VO")
 @Data
@@ -30,6 +31,6 @@ public class TaskDkxxRespVO {
     private String dkdd;
 
     @Schema(description = "拍照信息多个逗号分隔','(INFRA_FILE.ID)")
-    private String pzxx;
+    private List<Long> pzxx;
 
 }

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/task/vo/TaskDkxxSaveVO.java

@@ -5,6 +5,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Schema(description = "APP - 打卡信息 Response VO")
 @Data
@@ -28,7 +29,7 @@ public class TaskDkxxSaveVO {
     private String dkdd;
 
     @Schema(description = "拍照信息多个逗号分隔','(INFRA_FILE.ID)")
-    private String pzxx;
+    private List<Long> pzxx;
 
     @Schema(description = "打卡类型:1:省核验人,2:银行核验人")
     private Integer dkType;

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/task/vo/TaskKqxxRespVO.java

@@ -3,6 +3,7 @@ package com.unis.module.coding.controller.admin.task.vo;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 
 import java.math.BigDecimal;
 
@@ -43,4 +44,25 @@ public class TaskKqxxRespVO {
 
     @Schema(description = "库区图")
     private String resid;
+
+    @Schema(description = "社会信用代码")
+    private String shxydm;
+
+    @Schema(description = "库区编码")
+    private String kqbm;
+
+    @Schema(description = "库区地址-省")
+    private String sheng;
+
+    private Long userId;
+    /**
+     * 用户账号
+     */
+    private String username;
+    /**
+     * 加密后的密码
+     *
+     * 因为目前使用 {@link BCryptPasswordEncoder} 加密器，所以无需自己处理 salt 盐
+     */
+    private String password;
 }

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/task/vo/TaskRespVO.java

@@ -51,4 +51,10 @@ public class TaskRespVO {
     @Schema(description = "核验数量")
     private Integer hyNum;
 
+    @Schema(description = "社会信用代码")
+    private String shxydm;
+
+    @Schema(description = "库区编码")
+    private String kqbm;
+
 }

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/dal/dataobject/dk/DkDO.java

@@ -1,19 +1,23 @@
 package com.unis.module.coding.dal.dataobject.dk;
 
 import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.unis.framework.mybatis.core.dataobject.BaseDO;
+import com.unis.framework.mybatis.core.type.LongListTypeHandler;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * 打卡信息 DO
  *
  * @author 超级管理员
  */
-@TableName("delivery_dk")
+@TableName(value = "delivery_dk",autoResultMap = true)
 @KeySequence("delivery_dk_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -47,7 +51,9 @@ public class DkDO extends BaseDO {
     /**
      * 拍照信息多个逗号分隔','(INFRA_FILE.ID)
      */
-    private String pzxx;
+    @TableField(typeHandler = LongListTypeHandler.class)
+    @Schema(description = "拍照信息多个逗号分隔','(INFRA_FILE.ID)")
+    private List<Long> pzxx;
     /** 打卡类型:1:省核验人,2:银行核验人 */
     private Integer dkType;
 

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/dal/dataobject/spxx/SpxxDO.java

@@ -52,5 +52,24 @@ public class SpxxDO {
      * 是否在线
      */
     private Integer sfzx;
+    /**
+     * 监控点类型
+     */
+    private Integer jkdlx;
+    /**
+     * 所属区域路径
+     */
+    private String ssqylj;
+    /**
+     * 区域路径名称
+     */
+    private String qyljmc;
+    /**
+     * 所属区域路径名称
+     */
+    private String ssqyljmc;
+
+
+
 
 }

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/task/TaskServiceImpl.java

@@ -32,6 +32,7 @@ import com.unis.module.core.enums.ErrorCodeConstants;
 import com.unis.module.core.enums.project.DeliveryHyState;
 import com.unis.module.system.api.permission.PermissionApi;
 import com.unis.module.system.enums.permission.RoleCodeEnum;
+import com.unis.module.system.service.user.AdminUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Service;
@@ -77,6 +78,8 @@ public class TaskServiceImpl implements TaskService {
     private BankMapper bankMapper;
     @Resource
     private UsersMapper usersMapper;
+    @Resource
+    private AdminUserService userService;
 
     @Override
     public IPage<TaskRespVO> getTaskList(TaskPageReqVO pageReqVO) {
@@ -210,6 +213,7 @@ public class TaskServiceImpl implements TaskService {
 
         if(ObjectUtils.isNotEmpty(kqxxDO)) {
 
+            //单位信息
             DwxxDO dwxxDO = dwxxMapper.selectById(kqxxDO.getDwid());
 
             TaskKqxxRespVO kqxx = BeanUtils.toBean(kqxxDO, TaskKqxxRespVO.class);
@@ -218,6 +222,14 @@ public class TaskServiceImpl implements TaskService {
             kqxx.setQyxz(dwxxDO.getQyxz());
             kqxx.setJd(dwxxDO.getJd());
             kqxx.setWd(dwxxDO.getWd());
+
+            // 账号信息
+//            AdminUserDO user = userService.getUserByKqbm(kqxxDO.getKqbm());
+//            if(ObjectUtils.isNotEmpty(user)){
+//                kqxx.setUserId(user.getId());
+//                kqxx.setUsername(user.getUsername());
+//                kqxx.setPassword(user.getPassword());
+//            }
             return kqxx;
         }
 

delivery-module-core/delivery-module-core-biz/src/main/resources/mapper/dk/DkMapper.xml

@@ -13,13 +13,15 @@
             dp.HYRY_ID ,
             dp.HYRY_NAME ,
             dp.HY_STATE ,
+            dk.SHXYDM ,
+            dk.KQBM ,
             COUNT(distinct dc.ID) AS HY_NUM
         FROM
             ${pageReqVO.tableName} dp
+        LEFT JOIN DELIVERY_CAXX dc ON dp.CA_ID = dc.ID
         LEFT JOIN DELIVERY_KQXX dk ON dp.KQ_ID = dk.ID
-        LEFT JOIN DELIVERY_CAXX dc ON dk.ID = dc.KQID AND dc.DELETED = 0
         WHERE
-            dk.DELETED = 0 AND dk.SFZX = 0 and dp.DELETED = 0
+            dk.DELETED = 0 AND dk.SFZX = 0 and dp.DELETED = 0 AND dc.DELETED = 0
         <if test="pageReqVO.sheng != null and pageReqVO.sheng != ''">
             AND dk.SHENG = #{pageReqVO.sheng}
         </if>
@@ -60,9 +62,9 @@
         COUNT(distinct dc.ID) AS HY_NUM
         FROM
         DELIVERY_USERS du
+        LEFT JOIN DELIVERY_CAXX dc ON du.CA_ID = dc.ID
         LEFT JOIN DELIVERY_KQXX dk ON du.KQ_ID = dk.ID
-        LEFT JOIN DELIVERY_CAXX dc ON dk.ID = dc.KQID AND dc.DELETED = 0
-        WHERE dk.DELETED = 0 AND dk.SFZX = 0 and du.DELETED = 0
+        WHERE dk.DELETED = 0 AND dk.SFZX = 0 and du.DELETED = 0 AND dc.DELETED = 0
             <if test="pageReqVO.sheng != null and pageReqVO.sheng != ''">
                 AND dk.SHENG = #{pageReqVO.sheng}
             </if>
@@ -94,8 +96,8 @@
         COUNT(distinct dc.ID) AS HY_NUM
         FROM
         DELIVERY_BANK dp
+        LEFT JOIN DELIVERY_CAXX dc ON dp.CA_ID = dc.ID
         LEFT JOIN DELIVERY_KQXX dk ON dp.KQ_ID = dk.ID
-        LEFT JOIN DELIVERY_CAXX dc ON dk.ID = dc.KQID
         LEFT JOIN DELIVERY_USERS du ON dc.ID = du.CA_ID AND du.DELETED = 0
         WHERE
         dk.DELETED = 0 AND dk.SFZX = 0 and dp.DELETED = 0 AND dc.DELETED = 0
@@ -143,7 +145,7 @@
         FROM
             DELIVERY_KQXX dk
         LEFT JOIN DELIVERY_CAXX dc ON dk.ID = dc.KQID
-        left join DELIVERY_BANK db on dk.ID = db.KQ_ID and db.deleted = 0
+        left join DELIVERY_BANK db on DC.ID = db.CA_ID and db.deleted = 0
         LEFT JOIN DELIVERY_USERS du ON dc.ID = du.CA_ID and du.deleted = 0
         WHERE
             dk.DELETED =0 AND dc.DELETED = 0 AND dk.SFZX = 0

delivery-module-core/delivery-module-core-biz/src/main/resources/mapper/kshzs/KshzsMapper.xml

@@ -35,7 +35,7 @@
     </select>
 
     <select id="selectSpList" parameterType="com.unis.module.coding.controller.admin.kshzs.vo.paramVo" resultType="map">
-        select jkdbm,jkdmc,url from DELIVERY_SPXX;
+        select jkdbm,jkdmc,url from DELIVERY_SPXX
         <where>
             <if test="kqdm!= null and kqdm!= ''">
                 and kqdm = #{kqdm}

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/controller/admin/auth/vo/AuthPermissionInfoRespVO.java

@@ -50,6 +50,28 @@ public class AuthPermissionInfoRespVO {
         @Schema(description = "行政区域编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
         private String uCode;
 
+
+        /**行政区域编码(已选择)*/
+        private String areaCode;
+
+        /**行政区域等级 1-省 2-市 3-区县 4-街道镇 5-村*/
+        private Integer areaLevel;
+
+        /**行政区域编码(省)*/
+        private String shengCode;
+
+        /**行政区域编码(市)*/
+        private String shiCode;
+
+        /**行政区域编码(区县)*/
+        private String xianCode;
+
+        /**银行类型*/
+        private String bankType;
+
+        /**库区编码,库区角色非空(CODING_FMXX.KQDM)*/
+        private String kqbm;
+
     }
 
     @Schema(description = "管理后台 - 登录用户的菜单信息 Response VO")

delivery-module-system/delivery-module-system-biz/src/main/java/com/unis/module/system/controller/admin/user/UserController.java

@@ -1,17 +1,22 @@
 package com.unis.module.system.controller.admin.user;
 
 import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.unis.framework.apilog.core.annotation.ApiAccessLog;
 import com.unis.framework.common.enums.CommonStatusEnum;
 import com.unis.framework.common.pojo.CommonResult;
 import com.unis.framework.common.pojo.PageParam;
 import com.unis.framework.common.pojo.PageResult;
 import com.unis.framework.excel.core.util.ExcelUtils;
+import com.unis.framework.security.core.LoginUser;
+import com.unis.framework.security.core.util.SecurityFrameworkUtils;
 import com.unis.module.system.controller.admin.user.vo.user.*;
 import com.unis.module.system.convert.user.UserConvert;
 import com.unis.module.system.dal.dataobject.dept.DeptDO;
 import com.unis.module.system.dal.dataobject.user.AdminUserDO;
 import com.unis.module.system.enums.common.SexEnum;
+import com.unis.module.system.enums.permission.RoleIdEnum;
 import com.unis.module.system.service.dept.DeptService;
 import com.unis.module.system.service.permission.RoleService;
 import com.unis.module.system.service.user.AdminUserService;
@@ -28,12 +33,17 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
-import java.util.*;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 import static com.unis.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
+import static com.unis.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.unis.framework.common.pojo.CommonResult.error;
 import static com.unis.framework.common.pojo.CommonResult.success;
 import static com.unis.framework.common.util.collection.CollectionUtils.convertList;
+import static com.unis.module.infra.enums.ErrorCodeConstants.ERROR;
 
 @Tag(name = "管理后台 - 用户")
 @RestController
@@ -67,7 +77,26 @@ public class UserController {
                 && (reqVO.getBankType() == null || reqVO.getBankType().isEmpty())) {
             return error(400, "请选择银行类型");
         }
-
+        LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
+        if (ObjectUtils.isEmpty(loginUser)) {
+            throw exception(ERROR, "不存在用户信息");
+        }
+        String roles = loginUser.getInfo().get("roleIds");
+        if (ObjectUtils.isEmpty(roles)) {
+            throw exception(ERROR, "当前用户不存在角色信息");
+        }
+        if (roles.contains("[") && roles.contains("]")) {
+            String roleIdsReal = roles.substring(1, roles.length() - 1);
+            String[] items = roleIdsReal.split(",");
+            List<String> roleIdList = Arrays.asList(items);
+            if (roleIdList.contains(RoleIdEnum.BANK_ADMIN.getRoleId())) {
+                String bankType = loginUser.getInfo().get("bankType");
+                if (StringUtils.isBlank(bankType)) {
+                    throw exception(ERROR, "当前银行用户不存在银行信息");
+                }
+                reqVO.setBankType(bankType);
+            }
+        }
         Long id = userService.createUser(reqVO);
         return success(id);
     }
@@ -198,4 +227,11 @@ public class UserController {
         return success(userService.importUserList(list, updateSupport));
     }
 
+    @PostMapping("/createUserForKq")
+    @Operation(summary = "新增用户")
+    public CommonResult<Long> createUserForKq(@Valid @RequestBody UserSaveReqVO reqVO) {
+
+        Long id = userService.createUser(reqVO);
+        return success(id);
+    }
 }

delivery-module-system/delivery-module-system-biz/src/main/java/com/unis/module/system/controller/admin/user/vo/user/UserSaveReqVO.java

@@ -1,17 +1,15 @@
 package com.unis.module.system.controller.admin.user.vo.user;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.mzt.logapi.starter.annotation.DiffLogField;
 import com.unis.framework.common.validation.Mobile;
 import com.unis.module.system.framework.operatelog.core.DeptParseFunction;
 import com.unis.module.system.framework.operatelog.core.PostParseFunction;
 import com.unis.module.system.framework.operatelog.core.SexParseFunction;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.mzt.logapi.starter.annotation.DiffLogField;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.*;
@@ -119,6 +117,9 @@ public class UserSaveReqVO implements Serializable {
     @Length(min = 4, max = 16, message = "密码长度为 4-16 位")
     private String password;
 
+    @Schema(description = "库区编码", requiredMode = Schema.RequiredMode.REQUIRED, example = "123456")
+    private String kqbm;
+
     @AssertTrue(message = "密码不能为空")
     @JsonIgnore
     public boolean isPasswordValid() {

delivery-module-system/delivery-module-system-biz/src/main/java/com/unis/module/system/dal/mysql/user/AdminUserMapper.java

@@ -49,4 +49,7 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
         return selectList(AdminUserDO::getDeptId, deptIds);
     }
 
+    default AdminUserDO getUserByKqbm(String kqbm){
+        return selectOne(AdminUserDO::getKqbm, kqbm);
+    }
 }

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

delivery-module-system/delivery-module-system-biz/src/main/java/com/unis/module/system/service/user/AdminUserService.java

@@ -1,16 +1,22 @@
 package com.unis.module.system.service.user;
 
 import cn.hutool.core.collection.CollUtil;
+import com.unis.framework.common.pojo.PageResult;
 import com.unis.framework.common.util.collection.CollectionUtils;
 import com.unis.module.system.controller.admin.user.vo.profile.UserProfileUpdatePasswordReqVO;
 import com.unis.module.system.controller.admin.user.vo.profile.UserProfileUpdateReqVO;
-import com.unis.module.system.controller.admin.user.vo.user.*;
-import com.unis.framework.common.pojo.PageResult;
+import com.unis.module.system.controller.admin.user.vo.user.UserImportExcelVO;
+import com.unis.module.system.controller.admin.user.vo.user.UserImportRespVO;
+import com.unis.module.system.controller.admin.user.vo.user.UserPageReqVO;
+import com.unis.module.system.controller.admin.user.vo.user.UserSaveReqVO;
 import com.unis.module.system.dal.dataobject.user.AdminUserDO;
 
 import javax.validation.Valid;
 import java.io.InputStream;
-import java.util.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 后台用户 Service 接口
@@ -201,4 +207,5 @@ public interface AdminUserService {
      */
     boolean isPasswordMatch(String rawPassword, String encodedPassword);
 
+    AdminUserDO getUserByKqbm(String kqbm);
 }

delivery-module-system/delivery-module-system-biz/src/main/java/com/unis/module/system/service/user/AdminUserServiceImpl.java

@@ -4,19 +4,18 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.github.yitter.idgen.YitIdHelper;
+import com.google.common.annotations.VisibleForTesting;
+import com.mzt.logapi.context.LogRecordContext;
+import com.mzt.logapi.service.impl.DiffParseFunction;
+import com.mzt.logapi.starter.annotation.LogRecord;
 import com.unis.framework.common.enums.CommonStatusEnum;
 import com.unis.framework.common.exception.ServiceException;
 import com.unis.framework.common.pojo.PageResult;
-import com.unis.framework.common.util.business.PermissionUtils;
 import com.unis.framework.common.util.collection.CollectionUtils;
 import com.unis.framework.common.util.object.BeanUtils;
 import com.unis.framework.datapermission.core.util.DataPermissionUtils;
-import com.unis.framework.security.core.LoginUser;
 import com.unis.framework.security.core.util.AreaUtils;
-import com.unis.framework.security.core.util.SecurityFrameworkUtils;
 import com.unis.module.infra.api.file.FileApi;
 import com.unis.module.system.controller.admin.user.vo.profile.UserProfileUpdatePasswordReqVO;
 import com.unis.module.system.controller.admin.user.vo.profile.UserProfileUpdateReqVO;
@@ -26,19 +25,13 @@ import com.unis.module.system.controller.admin.user.vo.user.UserPageReqVO;
 import com.unis.module.system.controller.admin.user.vo.user.UserSaveReqVO;
 import com.unis.module.system.dal.dataobject.dept.DeptDO;
 import com.unis.module.system.dal.dataobject.dept.UserPostDO;
-import com.unis.module.system.dal.dataobject.permission.UserRoleDO;
 import com.unis.module.system.dal.dataobject.user.AdminUserDO;
 import com.unis.module.system.dal.mysql.dept.UserPostMapper;
-import com.unis.module.system.dal.mysql.permission.UserRoleMapper;
 import com.unis.module.system.dal.mysql.user.AdminUserMapper;
 import com.unis.module.system.service.dept.DeptService;
 import com.unis.module.system.service.dept.PostService;
 import com.unis.module.system.service.permission.PermissionService;
 import com.unis.module.system.service.tenant.TenantService;
-import com.google.common.annotations.VisibleForTesting;
-import com.mzt.logapi.context.LogRecordContext;
-import com.mzt.logapi.service.impl.DiffParseFunction;
-import com.mzt.logapi.starter.annotation.LogRecord;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
@@ -506,4 +499,8 @@ public class AdminUserServiceImpl implements AdminUserService {
         return passwordEncoder.encode(password);
     }
 
+    @Override
+    public AdminUserDO getUserByKqbm(String kqbm) {
+        return userMapper.getUserByKqbm(kqbm);
+    }
 }