From c59eeba06fa3ff353cd7c9016aa0a0b25a6931a5 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 04 Jan 2024 18:16:06 +0800
Subject: [PATCH] 商超查询，房屋查询，场所查询修改
---
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
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 4e821d3..03700c7 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
@@ -357,8 +357,8 @@
// 处理单个
String labelCode = labelList.get(0);
// 切割成三个，分别是大类，中类，小类
- String bigString = labelCode.substring(0,2);
- String midString = labelCode.substring(0,4);
+ String bigString = labelCode.substring(0, 2);
+ String midString = labelCode.substring(0, 4);
// 大类
PlacePoiLabel big = new PlacePoiLabel();
big.setPlaceId(placeVO.getId());
@@ -372,7 +372,7 @@
mid.setType(2);
placePoiLabelService.save(mid);
// 处理小类
- if (labelCode.length()>4) {
+ if (labelCode.length() > 4) {
// 小类
PlacePoiLabel min = new PlacePoiLabel();
min.setPlaceId(placeVO.getId());
@@ -545,7 +545,7 @@
List<DoorplateAddressEntity> list = doorplateAddressService.list(wrapper);
if (list.size() > 0) {
placeVO.setDoorplateAddressEntity(list.get(0));
- placeVO.setNeiCode(list.get(0).getNeiCode().replaceAll("0+$", ""));
+ placeVO.setNeiCode(list.get(0).getNeiCode());
}
// 查询网格数据
GridVO gridVO = gridService.getGridDetailByHouseCode(place.getHouseCode());
@@ -638,6 +638,7 @@
* @param isCovered
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public void importAndRelPlace(List<PlaceAndRelExcel> data, Boolean isCovered) {
for (PlaceAndRelExcel placeExcel : data) {
// 判断是否存在，不存在则插入，否则不操作
@@ -656,6 +657,10 @@
placeEntity.setCreateUser(AuthUtil.getUserId());
placeEntity.setUpdateTime(new Date());
placeEntity.setUpdateUser(AuthUtil.getUserId());
+ // 并生成36位的houseCode
+ placeEntity.setHouseCode(IdUtils.getIdBy36());
+ // 商超数据
+ placeEntity.setSource(3);
//一个一个插入，防止同一个表中有相同的数据
save(placeEntity);
// 插入标签关系表
--
Gitblit v1.9.3