From 8a881a2c54673d4223425f17bc5cae8eef4e5649 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 22 Mar 2024 17:26:43 +0800
Subject: [PATCH] 反诈宣传和反诈预警查询调整
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
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 4ba852e..baaa983 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -136,7 +136,7 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "搜索用户", notes = "传入name")
@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
- public R<List<UserVO>> searchUser(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
+ public R<List<UserVO>> searchUser(@ApiIgnore User user, Query query, String deptId, BladeUser bladeUser) {
IPage<User> pages = userService.selectUserPage(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId()));
return R.data(UserWrapper.build().listVO(pages.getRecords()));
}
@@ -161,7 +161,7 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "列表", notes = "传入account和realName")
// @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
- public R<IPage<UserVO>> page(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
+ public R<IPage<UserVO>> page(@ApiIgnore User user, Query query, String deptId, BladeUser bladeUser) {
IPage<User> pages = userService.selectUserPage(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId()));
return R.data(UserWrapper.build().pageVO(pages));
}
@@ -407,6 +407,15 @@
return R.data(userService.getUserInfoByDistrictId(districtId, building));
}
+ /**
+ * 通过小区id查询物业人员/网格人员
+ */
+ @GetMapping("/getUserInfoByDistrictIds")
+ @ApiOperation(value = "查询物业人员By小区id", notes = "houseCode")
+ public R getUserInfoByDistrictIds(@RequestParam("districtIds") String districtIds) {
+ return R.data(userService.getUserInfoByDistrictIds(districtIds));
+ }
+
/**
* 通过机构查询物业公司人员
@@ -444,4 +453,15 @@
return R.success("操作成功");
}
+ /**
+ * 通过经纬度查询最近的民警人员
+ * longitude
+ * latitude
+ */
+ @GetMapping("/getPoliceUser")
+ @ApiOperation(value = "通过经纬度查询最近的民警人员")
+ public R getPoliceUser(@RequestParam("longitude") String longitude, @RequestParam(value = "latitude") String latitude,@RequestParam(value = "houseCode",required = false) String houseCode) {
+ return R.data(userService.getPoliceUser(longitude, latitude,houseCode));
+ }
+
}
--
Gitblit v1.9.3