From e706cc37a9643f2aac1791e45e30817ebcb564ae Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期三, 01 五月 2024 10:13:28 +0800
Subject: [PATCH] 费用统计增加时间段搜索
---
user-server/src/main/java/com/yuanchu/mom/controller/UserController.java | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 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 02b783c..edb5726 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
@@ -2,6 +2,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.dto.UserPageDto;
import com.yuanchu.mom.pojo.User;
@@ -15,8 +16,10 @@
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;
@@ -88,7 +91,7 @@
}
return Result.fail(map.get("info"));
}
-
+ @ValueClassify("鐢ㄦ埛绠＄悊")
@ApiOperation(value = "鑾峰彇鐢ㄦ埛鍒楄〃")
@PostMapping("/selectUserList")
public Result selectUserList(@RequestBody Map<String, Object> data) throws Exception {
@@ -96,7 +99,7 @@
UserPageDto user = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), UserPageDto.class);
return Result.success(userService.selectUserList(page, user));
}
-
+ @ValueClassify("鐢ㄦ埛绠＄悊")
@ApiOperation(value = "淇敼鐢ㄦ埛淇℃伅")
@PostMapping("/updateUser")
public Result<?> updateUser(@RequestBody User user) {
@@ -104,7 +107,7 @@
else user.setPassword(DigestUtils.md5DigestAsHex(user.getPassword().getBytes()));
return Result.success(userService.updateUser(user));
}
-
+ @ValueClassify("鐢ㄦ埛绠＄悊")
@ApiOperation(value = "娣诲姞鐢ㄦ埛淇℃伅")
@PostMapping("/addUser")
public Result<?> addUser(@RequestBody User user) {
@@ -119,7 +122,7 @@
public Result<?> getUserMenu() {
return Result.success(userService.getUserMenu());
}
-
+ @ValueClassify("鐢ㄦ埛绠＄悊")
@ApiOperation(value = "鑾峰彇瀹㈡埛鍒楄〃")
@PostMapping("/selectCustomPageList")
public Result selectCustomPageList(@RequestBody Map<String, Object> data) throws Exception {
@@ -127,13 +130,13 @@
Custom custom = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Custom.class);
return Result.success(customService.selectCustomPageList(page, custom));
}
-
+ @ValueClassify("鐢ㄦ埛绠＄悊")
@ApiOperation(value = "鍒犻櫎瀹㈡埛淇℃伅")
@PostMapping("/delCustomById")
public Result<?> delCustomById(Integer id) {
return Result.success(customService.delCustomById(id));
}
-
+ @ValueClassify("鐢ㄦ埛绠＄悊")
@ApiOperation(value = "鏂板瀹㈡埛淇℃伅")
@PostMapping("/addCustom")
public Result<?> addCustom(@RequestBody Custom custom) {
@@ -150,9 +153,22 @@
@ValueAuth
@GetMapping("/getUserNow")
- @ApiOperation(value = "鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴蜂俊鎭�")
+ @ApiOperation(value = "鑾峰彇褰撳墠鐧诲綍鐨勫鎴蜂俊鎭�")
public Result<?> getUserNow(){
- return null;
+ return Result.success(userService.getUserNow());
}
+ @ValueAuth
+ @GetMapping("/getUserInfo")
+ @ApiOperation(value = "鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴蜂俊鎭�")
+ public Result<?> getUserInfo(){
+ return Result.success(userService.getUserInfo());
+ }
+
+ @PostMapping("/upUserPassword")
+ @ApiOperation(value = "淇敼鐢ㄦ埛瀵嗙爜")
+ @ValueAuth
+ public Result<?> upUserPassword(String oldPassword, String newPassWord){
+ return Result.success(userService.upUserPassword(oldPassword, newPassWord));
+ }
}
--
Gitblit v1.9.3