房屋处理修改

zhongrj

2024-03-12 10f6ac0d366765e8ccc82c68ebd972dc17622a4b

房屋处理修改

 src/main/java/org/springblade/modules/doorplateAddress/controller/DoorplateAddressController.java

@@ -212,8 +212,8 @@
     * @return
     */
    @GetMapping("/houseDataHandle")
    public R dataHandle(){
        return R.data(doorplateAddressService.houseDataHandle());
    public R dataHandle(String townName){
        return R.data(doorplateAddressService.houseDataHandle(townName));
    }

    /**

 src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.java

@@ -163,9 +163,10 @@
                                                     @Param("list") List<String> list);
    /**
     * 查询所有户室数据
     * @param townName
     * @return
     */
    List<DoorplateAddressEntity> getHouseList();
    List<DoorplateAddressEntity> getHouseList(@Param("townName") String townName);

    /**
     * 查询商超
@@ -231,4 +232,11 @@
     * @return
     */
    List<DoorplateAddressVO>  getHouseBuildingCode(String districtId);

    /**
     * 查询绑定房屋总数
     * @param townName
     * @return
     */
    Integer getNotHouseListCount(@Param("townName") String townName);
}

 src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml

@@ -484,6 +484,10 @@
        where 1=1
        and jh.house_code is null
        and doorplate_type = '户室牌'
        <if test="townName!=null and townName!=''">
            and jda.town_street_name like concat('%',#{townName},'%')
        </if>
        limit 0,1000
    </select>

    <!--查询商超-->
@@ -536,16 +540,18 @@
    <!--查询所有的地址表id集合-->
    <select id="getAoiCodeList" resultType="java.lang.Long">
        select
        max(id)
        min(id)
        from jczz_doorplate_address
        where aoi_code != "" and aoi_name !=""
                and doorplate_type = '大门牌'
        GROUP BY aoi_code
        union all
        (
        select
        max(id)
        min(id)
        from jczz_doorplate_address
        where aoi_code != "" and sub_aoi != ""
                and doorplate_type = '大门牌'
        group by aoi_code
        )
    </select>
@@ -676,4 +682,18 @@
          and jda.building_code is not null

    </select>


    <!--查询所有户室数据-->
    <select id="getNotHouseListCount" resultType="java.lang.Integer">
        select count(*) from jczz_doorplate_address jda
        left join jczz_house jh on jh.house_code = jda.address_code
        where 1=1
        and jh.house_code is null
        and doorplate_type = '户室牌'
        <if test="townName!=null and townName!=''">
            and jda.town_street_name like concat('%',#{townName},'%')
        </if>
        limit 0,1000
    </select>
</mapper>

 src/main/java/org/springblade/modules/doorplateAddress/service/IDoorplateAddressService.java

@@ -97,7 +97,7 @@
     * 房屋数据处理
     * @return
     */
    Object houseDataHandle();
    Object houseDataHandle(String townName);

    /**
     * 小区数据处理

 src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java

@@ -712,9 +712,9 @@
     * @return
     */
    @Override
    public Object houseDataHandle() {
    public Object houseDataHandle(String townName) {
        // 处理房屋数据
        handleHouseData();
        handleHouseData(townName);

        return null;
    }
@@ -722,41 +722,49 @@
    /**
     * 处理房屋数据
     */
    private void handleHouseData() {
        // 查询所有户室数据（未入库的）
        List<DoorplateAddressEntity> list = baseMapper.getHouseList();
        // 需要新增的房屋 list
        List<HouseEntity> houseList = new ArrayList<>();
        // 处理户室数据
        for (DoorplateAddressEntity doorplateAddressEntity : list) {
            // 查询是否已存在，存在就插入，不存在则插入
            QueryWrapper<HouseEntity> wrapper = new QueryWrapper<>();
            wrapper.eq("house_code", doorplateAddressEntity.getAddressCode())
                .eq("is_deleted", 0);
            HouseEntity one = houseService.getOne(wrapper);
            if (null == one) {
                HouseEntity houseEntity = new HouseEntity();
                houseEntity.setHouseCode(doorplateAddressEntity.getAddressCode());
                houseEntity.setDistrictCode(doorplateAddressEntity.getAoiCode());
                houseEntity.setDistrictName(doorplateAddressEntity.getAoiName());
                houseEntity.setHouseName(doorplateAddressEntity.getAddressName());
                houseEntity.setFloor(doorplateAddressEntity.getFloor());
                houseEntity.setBuilding(doorplateAddressEntity.getBuildingName());
                houseEntity.setUnit(doorplateAddressEntity.getUnitName());
                houseEntity.setRoom(doorplateAddressEntity.getHouseName());
                houseEntity.setBuildingNo(doorplateAddressEntity.getBuildingCode());
                houseEntity.setCreateUser(AuthUtil.getUserId().toString());
                houseEntity.setCreateTime(new Date());
                houseEntity.setUpdateUser(AuthUtil.getUserId().toString());
                houseEntity.setUpdateTime(new Date());
                // 设置来源 1：地址总表  2：国控采集
                houseEntity.setSource(1);
                // 加入集合
                houseList.add(houseEntity);
    private void handleHouseData(String townName) {
        // 查询总数
        Integer count = baseMapper.getNotHouseListCount(townName);
        if (count>0) {
            int num = count/1000;
            for (int i = 0; i <= num+1; i++) {
                // 查询所有户室数据（未入库的）
                List<DoorplateAddressEntity> list = baseMapper.getHouseList(townName);
                // 需要新增的房屋 list
                List<HouseEntity> houseList = new ArrayList<>();
                // 处理户室数据
                for (DoorplateAddressEntity doorplateAddressEntity : list) {
                    // 查询是否已存在，存在就插入，不存在则插入
                    QueryWrapper<HouseEntity> wrapper = new QueryWrapper<>();
                    wrapper.eq("house_code", doorplateAddressEntity.getAddressCode())
                        .eq("is_deleted", 0);
                    HouseEntity one = houseService.getOne(wrapper);
                    if (null == one) {
                        HouseEntity houseEntity = new HouseEntity();
                        houseEntity.setHouseCode(doorplateAddressEntity.getAddressCode());
                        houseEntity.setDistrictCode(doorplateAddressEntity.getAoiCode());
                        houseEntity.setDistrictName(doorplateAddressEntity.getAoiName());
                        houseEntity.setHouseName(doorplateAddressEntity.getAddressName());
                        houseEntity.setFloor(doorplateAddressEntity.getFloor());
                        houseEntity.setBuilding(doorplateAddressEntity.getBuildingName());
                        houseEntity.setUnit(doorplateAddressEntity.getUnitName());
                        houseEntity.setRoom(doorplateAddressEntity.getHouseName());
                        houseEntity.setBuildingNo(doorplateAddressEntity.getBuildingCode());
                        houseEntity.setCreateUser(AuthUtil.getUserId().toString());
                        houseEntity.setCreateTime(new Date());
                        houseEntity.setUpdateUser(AuthUtil.getUserId().toString());
                        houseEntity.setUpdateTime(new Date());
                        // 设置来源 1：地址总表  2：国控采集
                        houseEntity.setSource(1);
                        // 加入集合
                        houseList.add(houseEntity);
                    }
                }
                // 批量插入
                houseService.saveBatch(houseList);
            }
        }
        // 批量插入
        houseService.saveBatch(houseList);

    }

    /**
@@ -790,6 +798,16 @@
                // 加入集合
                districtService.save(districtEntity);
//                aoiList.add(districtEntity);
            }else {
                // 更新
                one.setCommunityCode(addressEntity.getNeiCode());
                one.setAoiCode(addressEntity.getAoiCode());
                one.setName(addressEntity.getAoiName());
                one.setAddress(addressEntity.getAddressName());
                one.setLng(addressEntity.getX());
                one.setLat(addressEntity.getY());
                // 加入集合
                districtService.updateById(one);
            }
        }
        // 批量插入
@@ -827,6 +845,8 @@
                    placeEntity.setStatus(1);
                    // 默认为非九小场所
                    placeEntity.setIsNine(2);
                    // 默认为现场采集
                    placeEntity.setIsScene(1);
                    // 加入集合
//                    placeList.add(placeEntity);
                    // 保存