From 31cf479562e2a03b8318540075f611339ca3690a Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期三, 22 五月 2024 16:34:15 +0800
Subject: [PATCH] 2024-5-22 人员总览切换接口
---
user-server/src/main/java/com/yuanchu/mom/controller/UserController.java | 56 ++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 44 insertions(+), 12 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 78811e3..507d143 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
@@ -1,12 +1,8 @@
package com.yuanchu.mom.controller;
-import cn.hutool.http.HttpUtil;
-import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
-import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.annotation.ValueAuth;
-import com.yuanchu.mom.common.PrintChina;
+import com.yuanchu.mom.annotation.ValueClassify;
import com.yuanchu.mom.dto.Custom;
import com.yuanchu.mom.dto.UserPageDto;
import com.yuanchu.mom.pojo.User;
@@ -16,15 +12,11 @@
import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.utils.Jwt;
import com.yuanchu.mom.utils.RedisUtil;
-import com.yuanchu.mom.utils.ServletUtils;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.DigestUtils;
-import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
@@ -98,6 +90,7 @@
return Result.fail(map.get("info"));
}
+ @ValueClassify("鐢ㄦ埛绠＄悊")
@ApiOperation(value = "鑾峰彇鐢ㄦ埛鍒楄〃")
@PostMapping("/selectUserList")
public Result selectUserList(@RequestBody Map<String, Object> data) throws Exception {
@@ -106,6 +99,16 @@
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")
public Result<?> updateUser(@RequestBody User user) {
@@ -113,7 +116,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) {
@@ -129,6 +132,7 @@
return Result.success(userService.getUserMenu());
}
+ @ValueClassify("瀹㈡埛绠＄悊")
@ApiOperation(value = "鑾峰彇瀹㈡埛鍒楄〃")
@PostMapping("/selectCustomPageList")
public Result selectCustomPageList(@RequestBody Map<String, Object> data) throws Exception {
@@ -136,17 +140,45 @@
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) {
return Result.success(customService.addCustom(custom));
}
+ //鑾峰彇璁惧璐熻矗浜�
+ @ValueAuth
+ @ApiOperation(value = "鑾峰彇璁惧璐熻矗浜�")
+ @GetMapping("/getDeviceManager")
+ public Result<?> getDeviceManager() {
+ return Result.success(userService.getDeviceManager());
+ }
+
+ @ValueAuth
+ @GetMapping("/getUserNow")
+ @ApiOperation(value = "鑾峰彇褰撳墠鐧诲綍鐨勫鎴蜂俊鎭�")
+ public Result<?> getUserNow(){
+ 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