From fe9e3a7e341f4979beb09d287a5ee761c660e728 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 10 May 2021 14:54:19 +0800
Subject: [PATCH] screen-manage                 添加组织返回字段

---
 screen-api/src/main/java/com/moral/api/controller/UserController.java |   37 +++++++++++--------------------------
 1 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/controller/UserController.java b/screen-api/src/main/java/com/moral/api/controller/UserController.java
index 8f582ab..a9dfc17 100644
--- a/screen-api/src/main/java/com/moral/api/controller/UserController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/UserController.java
@@ -21,7 +21,6 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.moral.api.entity.User;
 import com.moral.api.service.UserService;
-import com.moral.api.utils.OperationLogUtils;
 import com.moral.constant.ResponseCodeEnum;
 import com.moral.constant.ResultMessage;
 import com.moral.util.PageResult;
@@ -39,21 +38,16 @@
     @ApiImplicitParams({
             @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
     })
-    @RequestMapping(value = "addUser", method = RequestMethod.POST)
-    public ResultMessage addUser(@RequestBody User user, HttpServletRequest request) {
+    @RequestMapping(value = "insert", method = RequestMethod.POST)
+    public ResultMessage insert(@RequestBody User user) {
         if (user.getAccount().isEmpty() || user.getPassword().isEmpty()) {
             return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
                     ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
         }
-        String token = request.getHeader("token");
-        Map<String, Object> result = userService.addUser(user, token);
+        Map<String, Object> result = userService.addUser(user);
         if (!result.isEmpty()) {
             return ResultMessage.fail((int) result.get("code"), result.get("msg").toString());
         }
-
-        //������
-        String content = "������������������" + user.getAccount();
-        OperationLogUtils.insertLog(request, content);
         return ResultMessage.ok();
     }
 
@@ -61,8 +55,8 @@
     @ApiImplicitParams({
             @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
     })
-    @RequestMapping(value = "deleteUser", method = RequestMethod.POST)
-    public ResultMessage deleteUser(@RequestBody User user, HttpServletRequest request) {
+    @RequestMapping(value = "delete", method = RequestMethod.POST)
+    public ResultMessage delete(@RequestBody User user) {
         if (user.getId() == null) {
             return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
                     ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
@@ -75,10 +69,6 @@
                     ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
         }
         userService.deleteUser(user);
-
-        //������
-        String content = "������������������" + user.getAccount();
-        OperationLogUtils.insertLog(request, content);
         return ResultMessage.ok();
     }
 
@@ -86,21 +76,16 @@
     @ApiImplicitParams({
             @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String")
     })
-    @RequestMapping(value = "updateUser", method = RequestMethod.POST)
-    public ResultMessage updateUser(@RequestBody User user, HttpServletRequest request) {
+    @RequestMapping(value = "update", method = RequestMethod.POST)
+    public ResultMessage update(@RequestBody User user) {
         if (user.getId() == null) {
             return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
                     ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
         }
-        String token = request.getHeader("token");
-        Map<String, Object> result = userService.updateUser(user, token);
+        Map<String, Object> result = userService.updateUser(user);
         if (!result.isEmpty()) {
             return ResultMessage.fail((int) result.get("code"), result.get("msg").toString());
         }
-
-        //������
-        String content = "������������������" + user.getAccount();
-        OperationLogUtils.insertLog(request, content);
         return ResultMessage.ok();
     }
 
@@ -109,6 +94,7 @@
             @ApiImplicitParam(name = "page", value = "���������", required = false, paramType = "query", dataType = "Integer"),
             @ApiImplicitParam(name = "size", value = "������������", required = false, paramType = "query", dataType = "Integer"),
             @ApiImplicitParam(name = "order", value = "������������", required = false, paramType = "query", dataType = "String"),
+            @ApiImplicitParam(name = "orderType", value = "������������������������0������������1", defaultValue = "0", required = false, paramType = "query", dataType = "String"),
             @ApiImplicitParam(name = "token", value = "token", required = true, paramType = "header", dataType = "String"),
             @ApiImplicitParam(name = "account", value = "������������������", required = false, paramType = "query", dataType = "String"),
             @ApiImplicitParam(name = "userName", value = "���������������������", required = false, paramType = "query", dataType = "String"),
@@ -117,9 +103,8 @@
             @ApiImplicitParam(name = "wechat", value = "������������������", required = false, paramType = "query", dataType = "String"),
 
     })
-    @RequestMapping(value = "selectUsers", method = RequestMethod.POST)
-    public ResultMessage selectUsers(@RequestBody Map<String, Object> parameters, HttpServletRequest request) {
-        parameters.put("token", request.getHeader("token"));
+    @RequestMapping(value = "select", method = RequestMethod.POST)
+    public ResultMessage select(@RequestBody Map<String, Object> parameters) {
         Page<User> userPage = userService.selectUsers(parameters);
         PageResult<User> pageResult = new PageResult<>(
                 userPage.getTotal(), userPage.getPages(), userPage.getRecords()

--
Gitblit v1.8.0