sql脚本，新建房屋生成code和二维码

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcHouseDTO.java

@@ -111,6 +111,12 @@ public class IcHouseDTO implements Serializable {
      */
 	private BigDecimal sort;
 
+    /**
+     * 房屋编码
+     */
+    private String houseCode;
+    private String houseQrcodeUrl;
+
     /**
      * 删除标识 0未删除、1已删除
      */

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java

@@ -159,7 +159,7 @@ public class HouseController implements ResultDataResolver {
 
     @NoRepeatSubmit
     @PostMapping("houseadd")
-    public Result houseAdd(@LoginUser TokenDto tokenDTO, @RequestBody IcHouseAddFormDTO formDTO) {
+    public Result houseAdd(@LoginUser TokenDto tokenDTO, @RequestBody IcHouseAddFormDTO formDTO) throws Exception {
         //效验数据
         ValidatorUtils.validateEntity(formDTO, IcHouseAddFormDTO.AddShowGroup.class);
         String customerId = tokenDTO.getCustomerId();

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java

@@ -89,4 +89,6 @@ public interface IcNeighborHoodDao extends BaseDao<IcNeighborHoodEntity> {
     void delProperty(@Param("neighborHoodIds")List<String> neighborHoodIds);
 
     void updateOneNeighborHood(ImportGeneralDTO info);
+
+    String getAreaCode(@Param("neighborHoodId")String neighborHoodId);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java

@@ -116,5 +116,5 @@ public class IcHouseEntity extends BaseEpmetEntity {
 	 * 房屋编码
 	 */
 	private String houseCode;
-
+	private String houseQrcodeUrl;
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java

@@ -135,10 +135,24 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
         if (null != count && count > 0) {
             throw new RenException(EpmetErrorCode.DOOR_NAME_EXITED.getCode(), EpmetErrorCode.DOOR_NAME_EXITED.getMsg());
         }
-        IcHouseDTO icHouseDTO = ConvertUtils.sourceToTarget(formDTO, IcHouseDTO.class);
+
+        IcHouseEntity icHouseDTO = ConvertUtils.sourceToTarget(formDTO, IcHouseEntity.class);
         icHouseDTO.setCustomerId(customerId);
         icHouseDTO.setHouseName(getHouseName(formDTO));
-        icHouseService.save(icHouseDTO);
+        //获取所属组织地区码
+        String areaCode = icNeighborHoodDao.getAreaCode(formDTO.getNeighborHoodId());
+        if (StringUtils.isNotBlank(areaCode)) {
+            icHouseDTO.setHouseCode(createHouseCode(customerId, formDTO.getBuildingId(), areaCode));
+        }
+        icHouseDao.insert(icHouseDTO);
+        IcHouseEntity entity = new IcHouseEntity();
+        entity.setId(icHouseDTO.getId());
+        try {
+            entity.setHouseQrcodeUrl(createHouseQrcodeUrl(icHouseDTO.getId()));
+        } catch (Exception e) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"二维码生成失败","二维码生成失败");
+        }
+        icHouseDao.updateById(entity);
     }
 
     private String getHouseName(IcHouseAddFormDTO formDTO) {

epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.21__alter_ic_house.sql

@@ -0,0 +1,10 @@
+alter table ic_house add COLUMN `HOUSE_CODE` varchar(32) DEFAULT NULL COMMENT '房屋编码';
+alter table ic_house add COLUMN `HOUSE_QRCODE_URL` varchar(255) DEFAULT NULL COMMENT '一户一码的二维码地址';
+
+
+CREATE TABLE `ic_house_code_info` (
+      `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id',
+      `BUILDING_ID` varchar(64) NOT NULL COMMENT '所属楼栋id',
+      `BUILDING_MAX_NUM` varchar(10) NOT NULL COMMENT '最大的楼栋编码序列号',
+      `HOUSE_MAX_NUM` varchar(10) NOT NULL COMMENT '该楼栋下最大的房屋编码序列号'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='房屋编码辅助表';

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml

@@ -301,4 +301,11 @@
             del_flag = '0'
         AND grid_id = #{gridId}
     </select>
+    <select id="getAreaCode" resultType="java.lang.String">
+        select AREA_CODE
+        from ic_neighbor_hood a
+        inner join customer_agency b on a.agencyId = b.ID and b.del_flag = '0'
+        where a.del_flag = '0'
+        and a.ID = #{neighborHoodId}
+    </select>
 </mapper>

epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.52__ic_resi_user_confirm.sql

@@ -0,0 +1,39 @@
+CREATE TABLE `ic_resi_user_confirm`
+(
+    `ID`                 varchar(64)  NOT NULL COMMENT '主键',
+    `CUSTOMER_ID`        varchar(64)  NOT NULL COMMENT '客户Id customer.id',
+    `AGENCY_ID`          varchar(64)  NOT NULL COMMENT '组织Id',
+    `PIDS`               varchar(255) NOT NULL COMMENT '组织的pids',
+    `GRID_ID`            varchar(64)  NOT NULL COMMENT '网格ID',
+    `SURNAME`            varchar(64)  NOT NULL COMMENT '姓',
+    `NAME`               varchar(64)  NOT NULL COMMENT '名',
+    `MOBILE`             varchar(15)           DEFAULT NULL COMMENT '手机号',
+    `GENDER`             char(2)               DEFAULT NULL COMMENT '性别',
+    `ID_CARD`            varchar(18)  NOT NULL COMMENT '身份证号',
+    `BIRTHDAY`           varchar(64)           DEFAULT NULL COMMENT '出生日期',
+    `HJSZD`              varchar(256)          DEFAULT NULL COMMENT '户籍所在地',
+    `HJSZD_CODE`         varchar(256)          DEFAULT NULL COMMENT '户籍所在地地区码',
+    `HJSZD_PATH_CODE`    varchar(255)          DEFAULT NULL COMMENT '户籍所在地层级编码',
+    `XJZD`               varchar(256)          DEFAULT NULL COMMENT '现居住地',
+    `XJZD_CODE`          varchar(256)          DEFAULT NULL COMMENT '现居住地地区码',
+    `XJZD_PATH_CODE`     varchar(255)          DEFAULT NULL COMMENT '现居住地层级编码',
+    `XXDZ`               varchar(255)          DEFAULT NULL COMMENT '详细地址',
+    `MZ`                 varchar(64)           DEFAULT NULL COMMENT '民族【字典表】',
+    `MZ_NAME`            varchar(255)          DEFAULT NULL COMMENT '名族名称',
+    `YHZGX`              varchar(64)           DEFAULT NULL COMMENT '与户主关系',
+    `YHZGX_NAME`         varchar(255)          DEFAULT NULL COMMENT '与户主关系名称',
+    `CONFIRM_RESULT`     varchar(64)           DEFAULT '0' COMMENT '审核状态0未审核，1审核通过，2审核不通过',
+    `REASON`             varchar(64)           DEFAULT NULL COMMENT '审核不通过的原因',
+    `DEL_FLAG`           int(11)      NOT NULL DEFAULT '0' COMMENT '删除标识 0.未删除 1.已删除',
+    `REVISION`           int(11)      NOT NULL COMMENT '乐观锁',
+    `CREATED_BY`         varchar(64)  NOT NULL COMMENT '创建人',
+    `CREATED_TIME`       datetime     NOT NULL COMMENT '创建时间',
+    `UPDATED_BY`         varchar(64)  NOT NULL COMMENT '更新人',
+    `UPDATED_TIME`       datetime     NOT NULL COMMENT '更新时间',
+    `IC_RESI_USER_ID`    varchar(64)           DEFAULT NULL COMMENT 'ic_resi_user表id',
+    `SUBMIT_TYPE`        varchar(255)          DEFAULT NULL COMMENT '操作类型：新增add 修改 update 删除 delete',
+    `DELETE_REASON`      varchar(255)          DEFAULT NULL COMMENT '删除原因',
+    `OPERATION_DESCRIBE` varchar(255)          DEFAULT NULL COMMENT '操作说明',
+    PRIMARY KEY (`ID`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4 COMMENT ='居民信息审核表';