场所数据处理修改，查询去除场所名称为空的展示

zhongrj

2024-01-27 0d5aa97bb6a6643f3089746f385261ce083e2797

场所数据处理修改，查询去除场所名称为空的展示

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

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

    /**

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

@@ -198,7 +198,7 @@
     * 查询所有的地址表和场所表差集集合(没有入库的)
     * @return
     */
    List<DoorplateAddressEntity> getNotInPlaceList();
    List<DoorplateAddressEntity> getNotInPlaceList(@Param("townName") String townName);

    /**
     * 查询场所标准地址数据

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

@@ -471,13 +471,12 @@
    <!--查询所有的地址表和场所表差集集合(小区和非小区的)-->
    <select id="getNotInPlaceList" resultType="org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity">
        select jda.* from jczz_doorplate_address jda
        left join jczz_place jp on locate(jda.address_code,jp.house_code)>0 and jp.is_deleted = 0
        left join jczz_place jp on jda.address_code=jp.house_code and jp.is_deleted = 0
        where 1=1
        and (doorplate_type = '小门牌' or (doorplate_type = '中门牌' and address_level = 1))
        and jp.id is null
        and jda.poi != ''
        <if test="doorplateAddress.townStreetName!=null and doorplateAddress.townStreetName!=''">
            and jda.town_street_name like concat('%',#{doorplateAddress.townStreetName},'%')
        <if test="townName!=null and townName!=''">
            and jda.town_street_name like concat('%',#{townName},'%')
        </if>
    </select>


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

@@ -109,7 +109,7 @@
     * 场所数据处理
     * @return
     */
    Object placeDataHandle();
    Object placeDataHandle(String townName);

    /**
     * 门牌地址表（总台账数据） 自定义详情

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

@@ -50,7 +50,10 @@
import org.springblade.modules.house.vo.HouseRentalVO;
import org.springblade.modules.house.vo.HouseholdVO;
import org.springblade.modules.place.entity.PlaceEntity;
import org.springblade.modules.place.entity.PlaceExtEntity;
import org.springblade.modules.place.service.IPlaceExtService;
import org.springblade.modules.place.service.IPlaceService;
import org.springblade.modules.place.vo.PlaceVO;
import org.springblade.modules.system.entity.Region;
import org.springblade.modules.system.service.IRegionService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -71,6 +74,9 @@

    @Autowired
    private IPlaceService placeService;

    @Autowired
    private IPlaceExtService placeExtService;

    @Autowired
    private IHouseService houseService;
@@ -794,36 +800,67 @@
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public Object placeDataHandle() {
    public Object placeDataHandle(String townName) {
        // 查询所有的地址表和场所表差集集合
        List<DoorplateAddressEntity> list = baseMapper.getNotInPlaceList();
        List<DoorplateAddressEntity> list = baseMapper.getNotInPlaceList(townName);
        // 创建场所集合对象
        List<PlaceEntity> placeList = new ArrayList<>();
        if (list.size() > 0) {
            // 将场所数据保存到场所表中
            for (DoorplateAddressEntity addressEntity : list) {
                // pio 名称不为空的进行插入操作
                if (!Strings.isBlank(addressEntity.getPoi())) {
//                if (!Strings.isBlank(addressEntity.getPoi())) {
                    PlaceEntity placeEntity = new PlaceEntity();
                    placeEntity.setHouseCode(addressEntity.getAddressCode());
                    placeEntity.setPlaceName(addressEntity.getPoi());
                    placeEntity.setLng(addressEntity.getX());
                    placeEntity.setLat(addressEntity.getY());
                    placeEntity.setLocation(addressEntity.getAddressName());
                    // 设置来源( 1：地址总表  2：国控采集)
                    // 设置来源( 1：地址总表  2：国控采集 3:商超)
                    placeEntity.setSource(1);
                    // 待完善
                    placeEntity.setStatus(1);
                    // 加入集合
                    placeList.add(placeEntity);
                }
//                    placeList.add(placeEntity);
                    // 保存
                    placeService.save(placeEntity);
                    // 新增场所详情
                    savePlaceExtAndTaskInfo(placeEntity);
//                }
            }
            // 批量插入
            placeService.saveBatch(placeList);
//            savePlaceExtAndTaskInfo(placeList);
        }
        // 返回
        return null;
    }

    /**
     * 新增场所详情
     * @param placeEntity
     */
    public void savePlaceExtAndTaskInfo(PlaceEntity placeEntity) {
        PlaceExtEntity placeExtEntity = new PlaceExtEntity();
        placeExtEntity.setPlaceId(placeEntity.getId());
        // 判断是否已存在，已存在则不新增
        QueryWrapper<PlaceExtEntity> wrapper = new QueryWrapper<>();
        wrapper.eq("is_deleted",0)
            .eq("place_id",placeEntity.getId());
        PlaceExtEntity one = placeExtService.getOne(wrapper);
        if (null == one) {
            placeExtEntity.setPlaceId(placeEntity.getId());
            // 默认给待完善状态
            placeExtEntity.setConfirmFlag(4);
            placeExtEntity.setCreateTime(new Date());
            placeExtEntity.setUpdateTime(new Date());
            placeExtEntity.setCreateUser(AuthUtil.getUserId());
            placeExtEntity.setUpdateUser(AuthUtil.getUserId());
            // 新增场所详情
            placeExtService.save(placeExtEntity);
        }
    }

    /**
     * 门牌地址表（总台账数据） 自定义详情
     */
    @Override

 src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml

@@ -21,6 +21,7 @@
        LEFT JOIN jczz_grid jg ON jp.grid_code = jg.grid_code AND jg.is_deleted = 0
        WHERE
        jpe.is_deleted = 0
        and jp.place_name != ''
        <if test="isAdministrator==2">
            <choose>
                <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">

 src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml

@@ -33,6 +33,7 @@
        ) b on a.id = b.id
        ) jppl on jppl.place_id = jp.id
        where jp.is_deleted = 0 and jp.source!=3
        and jp.place_name != ''
        <if test="place.placeName!=null and place.placeName!=''">
            and jp.place_name like concat('%',#{place.placeName},'%')
        </if>