From 8057f891f9f7282a221690f3505b6c724b831619 Mon Sep 17 00:00:00 2001
From: whyczh <hzjl@qq.com>
Date: 星期一, 26 四月 2021 08:51:21 +0800
Subject: [PATCH] 更新用户管理接口

---
 src/main/java/com/whyc/controller/UserController.java |  100 +++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 87 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/whyc/controller/UserController.java b/src/main/java/com/whyc/controller/UserController.java
index 1632b0a..fe4fc6f 100644
--- a/src/main/java/com/whyc/controller/UserController.java
+++ b/src/main/java/com/whyc/controller/UserController.java
@@ -1,9 +1,14 @@
 package com.whyc.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.api.R;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.whyc.dto.Response;
+import com.whyc.pojo.Dept;
+import com.whyc.pojo.Job;
 import com.whyc.pojo.User;
+import com.whyc.service.DeptService;
+import com.whyc.service.JobService;
 import com.whyc.service.LoginService;
 import com.whyc.service.UserService;
 import io.swagger.annotations.*;
@@ -25,41 +30,62 @@
     @Resource
     private UserService userService;
 
+    @Resource
+    private DeptService deptService;
+
+    @Resource
+    private JobService jobService;
+
     @PostMapping
-    @ApiOperation(value = "娣诲姞")
+    @ApiOperation(value = "娣诲姞鐢ㄦ埛")
     public Response add(@RequestBody User user){
         return userService.add(user);
     }
 
     @GetMapping
-    @ApiOperation(value = "鏌ヨbyId")
-    public User getById(@RequestParam int id){
-        return userService.getById(id);
+    @ApiOperation(value = "鏌ヨ鐢ㄦ埛byId")
+    public Response getById(@RequestParam int id){
+        User user = userService.getById(id);
+        if (user==null){
+            return new Response().set(0,null,"姝ょ敤鎴蜂笉瀛樺湪");
+        }
+        return new Response().set(1,user);
     }
 
     @GetMapping("/all")
-    @ApiOperation(value = "鏌ヨ鎵�鏈�")
+    @ApiOperation(value = "鏌ヨ鎵�鏈夌敤鎴�")
     public List<User> getAll(){
         return userService.getAll();
     }
 
     @GetMapping("/page")
-    @ApiOperation(value = "鏌ヨ鍒嗛〉")
-    public IPage<User> getPage(@RequestParam int pageNum,int pageSize){
+    @ApiOperation(value = "鏌ヨ鐢ㄦ埛鍒嗛〉")
+    public IPage<User> getPage(@RequestParam int pageNum,@RequestParam int pageSize){
         Page<Object> page = new Page<>(pageNum, pageSize);
         return userService.getAllWithPage(page);
     }
+    @GetMapping("/search")
+    @ApiOperation(value = "鏌ヨ鐢ㄦ埛鍒嗛〉-鏍规嵁绛涢�夋潯浠�")
+    public Response<IPage<User>> getPageByCondition(@RequestParam int pageNum,@RequestParam int pageSize,@RequestBody User user){
+        return userService.getPageByCondition(pageNum,pageSize,user);
+    }
 
     @PutMapping
-    @ApiOperation(value = "缂栬緫")
-    public boolean update(@RequestBody User user){
+    @ApiOperation(value = "缂栬緫鐢ㄦ埛")
+    public Response update(@RequestBody User user){
         return userService.update(user);
     }
 
-    @DeleteMapping
-    @ApiOperation(value = "鍒犻櫎")
-    public boolean delete(@RequestParam int id){
-        return userService.delete(id);
+    @PutMapping("freezeUser")
+    @ApiOperation(value = "鍐荤粨鐢ㄦ埛")
+    public Response updateUserFreeze(@RequestParam int id){
+        return userService.updateUserFreeze(id);
+    }
+
+    @PutMapping("deleteUser")
+    @ApiOperation(value = "鍒犻櫎鐢ㄦ埛")
+    public Response delete(@RequestParam int id){
+        return userService.deleteUser(id);
     }
 
     /**
@@ -71,4 +97,52 @@
         return userService.loginCheck(request);
     }
 
+
+
+    @GetMapping("/getDepts")
+    @ApiOperation(value = "鑾峰彇閮ㄩ棬")
+    public List<Dept> getDepts(){
+        return deptService.getAll();
+    }
+    @PostMapping("addDept")
+    @ApiOperation(value = "娣诲姞閮ㄩ棬")
+    public Response addDept(@RequestBody Dept dept){
+        return deptService.add(dept);
+    }
+    @PutMapping("updateDept")
+    @ApiOperation(value = "缂栬緫閮ㄩ棬")
+    public Response update(@RequestBody Dept dept){
+        return deptService.update(dept);
+    }
+
+    @DeleteMapping("deleteDept")
+    @ApiOperation(value = "鍒犻櫎閮ㄩ棬")
+    public Response deleteDept(@RequestParam int id){
+        return deptService.delete(id);
+    }
+
+
+    @GetMapping("/getJobs")
+    @ApiOperation(value = "鑾峰彇鑱屽姟")
+    public List<Job> getJobs(){
+        return jobService.getAll();
+    }
+
+    @PostMapping("addJob")
+    @ApiOperation(value = "娣诲姞鑱屽姟")
+    public Response addJob(@RequestBody Job job){
+        return jobService.add(job);
+    }
+    @PutMapping("updateJob")
+    @ApiOperation(value = "缂栬緫鑱屽姟")
+    public Response update(@RequestBody Job job){
+        return jobService.update(job);
+    }
+
+    @DeleteMapping("deleteJob")
+    @ApiOperation(value = "鍒犻櫎鑱屽姟")
+    public Response deleteJob(@RequestParam int id){
+        return jobService.delete(id);
+    }
+
 }

--
Gitblit v1.9.1