From 10de56ca16261e6a4eec49dfd32f0a6b232f7baf Mon Sep 17 00:00:00 2001
From: 晏有为 <13214124+yan-youwei@user.noreply.gitee.com>
Date: 星期四, 23 五月 2024 19:05:08 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-after
---
user-server/src/main/java/com/yuanchu/mom/controller/UserController.java | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java b/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
index edb5726..9561e48 100644
--- a/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
+++ b/user-server/src/main/java/com/yuanchu/mom/controller/UserController.java
@@ -16,10 +16,8 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.util.DigestUtils;
import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
import java.util.HashMap;
import java.util.Map;
@@ -91,6 +89,7 @@
}
return Result.fail(map.get("info"));
}
+
@ValueClassify("鐢ㄦ埛绠＄悊")
@ApiOperation(value = "鑾峰彇鐢ㄦ埛鍒楄〃")
@PostMapping("/selectUserList")
@@ -99,6 +98,16 @@
UserPageDto user = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), UserPageDto.class);
return Result.success(userService.selectUserList(page, user));
}
+
+ @ValueClassify("浜哄憳鎬昏")
+ @ApiOperation(value = "浜哄憳鎬昏")
+ @PostMapping("/selectPersonnelOverview")
+ public Result selectPersonnelOverview(@RequestBody Map<String, Object> data) throws Exception {
+ Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
+ UserPageDto user = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), UserPageDto.class);
+ return Result.success(userService.selectPersonnelOverview(page, user));
+ }
+
@ValueClassify("鐢ㄦ埛绠＄悊")
@ApiOperation(value = "淇敼鐢ㄦ埛淇℃伅")
@PostMapping("/updateUser")
@@ -122,7 +131,8 @@
public Result<?> getUserMenu() {
return Result.success(userService.getUserMenu());
}
- @ValueClassify("鐢ㄦ埛绠＄悊")
+
+ @ValueClassify("瀹㈡埛绠＄悊")
@ApiOperation(value = "鑾峰彇瀹㈡埛鍒楄〃")
@PostMapping("/selectCustomPageList")
public Result selectCustomPageList(@RequestBody Map<String, Object> data) throws Exception {
@@ -130,13 +140,13 @@
Custom custom = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Custom.class);
return Result.success(customService.selectCustomPageList(page, custom));
}
- @ValueClassify("鐢ㄦ埛绠＄悊")
+ @ValueClassify("瀹㈡埛绠＄悊")
@ApiOperation(value = "鍒犻櫎瀹㈡埛淇℃伅")
@PostMapping("/delCustomById")
public Result<?> delCustomById(Integer id) {
return Result.success(customService.delCustomById(id));
}
- @ValueClassify("鐢ㄦ埛绠＄悊")
+ @ValueClassify("瀹㈡埛绠＄悊")
@ApiOperation(value = "鏂板瀹㈡埛淇℃伅")
@PostMapping("/addCustom")
public Result<?> addCustom(@RequestBody Custom custom) {
@@ -171,4 +181,19 @@
public Result<?> upUserPassword(String oldPassword, String newPassWord){
return Result.success(userService.upUserPassword(oldPassword, newPassWord));
}
+
+ @ValueClassify("浜哄憳鏄庣粏")
+ @PostMapping("/upUserDepardLimsId")
+ @ApiOperation(value = "淇敼浜哄憳鏄庣粏鎵�鍦ㄧ粍缁囨灦鏋�")
+ public Result<?> upUserDepardLimsId(String ids, String id){
+ return Result.success(userService.upUserDepardLimsId(ids, id));
+ }
+
+ @ValueClassify("浜哄憳鏄庣粏")
+ @PostMapping("/delUserDepardLimsId")
+ @ApiOperation(value = "鍒犻櫎浜哄憳鏄庣粏鎵�鍦ㄧ粍缁囨灦鏋�")
+ public Result<?> delUserDepardLimsId(Integer id){
+ return Result.success(userService.delUserDepardLimsId(id));
+ }
+
}
--
Gitblit v1.9.3