From ec0b9ca6fa9ab291af13c9068cc5f16650c5a6a8 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 05 Jan 2024 10:56:28 +0800
Subject: [PATCH] 新增商超历史数据处理，楼盘户室数据查询修改
---
src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml | 2 +-
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java | 6 ++++++
src/main/java/org/springblade/modules/place/service/IPlaceService.java | 6 ++++++
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java | 22 ++++++++++++++++++++++
src/main/java/org/springblade/modules/place/controller/PlaceController.java | 9 +++++++++
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml | 11 ++++++++++-
6 files changed, 54 insertions(+), 2 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 6aae2fb..0822896 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
+++ b/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
diff --git a/src/main/java/org/springblade/modules/place/controller/PlaceController.java b/src/main/java/org/springblade/modules/place/controller/PlaceController.java
index d106a53..ba95ec8 100644
--- a/src/main/java/org/springblade/modules/place/controller/PlaceController.java
+++ b/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")
diff --git a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java
index 66da194..24b859a 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java
@@ -102,4 +102,10 @@
* @return
*/
List<PlaceEntity> getPlaceListByNoExt();
+
+ /**
+ * 商超数据处理
+ * @return
+ */
+ List<PlaceEntity> placeAndRelHandle();
}
diff --git a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
index d200107..d34ab7d 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
+++ b/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>
diff --git a/src/main/java/org/springblade/modules/place/service/IPlaceService.java b/src/main/java/org/springblade/modules/place/service/IPlaceService.java
index 23828ab..ed10cab 100644
--- a/src/main/java/org/springblade/modules/place/service/IPlaceService.java
+++ b/src/main/java/org/springblade/modules/place/service/IPlaceService.java
@@ -115,4 +115,10 @@
* @return
*/
Object historyPlaceExtHandle(PlaceVO place);
+
+ /**
+ * 商超数据处理
+ * @return
+ */
+ Object placeAndRelHandle();
}
diff --git a/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java b/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
index 03700c7..5aa382b 100644
--- a/src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java
+++ b/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;
+ }
}
--
Gitblit v1.9.3