From c0ab746fd3d5679be6937546876be06ca13021b9 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 13 Mar 2024 12:02:30 +0800
Subject: [PATCH] 通过经纬度查询最近的民警人员
---
src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml | 6 +-
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 20 ++++++++++
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 11 +++++
src/main/java/org/springblade/modules/system/controller/UserController.java | 11 +++++
src/main/java/org/springblade/modules/system/entity/User.java | 13 ++++++
src/main/java/org/springblade/modules/place/entity/PlaceExtEntity.java | 30 +++++++-------
src/main/java/org/springblade/modules/system/mapper/UserMapper.java | 8 ++++
src/main/java/org/springblade/modules/system/service/IUserService.java | 8 ++++
src/main/java/org/springblade/modules/place/entity/PlacePractitionerEntity.java | 11 +++++
9 files changed, 100 insertions(+), 18 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/entity/PlaceExtEntity.java b/src/main/java/org/springblade/modules/place/entity/PlaceExtEntity.java
index 9bc7146..421c460 100644
--- a/src/main/java/org/springblade/modules/place/entity/PlaceExtEntity.java
+++ b/src/main/java/org/springblade/modules/place/entity/PlaceExtEntity.java
@@ -164,21 +164,21 @@
// private String legalWxAccount;
- /** 生日 */
- @ApiModelProperty(value = "生日", example = "")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @TableField("birthday")
- private Date birthday;
-
- /** 民族 */
- @ApiModelProperty(value = "民族", example = "")
- @TableField("ethnicity")
- private Integer ethnicity;
-
- /** 工作单位(就职单位) */
- @ApiModelProperty(value = "工作单位(就职单位)", example = "")
- @TableField("employer")
- private String employer;
+// /** 生日 */
+// @ApiModelProperty(value = "生日", example = "")
+// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+// @TableField("birthday")
+// private Date birthday;
+//
+// /** 民族 */
+// @ApiModelProperty(value = "民族", example = "")
+// @TableField("ethnicity")
+// private Integer ethnicity;
+//
+// /** 工作单位(就职单位) */
+// @ApiModelProperty(value = "工作单位(就职单位)", example = "")
+// @TableField("employer")
+// private String employer;
/** 房东名字 */
@ApiModelProperty(value = "房东名字", example = "")
diff --git a/src/main/java/org/springblade/modules/place/entity/PlacePractitionerEntity.java b/src/main/java/org/springblade/modules/place/entity/PlacePractitionerEntity.java
index 8384c31..65a10b7 100644
--- a/src/main/java/org/springblade/modules/place/entity/PlacePractitionerEntity.java
+++ b/src/main/java/org/springblade/modules/place/entity/PlacePractitionerEntity.java
@@ -135,4 +135,15 @@
private Integer isDeleted;
+ /** 0:否 1：是 前科 */
+ @ApiModelProperty(value = "0:否 1：是 前科", example = "")
+ @TableField("criminal_record_flag")
+ private Integer criminalRecordFlag;
+
+ /** 0:否 1：是 假身份证 */
+ @ApiModelProperty(value = "0:否 1：是 假身份证", example = "")
+ @TableField("fake_id_card")
+ private Integer fakeIdCard;
+
+
}
diff --git a/src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml b/src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml
index 8bc5a6b..9001fad 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceExtMapper.xml
@@ -218,9 +218,9 @@
<!-- <result property="legalRegisteredAddress" column="legal_registered_address" />-->
<!-- <result property="legalJobNature" column="legal_job_nature" />-->
<!-- <result property="legalWxAccount" column="legal_wx_account" />-->
- <result property="birthday" column="birthday" />
- <result property="ethnicity" column="ethnicity" />
- <result property="employer" column="employer" />
+<!-- <result property="birthday" column="birthday" />-->
+<!-- <result property="ethnicity" column="ethnicity" />-->
+<!-- <result property="employer" column="employer" />-->
</resultMap>
<sql id="selectJczzPlaceExt">
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 881a73f..1047f0e 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -453,4 +453,15 @@
return R.success("操作成功");
}
+ /**
+ * 通过经纬度查询最近的民警人员
+ * longitude
+ * latitude
+ */
+ @GetMapping("/getPoliceUser")
+ @ApiOperation(value = "查询物业人员/网格人员")
+ public R getPoliceUser(@RequestParam("distrlongitudeictId") String longitude, @RequestParam(value = "latitude", required = false) String latitude) {
+ return R.data(userService.getPoliceUser(longitude, latitude));
+ }
+
}
diff --git a/src/main/java/org/springblade/modules/system/entity/User.java b/src/main/java/org/springblade/modules/system/entity/User.java
index 2d6f517..0984744 100644
--- a/src/main/java/org/springblade/modules/system/entity/User.java
+++ b/src/main/java/org/springblade/modules/system/entity/User.java
@@ -16,7 +16,9 @@
*/
package org.springblade.modules.system.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.springblade.core.tenant.mp.TenantEntity;
@@ -92,5 +94,16 @@
*/
private String postId;
+ /** 经度 */
+ @ApiModelProperty(value = "经度", example = "")
+ @TableField("lng")
+ private String lng;
+
+ /** 纬度 */
+ @ApiModelProperty(value = "纬度", example = "")
+ @TableField("lat")
+ private String lat;
+
+
}
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
index 43e22fe..e90ffe8 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -129,4 +129,12 @@
* @return
*/
List<UserEntity> selectUserByDept(List<Long> deptIdList);
+
+ /**
+ * 通过经纬度查询最近的民警人员
+ * @param longitude
+ * @param latitude
+ * @return
+ */
+ List<User> getPoliceUser(String longitude, String latitude);
}
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index a58dc5d..9b1f1ee 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -282,4 +282,24 @@
</select>
+ <select id="getPoliceUser" resultType="org.springblade.modules.system.entity.User">
+ SELECT
+ bu.*
+ FROM
+ blade_user bu
+ where 1 = 1
+ and bu.lat is not null
+ and bu.lng is not null
+ and IFNULL((
+ ACOS(
+ SIN(
+ (#{latitude} * 3.1415) / 180) * SIN((bu.lat * 3.1415) / 180) +
+ COS((#{latitude} * 3.1415) / 180) * COS((bu.lat * 3.1415) / 180) * COS((#{longitude} * 3.1415) / 180
+ - (bu.lng * 3.1415) / 180)) * 6370.996
+ ), 2) <= 0.5
+ and bu.role_id like concat('%','1727864411451359233','%')
+ and bu.is_deleted = 0
+ </select>
+
+
</mapper>
diff --git a/src/main/java/org/springblade/modules/system/service/IUserService.java b/src/main/java/org/springblade/modules/system/service/IUserService.java
index 48fc873..1785953 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -269,4 +269,12 @@
void importPoliceUser(List<PoliceUserExcel> data);
List<User> getUserInfoByDistrictIds(String districtIds);
+
+ /**
+ * 查询500M内的民警
+ * @param longitude
+ * @param latitude
+ * @return
+ */
+ List<User> getPoliceUser(String longitude, String latitude);
}
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index aa6c93c..3993f6f 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -814,4 +814,15 @@
public List<User> getUserListByDeptIds(String receiveDept) {
return baseMapper.getUserListByDeptIds(receiveDept);
}
+
+ /**
+ * 通过经纬度查询最近的民警人员
+ * @param longitude
+ * @param latitude
+ * @return
+ */
+ @Override
+ public List<User> getPoliceUser(String longitude, String latitude) {
+ return baseMapper.getPoliceUser( longitude, latitude);
+ }
}
--
Gitblit v1.9.3