From 1578f99b76d84133fc63e5902ed70336e60d23cd Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 09 Jun 2022 10:20:59 +0800
Subject: [PATCH] 新增保安員查詢和許可證查詢
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 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 455691d..ad0c3f8 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -56,6 +56,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -140,7 +141,7 @@
@ApiImplicitParam(name = "account", value = "账号名", paramType = "query", dataType = "string"),
@ApiImplicitParam(name = "realName", value = "姓名", paramType = "query", dataType = "string")
})
- public R<IPage<UserVO>> pages(@ApiIgnore User user, Query query) {
+ public R<IPage<UserVO>> pages(@ApiIgnore UserVO user, Query query) {
IPage<User> pages = userService.selectUserPages(Condition.getPage(query), user);
return R.data(UserWrapper.build().pageVO(pages));
}
@@ -190,6 +191,15 @@
public R update(@Valid @RequestBody User user) {
CacheUtil.clear(USER_CACHE);
return R.status(userService.updateUser(user));
+ }
+
+ /**
+ * 修改用户信息
+ */
+ @PostMapping("/updateUser")
+ public R updateUser(@Valid @RequestBody User user) {
+ user.setUpdateTime(new Date());
+ return R.status(userService.updateById(user));
}
/**
@@ -372,5 +382,25 @@
return R.success("吊销成功");
}
+ /**
+ * 查询押运人员
+ *
+ * @return
+ */
+ @GetMapping("/selectPeo")
+ public R selectPeo(@ApiIgnore UserVO user) {
+ List list = userService.selectPeo(user);
+ return R.data(list);
+ }
+
+ /**
+ * 查询保安员信息
+ * @param user
+ * @return
+ */
+ @GetMapping("/getSecurityInfoByIdCardNo")
+ public R getSecurityInfoByIdCardNo(User user){
+ return R.data(userService.getSecurityInfoByIdCardNo(user));
+ }
}
--
Gitblit v1.9.3