From 0db95947d72f8fda81d3b4f714ac08ad8ae9de24 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Sat, 03 Feb 2024 14:59:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java | 14 +++++++
src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java | 53 ++++++++++++++++++++++++++
src/main/java/org/springblade/modules/place/vo/PlaceVO.java | 4 +-
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml | 26 ++++++++++++
4 files changed, 94 insertions(+), 3 deletions(-)
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 c417556..a5efc5b 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.java
@@ -151,4 +151,18 @@
* @return
*/
List<PlaceEntity> getPlaceNotJwGridCode();
+
+ /**
+ * 比对两点间的距离是否在1km 范围内(和地址总表位置对比)
+ * @param placeVO
+ * @return
+ */
+ Integer comparisonPosition(@Param("place") PlaceVO placeVO);
+
+ /**
+ * 比对两点间的距离是否在1km 范围内 (和采集的位置对比)
+ * @param placeVO
+ * @return
+ */
+ Boolean comparisonPositionNotHouseCode(@Param("place") PlaceVO placeVO);
}
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 b58fe8f..288ba04 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -232,9 +232,32 @@
</update>
<!--查询场所详情数据-->
+ <!--查询场所详情数据-->
<select id="getDetail" resultMap="detailMap">
select
- jp.*,
+ jp.id,
+ jp.house_code,
+ jp.building_code,
+ jp.principal_user_id,
+ jp.principal,
+ jp.principal_phone,
+ jp.principal_id_card,
+ jp.place_name,
+ if(jp.source=1,jda.x,jp.lng) as lng,
+ if(jp.source=1,jda.y,jp.lat) as lat,
+ if(jp.source=1,jda.address_name,jp.location) as location,
+ jp.image_urls,
+ jp.grid_id,
+ jp.grid_code,
+ jp.jw_grid_code,
+ jp.source,
+ jp.status,
+ jp.is_scene,
+ jp.is_nine,
+ jp.nine_type,
+ jp.is_front,
+ jp.front_type,
+ jp.remark,
bu.real_name as username,bu.phone as phone,
jppl.id as plid,
jppl.place_id,
@@ -250,6 +273,7 @@
left join jczz_category jc on jc.category_no = jppl.poi_code
left join jczz_grid jg on jp.grid_code = jg.grid_code and jg.is_deleted = 0
left join blade_region br on br.code = jg.community_code
+ left join jczz_doorplate_address jda on jda.address_code = jp.house_code
where jp.is_deleted = 0
<if test="place.houseCode!=null and place.houseCode!=''">
and jp.house_code like concat('%',#{place.houseCode},'%')
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 b329bc2..a4c881a 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
@@ -153,6 +153,8 @@
placeVO.setUpdateTime(new Date());
// 查看是否包含houseCode,如果有，则更新
if (!Strings.isBlank(placeVO.getHouseCode())) {
+ // 比对是否1km 范围内(现场)采集
+ setIsScene(placeVO);
// 更新,先查询场所信息
QueryWrapper<PlaceEntity> wrapper = new QueryWrapper<>();
wrapper.eq("is_deleted", 0).eq("house_code", placeVO.getHouseCode());
@@ -173,6 +175,8 @@
// 设置基础数据
placeVO.setCreateUser(AuthUtil.getUserId());
placeVO.setCreateTime(new Date());
+ // 比对是否1km 范围内(现场)采集
+ setIsSceneNotHouseCode(placeVO);
// 设置来源( 1：地址总表 2：国控采集)
placeVO.setSource(2);
// 并生成36位的houseCode
@@ -192,6 +196,8 @@
gridBind(placeVO);
// 网格编号绑定场所-新
gridCodeBind(placeVO);
+ // 警务网格绑定
+ jwGridCodeBind(placeVO);
// 房屋编号绑定
// houseCodeBind(placeVO);
// 返回结果
@@ -199,6 +205,53 @@
}
/**
+ * 警务网格绑定
+ * @param placeVO
+ */
+ public void jwGridCodeBind(PlaceVO placeVO) {
+ if (!Strings.isBlank(placeVO.getLng())) {
+ String point = "'POINT(" + placeVO.getLng() + " " + placeVO.getLat() +")'";
+ // 点落面警务网格
+ List<PoliceAffairsGridEntity> policeAffairsGridEntities
+ = SpringUtil.getBean(IPoliceAffairsGridService.class).spatialAnalysis(point);
+ if (policeAffairsGridEntities.size()>0){
+ // 设置警务网格并更新
+ placeVO.setJwGridCode(policeAffairsGridEntities.get(0).getJwGridCode());
+ }
+ }
+ }
+
+ /**
+ * 设置是否现场采集（1km 范围内）
+ * @param placeVO
+ */
+ public void setIsScene(PlaceVO placeVO) {
+ if (!Strings.isBlank(placeVO.getX()) && !Strings.isBlank(placeVO.getLng())){
+ Integer placeEntity = baseMapper.comparisonPosition(placeVO);
+ if (placeEntity==1){
+ placeVO.setIsScene(1);
+ }else {
+ placeVO.setIsScene(2);
+ }
+ }
+ }
+
+ /**
+ * 设置是否现场采集（1km 范围内）,非地址总表数据
+ * @param placeVO
+ */
+ public void setIsSceneNotHouseCode(PlaceVO placeVO) {
+ if (!Strings.isBlank(placeVO.getX()) && !Strings.isBlank(placeVO.getLng())){
+ boolean flag = baseMapper.comparisonPositionNotHouseCode(placeVO);
+ if (flag){
+ placeVO.setIsScene(1);
+ }else {
+ placeVO.setIsScene(2);
+ }
+ }
+ }
+
+ /**
* 房屋绑定
*
* @param placeVO
diff --git a/src/main/java/org/springblade/modules/place/vo/PlaceVO.java b/src/main/java/org/springblade/modules/place/vo/PlaceVO.java
index 30d3652..fd83d1a 100644
--- a/src/main/java/org/springblade/modules/place/vo/PlaceVO.java
+++ b/src/main/java/org/springblade/modules/place/vo/PlaceVO.java
@@ -130,12 +130,12 @@
private Integer gridId;
/**
- * 经度
+ * 采集人实时经度
*/
private String x;
/**
- * 纬度
+ * 采集人实时纬度
*/
private String y;
--
Gitblit v1.9.3