From 1445170b1d50df05bce2b908d9a5058cdc48635a Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 18 Mar 2024 18:15:45 +0800
Subject: [PATCH] 场所详情修改(网格警格绑定处理)

---
 src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java |   14 +++++++++++++-
 src/main/java/org/springblade/modules/place/service/IPlaceService.java            |   12 ++++++++++++
 src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java    |    4 +++-
 3 files changed, 28 insertions(+), 2 deletions(-)

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 843097e..c53431b 100644
--- a/src/main/java/org/springblade/modules/place/service/IPlaceService.java
+++ b/src/main/java/org/springblade/modules/place/service/IPlaceService.java
@@ -180,4 +180,16 @@
 	 * 企业商超列表查询
 	 */
 	IPage<PlaceVO> selectMallPage(IPage<PlaceVO> page, PlaceVO place);
+
+	/**
+	 * 位置绑定
+	 * @param place
+	 */
+	void policePositionHandle(PlaceVO place);
+
+	/**
+	 * 警格绑定
+	 * @param place
+	 */
+	void jwGridCodeBind(PlaceVO place);
 }
diff --git a/src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java b/src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java
index 1d6c787..4d8c1d2 100644
--- a/src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java
+++ b/src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java
@@ -33,6 +33,7 @@
 import org.springblade.modules.place.service.IPlacePractitionerService;
 import org.springblade.modules.place.service.IPlaceService;
 import org.springblade.modules.place.vo.PlaceExtVO;
+import org.springblade.modules.place.vo.PlaceVO;
 import org.springblade.modules.system.service.IDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -129,7 +130,7 @@
 		updatePlaceInfo(placeExt);
 		// 查询对应已存在的从业人员
 		QueryWrapper<PlacePractitionerEntity> wrapper = new QueryWrapper<>();
-		wrapper.eq("place_id", placeExt.getPlaceId());
+		wrapper.eq("place_id", placeExt.getPlaceId()).eq("is_deleted",0);
 		List<PlacePractitionerEntity> oldList = placePractitionerService.list(wrapper);
 		List<PlacePractitionerEntity> list = placeExt.getPlacePractitioner();
 		// 申明新增,修改,删除集合
@@ -192,6 +193,17 @@
 		}
 		// 更新
 		placeService.updateById(placeEntity);
+		// 警格网格绑定修改
+		if (!Strings.isBlank(placeEntity.getHouseCode()) && !Strings.isBlank(placeEntity.getLng())){
+			PlaceVO placeVO = new PlaceVO();
+			placeVO.setHouseCode(placeEntity.getHouseCode());
+			placeVO.setLng(placeEntity.getLng());
+			placeVO.setLat(placeEntity.getLat());
+			// 网格绑定
+			placeService.policePositionHandle(placeVO);
+			// 警务网格绑定
+			placeService.jwGridCodeBind(placeVO);
+		}
 	}
 
 	/**
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 33dec6f..7d4063d 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
@@ -300,6 +300,7 @@
 	 *
 	 * @param placeVO
 	 */
+	@Override
 	public void jwGridCodeBind(PlaceVO placeVO) {
 		if (!Strings.isBlank(placeVO.getLng())) {
 			String point = "'POINT(" + placeVO.getLng() + " " + placeVO.getLat() + ")'";
@@ -533,7 +534,8 @@
 	 *
 	 * @param placeVO
 	 */
-	private void policePositionHandle(PlaceVO placeVO) {
+	@Override
+	public void policePositionHandle(PlaceVO placeVO) {
 		// 是民警且位置信息存在
 		if (!Strings.isBlank(placeVO.getLng())) {
 			//点坐标解析

--
Gitblit v1.9.3