From a7a6a0c332f268010b4da0161cdee80acf9bc4ce Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期一, 22 四月 2024 15:59:57 +0800
Subject: [PATCH] 2024-4-22 资源要求-人员明细-bug修改

---
 user-server/src/main/java/com/yuanchu/mom/controller/UserController.java |   70 ++++++++++++++++++++++++++++++----
 1 files changed, 61 insertions(+), 9 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 0840e7f..a645ff0 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,29 +1,24 @@
 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.dto.Custom;
 import com.yuanchu.mom.dto.UserPageDto;
 import com.yuanchu.mom.pojo.User;
+import com.yuanchu.mom.service.CustomService;
 import com.yuanchu.mom.service.PowerService;
 import com.yuanchu.mom.service.UserService;
 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.beans.factory.annotation.Value;
 import org.springframework.util.DigestUtils;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -39,6 +34,8 @@
     private PowerService powerService;
 
     private Jwt jwt;
+
+    private CustomService customService;
 
     @ApiOperation(value = "鐧诲綍")
     @PostMapping("/enter")
@@ -118,4 +115,59 @@
         return Result.success(userService.addUser(user));
     }
 
+    @ApiOperation(value = "鑾峰彇鐢ㄦ埛淇℃伅鏋氫妇")
+    @GetMapping("/getUserMenu")
+    @ValueAuth
+    public Result<?> getUserMenu() {
+        return Result.success(userService.getUserMenu());
+    }
+
+    @ApiOperation(value = "鑾峰彇瀹㈡埛鍒楄〃")
+    @PostMapping("/selectCustomPageList")
+    public Result selectCustomPageList(@RequestBody Map<String, Object> data) throws Exception {
+        Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
+        Custom custom = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), Custom.class);
+        return Result.success(customService.selectCustomPageList(page, custom));
+    }
+
+    @ApiOperation(value = "鍒犻櫎瀹㈡埛淇℃伅")
+    @PostMapping("/delCustomById")
+    public Result<?> delCustomById(Integer id) {
+        return Result.success(customService.delCustomById(id));
+    }
+
+    @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