zhongrj
2024-01-05 ec0b9ca6fa9ab291af13c9068cc5f16650c5a6a8
新增商超历史数据处理,楼盘户室数据查询修改
6 files modified
56 ■■■■■ changed files
src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml 2 ●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/place/controller/PlaceController.java 9 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java 6 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml 11 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/place/service/IPlaceService.java 6 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java 22 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
@@ -200,7 +200,7 @@
            left join
            (
                SELECT house_code, NAME, relationship FROM jczz_household WHERE id in(
                    SELECT max(id) FROM jczz_household where relationship = 1 GROUP BY house_code
                    SELECT max(id) FROM jczz_household where is_deleted =0 and relationship = 1 GROUP BY house_code
                )
            ) jh
            on jda.address_code = jh.house_code
src/main/java/org/springblade/modules/place/controller/PlaceController.java
@@ -225,6 +225,15 @@
    }
    /**
     * 商超数据处理
     * @return
     */
    @GetMapping("/placeAndRelHandle")
    public R placeAndRelHandle() {
        return R.data(placeService.placeAndRelHandle());
    }
    /**
     * 场所数据处理-用户信息(场所负责人信息写入到场所表)
     */
    @GetMapping("/placeUserHandle")
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java
@@ -102,4 +102,10 @@
     * @return
     */
    List<PlaceEntity> getPlaceListByNoExt();
    /**
     * 商超数据处理
     * @return
     */
    List<PlaceEntity> placeAndRelHandle();
}
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -33,7 +33,7 @@
        select place_id,max(id) as id from jczz_place_poi_label b group by place_id
        ) b on a.id = b.id
        ) jppl on jppl.place_id = jp.id
        where jp.is_deleted = 0
        where jp.is_deleted = 0 and jp.source!=3
        <if test="place.roleName!=null and place.roleName!='' and place.createUser!=null">
            <choose>
                <when test="place.roleName=='网格员'">
@@ -199,4 +199,13 @@
        LEFT JOIN jczz_place_ext jpe on jpe.place_id=jp.id and jpe.is_deleted = 0
        where jp.is_deleted = 0 and jpe.id is null
    </select>
    <!--商超数据处理-->
    <select id="placeAndRelHandle" resultType="org.springblade.modules.place.entity.PlaceEntity">
        select jp.* from jczz_place jp
        left join jczz_place_rel jpr on jp.id = jpr.place_id and jpr.is_deleted =0
        where jpr.id is not null
        and jp.is_deleted = 0
        and jp.source !=3
    </select>
</mapper>
src/main/java/org/springblade/modules/place/service/IPlaceService.java
@@ -115,4 +115,10 @@
     * @return
     */
    Object historyPlaceExtHandle(PlaceVO place);
    /**
     * 商超数据处理
     * @return
     */
    Object placeAndRelHandle();
}
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
@@ -830,4 +830,26 @@
        }
        return null;
    }
    /**
     * 商超数据处理
     * @return
     */
    @Override
    public Object placeAndRelHandle() {
        // 查询未处理的商超数据
        List<PlaceEntity> placeEntityList = baseMapper.placeAndRelHandle();
        // 处理
        for (PlaceEntity placeEntity : placeEntityList) {
            if (Strings.isBlank(placeEntity.getHouseCode())){
                // 并生成36位的houseCode
                placeEntity.setHouseCode(IdUtils.getIdBy36());
                // 商超数据
                placeEntity.setSource(3);
                // 更新
                updateById(placeEntity);
            }
        }
        return null;
    }
}