From c02703a1aef70d2bb830c63652df72c98403db39 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 10:58:19 +0800
Subject: [PATCH] 小区用户支持栋，单元+名字查询
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 38 +++++++++++++++++++++++++++++++++-----
1 files changed, 33 insertions(+), 5 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..ad0b2aa 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -62,6 +62,7 @@
import java.util.List;
import java.util.Map;
+import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;
import static org.springblade.core.cache.constant.CacheConstant.USER_CACHE;
/**
@@ -136,7 +137,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 +162,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));
}
@@ -198,6 +199,7 @@
@ApiOperation(value = "修改", notes = "传入User")
public R update(@Valid @RequestBody User user) {
CacheUtil.clear(USER_CACHE);
+ CacheUtil.clear(SYS_CACHE);
return R.status(userService.updateUser(user));
}
@@ -380,10 +382,11 @@
/**
* 获取用户信息
+ *
* @return
*/
@GetMapping("/getUserInfo")
- public R getUserInfo(){
+ public R getUserInfo() {
//根据保安员编码查询保安员信息
return R.data(userService.getUserInfo(AuthUtil.getUserId()));
}
@@ -407,14 +410,28 @@
return R.data(userService.getUserInfoByDistrictId(districtId, building));
}
+ /**
+ * 通过小区id查询用户
+ */
+ @GetMapping("/getUserInfoByDistrictIds")
+ @ApiOperation(value = "通过小区id查询用户")
+ public R<IPage<UserVO>> getUserInfoByDistrictIds(@RequestParam("districtIds") String districtIds
+ , @RequestParam(value = "building", required = false) String building
+ , @RequestParam(value = "unit", required = false) String unit
+ , @RequestParam(value = "name", required = false) String name
+ , Query query) {
+ IPage<User> pages = userService.getUserInfoByDistrictIds(districtIds, building, unit, name, Condition.getPage(query));
+ return R.data(UserWrapper.build().pageVO(pages));
+ }
+
/**
* 通过机构查询物业公司人员
*/
@GetMapping("/getUserInfoByPropertyCompanyId")
@ApiOperation(value = "通过机构查询物业公司人员", notes = "propertyCompanyId")
- public R getUserInfoByPropertyId(@RequestParam("propertyCompanyId") String propertyCompanyId,@RequestParam("roleId") String roleId) {
- return R.data(userService.getUserInfoByPropertyId(propertyCompanyId,roleId));
+ public R getUserInfoByPropertyId(@RequestParam("propertyCompanyId") String propertyCompanyId, @RequestParam("roleId") String roleId) {
+ return R.data(userService.getUserInfoByPropertyId(propertyCompanyId, roleId));
}
/**
@@ -444,4 +461,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