From 0d533da5be52688c4f10a53c161c96cc31bf89ad Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 18 Dec 2023 20:24:00 +0800
Subject: [PATCH] 场所数据处理修改
---
src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml | 36 +++++++++--------
src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java | 30 ++++++++-------
2 files changed, 35 insertions(+), 31 deletions(-)
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
index cd9f2b1..1e3dd6e 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
+++ b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
@@ -431,22 +431,24 @@
<!--查询所有的地址表和场所表差集集合(小区和非小区的)-->
<select id="getPlaceList" resultType="org.springblade.modules.doorplateAddress.entity.DoorplateAddressEntity">
- select
- min(jda.id)
- from jczz_doorplate_address jda
- left join jczz_district jd on jda.aoi_code = jd.aoi_code
- where jda.aoi_code != "" and jda.aoi_name !="" and jd.id is null
- and (doorplate_type = '大门牌' or doorplate_type = '楼幢牌' or doorplate_type = '中门牌' or doorplate_type = '单元牌')
- GROUP BY jda.aoi_code
- union all
- (
- select
- min(jda.id)
- from jczz_doorplate_address jda
- left join jczz_district jd on jda.aoi_code = jd.aoi_code
- where jda.aoi_code != "" and jda.sub_aoi != ""
- and (doorplate_type = '大门牌' or doorplate_type = '楼幢牌' or doorplate_type = '中门牌')
- group by jda.aoi_code
- )
+ select jda.* from jczz_doorplate_address jda join (
+ select
+ min(jda.id) as id
+ from jczz_doorplate_address jda
+ left join jczz_district jd on jda.aoi_code = jd.aoi_code
+ where jda.aoi_code != "" and jda.aoi_name !="" and jd.id is null
+ and (doorplate_type = '大门牌' or doorplate_type = '楼幢牌' or doorplate_type = '中门牌' or doorplate_type = '单元牌')
+ GROUP BY jda.aoi_code
+ union all
+ (
+ select
+ min(jda.id) as id
+ from jczz_doorplate_address jda
+ left join jczz_district jd on jda.aoi_code = jd.aoi_code
+ where jda.aoi_code != "" and jda.sub_aoi != ""
+ and (doorplate_type = '大门牌' or doorplate_type = '楼幢牌' or doorplate_type = '中门牌')
+ group by jda.aoi_code
+ )
+ ) a on jda.id = a.id
</select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java b/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
index 2a6d590..ec84d7a 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
@@ -686,21 +686,23 @@
List<DoorplateAddressEntity> list = baseMapper.getPlaceList();
// 创建场所集合对象
List<PlaceEntity> placeList = new ArrayList<>();
- // 将场所数据保存到场所表中
- for (DoorplateAddressEntity addressEntity : list) {
- PlaceEntity placeEntity = new PlaceEntity();
- placeEntity.setHouseCode(addressEntity.getAddressCode());
- placeEntity.setPlaceName(addressEntity.getPoi());
- placeEntity.setLng(addressEntity.getX());
- placeEntity.setLat(addressEntity.getY());
- placeEntity.setLocaltion(addressEntity.getAddressName());
- // 设置来源( 1：地址总表 2：国控采集)
- placeEntity.setSource(1);
- // 加入集合
- placeList.add(placeEntity);
+ if (list.size()>0) {
+ // 将场所数据保存到场所表中
+ for (DoorplateAddressEntity addressEntity : list) {
+ PlaceEntity placeEntity = new PlaceEntity();
+ placeEntity.setHouseCode(addressEntity.getAddressCode());
+ placeEntity.setPlaceName(addressEntity.getPoi());
+ placeEntity.setLng(addressEntity.getX());
+ placeEntity.setLat(addressEntity.getY());
+ placeEntity.setLocaltion(addressEntity.getAddressName());
+ // 设置来源( 1：地址总表 2：国控采集)
+ placeEntity.setSource(1);
+ // 加入集合
+ placeList.add(placeEntity);
+ }
+ // 批量插入
+ placeService.saveBatch(placeList);
}
- // 批量插入
- placeService.saveBatch(placeList);
// 返回
return null;
}
--
Gitblit v1.9.3