Merge remote-tracking branch 'origin/dev_abandon_grid' into develop

# Conflicts:
#	epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/CommonAggFeignClient.java
#	epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonAggFeignClientFallback.java

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRegGridChangeRecDao.java

@@ -0,0 +1,16 @@
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.UserRegGridChangeRecEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 用户注册网格变更记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-03-17
+ */
+@Mapper
+public interface UserRegGridChangeRecDao extends BaseDao<UserRegGridChangeRecEntity> {
+	
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/UserRegGridChangeRecEntity.java

@@ -0,0 +1,41 @@
+package com.epmet.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 用户注册网格变更记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-03-17
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("user_reg_grid_change_rec")
+public class UserRegGridChangeRecEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户id
+     */
+	private String customerId;
+
+    /**
+     * 居民端用户id
+     */
+	private String userId;
+
+    /**
+     * 原始网格id
+     */
+	private String originGridId;
+
+    /**
+     * 当前所选择的注册网格
+     */
+	private String gridId;
+
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java

@@ -75,6 +75,9 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     private UserBadgeCertificateRecordDao userBadgeCertificateRecordDao;
     @Autowired
     private UserBaseInfoRedis userBaseInfoRedis;
+    @Autowired
+    private UserRegGridChangeRecDao UserRegGridChangeRecDao;
+
 
     private static final Logger log = LoggerFactory.getLogger(UserServiceImpl.class);
 
@@ -438,8 +441,9 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     @Override
     public void modifyRegGrid(ModifyRegGridFormDTO formDTO) {
         GridInfoCache newGridInfo= CustomerOrgRedis.getGridInfo(formDTO.getGridId());
-        if (null == newGridInfo) {
+        RegisterRelationEntity originReg=registerRelationDao.selectRegisteredGridIdByUserIdAndCustomerId(formDTO.getUserId(),formDTO.getCustomerId());
-            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "居民端_修改注册网格:查询当前网格信息异常", "服务器开小差了...");
+        if (null == newGridInfo || null == originReg) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "居民端_修改注册网格:查询网格信息异常", "服务器开小差了...");
         }
         //修改register_relation表
         LambdaQueryWrapper<RegisterRelationEntity> originWrapper=new LambdaQueryWrapper();
@@ -487,6 +491,13 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
 
         //4、删除用户缓存信息
         userBaseInfoRedis.clearUserCache(Arrays.asList(formDTO.getUserId()));
+        //5、插入用户注册网格变更记录
+        UserRegGridChangeRecEntity log=new UserRegGridChangeRecEntity();
+        log.setCustomerId(formDTO.getCustomerId());
+        log.setUserId(formDTO.getUserId());
+        log.setOriginGridId(originReg.getGridId());
+        log.setGridId(formDTO.getGridId());
+        UserRegGridChangeRecDao.insert(log);
     }
 
     private void modifyVolunteerGrid(ModifyRegGridFormDTO formDTO, GridInfoCache newGridInfo) {

epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.25__create_user_reg_grid_rec.sql

@@ -0,0 +1,14 @@
+CREATE TABLE `user_reg_grid_change_rec` (
+  `ID` varchar(64) NOT NULL COMMENT '主键',
+  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id',
+  `USER_ID` varchar(64) NOT NULL COMMENT '居民端用户id',
+  `ORIGIN_GRID_ID` varchar(64) NOT NULL COMMENT '原始网格id',
+  `GRID_ID` varchar(64) NOT NULL COMMENT '当前所选择的注册网格',
+  `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标识 1删除；0未删除',
+  `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户注册网格变更记录表';

epmet-user/epmet-user-server/src/main/resources/mapper/UserRegGridChangeRecDao.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.UserRegGridChangeRecDao">
+
+
+
+</mapper>