From 3b75c8cf561035c41d25d5b8765a7c89375ca264 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期日, 12 五月 2024 08:00:32 +0800
Subject: [PATCH] 各bug修复；

---
 user-server/src/main/java/com/yuanchu/mom/controller/UserController.java |   71 +++++++++++++++++++++++++++++------
 1 files changed, 59 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 f0792ec..b9e4160 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,25 @@
 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;
+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 +35,8 @@
     private PowerService powerService;
 
     private Jwt jwt;
+
+    private CustomService customService;
 
     @ApiOperation(value = "鐧诲綍")
     @PostMapping("/enter")
@@ -93,7 +91,7 @@
         }
         return Result.fail(map.get("info"));
     }
-
+    @ValueAuth
     @ApiOperation(value = "鑾峰彇鐢ㄦ埛鍒楄〃")
     @PostMapping("/selectUserList")
     public Result selectUserList(@RequestBody Map<String, Object> data) throws Exception {
@@ -101,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) {
@@ -109,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) {
@@ -124,4 +122,53 @@
     public Result<?> getUserMenu() {
         return Result.success(userService.getUserMenu());
     }
+    @ValueAuth
+    @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));
+    }
+    @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