From 97ad7e7702c7dbcef19d8fc05b23b7357670c6d7 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Thu, 29 Feb 2024 13:26:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java | 6 ++++++
src/main/java/org/springblade/modules/place/service/IPlaceService.java | 5 +++++
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java | 29 +++++++++++++++++++++++++++++
src/main/java/org/springblade/modules/place/controller/PlaceController.java | 8 ++++++++
src/main/resources/application.yml | 1 +
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml | 6 ++++++
6 files changed, 55 insertions(+), 0 deletions(-)
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 83c31e2..39da7d1 100644
--- a/src/main/java/org/springblade/modules/place/controller/PlaceController.java
+++ b/src/main/java/org/springblade/modules/place/controller/PlaceController.java
@@ -294,4 +294,12 @@
public R placeGridCodeHandle() {
return R.data(placeService.placeGridCodeHandle());
}
+
+ /**
+ * 场所二维码绑定处理
+ */
+ @GetMapping("/placeDoorBindHandle")
+ public R placeDoorBindHandle() {
+ return R.data(placeService.placeDoorBindHandle());
+ }
}
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 e49f20e..7c8ff1d 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java
@@ -174,4 +174,10 @@
* @return
*/
List<PlaceEntity> getPlaceNotGridCode();
+
+ /**
+ * 查询对应未的场所 house_code_binds 为空，source = 1 的
+ * @return
+ */
+ List<PlaceEntity> selectPlaceNotDoorBindList();
}
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 d1f27b3..742ae96 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -761,4 +761,10 @@
and lng != ''
</select>
+ <!--查询对应未的场所 house_code_binds 为空，source = 1 的-->
+ <select id="selectPlaceNotDoorBindList" resultType="org.springblade.modules.place.entity.PlaceEntity">
+ select * from jczz_place where is_deleted = 0
+ and source = 1 and house_code_binds is null
+ </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 3a65c4a..fe6782f 100644
--- a/src/main/java/org/springblade/modules/place/service/IPlaceService.java
+++ b/src/main/java/org/springblade/modules/place/service/IPlaceService.java
@@ -170,4 +170,9 @@
* 场所综治网格处理
*/
Object placeGridCodeHandle();
+
+ /**
+ * 场所二维码绑定处理
+ */
+ Object placeDoorBindHandle();
}
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 d98abca..26bf66c 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
@@ -1419,4 +1419,33 @@
}
return null;
}
+
+ /**
+ * 场所二维码绑定处理
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Object placeDoorBindHandle() {
+ // 查询对应未的场所 house_code_binds 为空，source = 1 的
+ List<PlaceEntity> list = baseMapper.selectPlaceNotDoorBindList();
+ // 遍历
+ for (PlaceEntity placeEntity : list) {
+ // 更新
+ placeEntity.setHouseCodeBinds(placeEntity.getHouseCode());
+ updateById(placeEntity);
+ // 查询绑定关系是否已存在
+ QueryWrapper<PlaceDoorEntity> wrapper = new QueryWrapper<>();
+ wrapper.eq("house_code",placeEntity.getHouseCode()).eq("place_id",placeEntity.getId());
+ // 查询
+ PlaceDoorEntity one = placeDoorService.getOne(wrapper);
+ if (null==one){
+ // 新增
+ PlaceDoorEntity placeDoorEntity = new PlaceDoorEntity();
+ placeDoorEntity.setPlaceId(placeEntity.getId());
+ placeDoorEntity.setHouseCode(placeEntity.getHouseCode());
+ placeDoorService.save(placeDoorEntity);
+ }
+ }
+ return null;
+ }
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 5ae8ee6..d24dddc 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -239,6 +239,7 @@
- /blade-topics/topics/lists
- /blade-household/household/getHouseholdOtherInfo
- /blade-resource/oss/endpoint/put-file
+ - /blade-resource/oss/endpoint/put-file-attach-by-prefix-path
- /blade-hiddenDangerRecord/**
# - /blade-doorplateAddress/doorplateAddress/**
# - /blade-house/house/**
--
Gitblit v1.9.3