From dd664cf0ffa2eeef35c3e6955297b7fa2c903cc3 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 24 十二月 2024 17:03:21 +0800
Subject: [PATCH] 完成截止12.24测试出来的问题
---
user-server/src/main/java/com/yuanchu/mom/controller/UserController.java | 45 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 41 insertions(+), 4 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 9561e48..0e34fed 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
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
import com.yuanchu.mom.annotation.ValueClassify;
-import com.yuanchu.mom.dto.Custom;
+import com.yuanchu.mom.pojo.Custom;
import com.yuanchu.mom.dto.UserPageDto;
import com.yuanchu.mom.pojo.User;
import com.yuanchu.mom.service.CustomService;
@@ -60,6 +60,7 @@
map.put("token", jwtToken);
map.put("reToken", jwtReToken);
map.put("name", user.getName());
+ map.put("userId", user.getId());
map.put("power", powerService.selectPowerByRoleId(user.getRoleId()));
return Result.success("鐧诲綍鎴愬姛", map);
}
@@ -92,6 +93,15 @@
@ValueClassify("鐢ㄦ埛绠＄悊")
@ApiOperation(value = "鑾峰彇鐢ㄦ埛鍒楄〃")
+ @PostMapping("/selectUserList2")
+ public Result selectUserList2(@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.selectUserList(page, user));
+ }
+
+ @ValueAuth
+ @ApiOperation(value = "鑾峰彇鐢ㄦ埛鍒楄〃(鐢ㄤ簬鍏朵粬椤甸潰鑾峰彇鐢ㄦ埛鏁版嵁)")
@PostMapping("/selectUserList")
public Result selectUserList(@RequestBody Map<String, Object> data) throws Exception {
Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
@@ -100,7 +110,7 @@
}
@ValueClassify("浜哄憳鎬昏")
- @ApiOperation(value = "浜哄憳鎬昏")
+ @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);
@@ -143,14 +153,21 @@
@ValueClassify("瀹㈡埛绠＄悊")
@ApiOperation(value = "鍒犻櫎瀹㈡埛淇℃伅")
@PostMapping("/delCustomById")
- public Result<?> delCustomById(Integer id) {
- return Result.success(customService.delCustomById(id));
+ public Result<?> delCustomById(Long id) {
+ return Result.success(customService.removeById(id));
}
@ValueClassify("瀹㈡埛绠＄悊")
@ApiOperation(value = "鏂板瀹㈡埛淇℃伅")
@PostMapping("/addCustom")
public Result<?> addCustom(@RequestBody Custom custom) {
return Result.success(customService.addCustom(custom));
+ }
+
+ @ValueClassify("瀹㈡埛绠＄悊")
+ @ApiOperation(value = "淇敼瀹㈡埛淇℃伅")
+ @PostMapping("/upCustom")
+ public Result<?> upCustom(@RequestBody Custom custom) {
+ return Result.success(customService.upCustom(custom));
}
//鑾峰彇璁惧璐熻矗浜�
@@ -196,4 +213,24 @@
return Result.success(userService.delUserDepardLimsId(id));
}
+ @ValueAuth
+ @GetMapping ("/selectCustomEnum")
+ @ApiOperation(value = "鑾峰彇瀹㈡埛鏋氫妇")
+ public Result<?> selectCustomEnum(){
+ return Result.success(customService.selectCustomEnum());
+ }
+
+ @ValueAuth
+ @GetMapping ("/selectUserDepartmentLimsName")
+ @ApiOperation(value = "鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛閮ㄩ棬")
+ public Result<?> selectUserDepartmentLimsName(){
+ return Result.success("鎴愬姛", userService.selectUserDepartmentLimsName());
+ }
+
+ @ValueAuth
+ @GetMapping ("/selectDepartmentLimsUserList")
+ @ApiOperation(value = "鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛閮ㄩ棬涓嬬殑鎵�鏈夌敤鎴�")
+ public Result<?> selectDepartmentLimsUserList(){
+ return Result.success(userService.selectDepartmentLimsUserList());
+ }
}
--
Gitblit v1.9.3