双实信息录入-flyway脚本及部分详情代码

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

@@ -17,6 +17,16 @@
 
 package com.epmet.controller;
 
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.IcBuildingDTO;
+import com.epmet.dto.IcBuildingUnitDTO;
+import com.epmet.entity.IcNeighborHoodEntity;
+import com.epmet.service.IcBuildingService;
+import com.epmet.service.IcBuildingUnitService;
+import com.epmet.service.IcNeighborHoodService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -31,5 +41,48 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("houseInformation")
 public class HouseInformationController {
 
+    @Autowired
+    private IcNeighborHoodService icNeighborHoodService;
 
+    @Autowired
+    private IcBuildingService icBuildingService;
+
+    @Autowired
+    private IcBuildingUnitService icBuildingUnitService;
+
+    /**
+    * @describe: 【双实录入】小区详情
+    * @author wangtong
+    * @date 2022/6/28 10:48
+    * @params [neighborhoodId]
+    * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.IcNeighborHoodDTO>
+    */
+    @PostMapping("neighborhoodDetail/{neighborhoodId}")
+    public Result<IcNeighborHoodEntity> neighborhoodDetail(@PathVariable("neighborhoodId") String neighborhoodId){
+        return icNeighborHoodService.neighborhoodDetail(neighborhoodId);
+    }
+
+    /**
+    * @describe: 【双实录入】楼栋详情
+    * @author wangtong
+    * @date 2022/6/28 14:30
+    * @params [buildingId]
+    * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.IcBuildingDTO>
+    */
+    @PostMapping("getBuildingDetail/{buildingId}")
+    public Result<IcBuildingDTO> getBuildingDetail(@PathVariable("buildingId") String buildingId){
+        return icBuildingService.getBuildingDetail(buildingId);
+    }
+
+    /**
+    * @describe: 【双实录入】单元详情
+    * @author wangtong
+    * @date 2022/6/28 15:00
+    * @params [unitId]
+    * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.IcBuildingUnitDTO>
+    */
+    @PostMapping("getUnitDetail/{unitId}")
+    public Result<IcBuildingUnitDTO> getUnitDetail(@PathVariable("unitId") String unitId){
+        return icBuildingUnitService.getUnitDetail(unitId);
+    }
 }

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

@@ -20,6 +20,7 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.IcBuildingDTO;
 import com.epmet.dto.ImportGeneralDTO;
 import com.epmet.entity.IcBuildingEntity;
@@ -122,4 +123,13 @@ public interface IcBuildingService extends BaseService<IcBuildingEntity> {
      * @date 2022/4/27 13:29
      */
     void updateBuilding(ImportGeneralDTO info);
-}
+
+    /**
+     * @describe: 【双实录入】楼栋详情
+     * @author wangtong
+     * @date 2022/6/28 14:30
+     * @params [buildingId]
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.IcBuildingDTO>
+     */
+    Result<IcBuildingDTO> getBuildingDetail(String buildingId);
+}

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

@@ -20,6 +20,7 @@ package com.epmet.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.IcBuildingUnitDTO;
 import com.epmet.entity.IcBuildingUnitEntity;
 
@@ -112,4 +113,13 @@ public interface IcBuildingUnitService extends BaseService<IcBuildingUnitEntity>
      * @Date 2022/2/14 15:42
      */
     IcBuildingUnitDTO getUnitInfo(String buildingId, String unitName);
-}
+
+    /**
+     * @describe: 【双实录入】单元详情
+     * @author wangtong
+     * @date 2022/6/28 15:00
+     * @params [unitId]
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.IcBuildingUnitDTO>
+     */
+    Result<IcBuildingUnitDTO> getUnitDetail(String unitId);
+}

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

@@ -172,4 +172,13 @@ public interface IcNeighborHoodService extends BaseService<IcNeighborHoodEntity>
      * @date 2022/4/27 10:33
      */
     void neighborHoodPropertyUpdate(List<NeighborHoodAndManagementDTO> updateNeighborHoodAndManagement);
+
+    /**
+    * @describe: 【双实录入】小区详情
+    * @author wangtong
+    * @date 2022/6/28 15:04
+    * @params [neighborhoodId]
+    * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.IcNeighborHoodDTO>
+    */
+    Result<IcNeighborHoodEntity> neighborhoodDetail(String neighborhoodId);
 }

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

@@ -25,6 +25,7 @@ import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.IcBuildingDao;
 import com.epmet.dto.IcBuildingDTO;
 import com.epmet.dto.ImportGeneralDTO;
@@ -166,4 +167,9 @@ public class IcBuildingServiceImpl extends BaseServiceImpl<IcBuildingDao, IcBuil
         baseDao.updateBuilding(info);
     }
 
-}
+    @Override
+    public Result<IcBuildingDTO> getBuildingDetail(String buildingId) {
+        return null;
+    }
+
+}

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

@@ -25,6 +25,7 @@ import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.IcBuildingUnitDao;
 import com.epmet.dto.IcBuildingUnitDTO;
 import com.epmet.entity.IcBuildingUnitEntity;
@@ -154,4 +155,9 @@ public class IcBuildingUnitServiceImpl extends BaseServiceImpl<IcBuildingUnitDao
         return ConvertUtils.sourceToTarget(entity, IcBuildingUnitDTO.class);
     }
 
-}
+    @Override
+    public Result<IcBuildingUnitDTO> getUnitDetail(String unitId) {
+        return null;
+    }
+
+}

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

@@ -791,4 +791,9 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
         }
     }
 
+    @Override
+    public Result<IcNeighborHoodEntity> neighborhoodDetail(String neighborhoodId) {
+        return new Result<IcNeighborHoodEntity>().ok(baseDao.selectById(neighborhoodId));
+    }
+
 }

epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.31_add_ic_organization_code_info.sql

@@ -0,0 +1,18 @@
+CREATE TABLE `ic_organization_code_info` (
+  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id',
+  `COMMUNITY_ID` varchar(64) NOT NULL COMMENT '社区id',
+  `NEIGHBOR_MAX_NUM` varchar(10) NOT NULL COMMENT '该社区下最大的小区编码序列号',
+  `BUILDING_MAX_NUM` varchar(10) NOT NULL COMMENT '该社区下最大的楼栋编码序列号',
+  `HOUSE_MAX_NUM` varchar(10) NOT NULL COMMENT '该社区下最大的房屋编码序列号'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='小区/楼栋/房屋编码辅助表';
+
+
+alter table ic_neighbor_hood add COLUMN	`CODING` varchar(64) DEFAULT NULL COMMENT '小区编码';
+alter table ic_neighbor_hood add COLUMN  `SYS_CODING` varchar(64) DEFAULT NULL COMMENT '小区系统编码';
+alter table ic_neighbor_hood add COLUMN  `REAL_BUILDING` int(10) DEFAULT NULL COMMENT '实有楼栋';
+
+alter table ic_building add COLUMN  `CODING` varchar(64) DEFAULT NULL COMMENT '楼栋编码';
+alter table ic_building add COLUMN  `SYS_CODING` varchar(64) DEFAULT NULL COMMENT '楼栋系统编码';
+alter table ic_building add COLUMN  `REAL_PERSON` int(10) DEFAULT NULL COMMENT '实有人口';
+
+alter table ic_neighbor_hood add COLUMN `CODING` varchar(64) DEFAULT NULL COMMENT '房屋可编辑编码';