From 4c7495d646028e45c14af403e25c785d44e5dbe5 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Wed, 17 Mar 2021 09:00:22 +0800
Subject: [PATCH] 角色菜单配置

---
 screen-manage/src/main/java/com/moral/api/controller/AccountController.java |   76 +++++++++++++++++++++++++++++++-------
 1 files changed, 62 insertions(+), 14 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/controller/AccountController.java b/screen-manage/src/main/java/com/moral/api/controller/AccountController.java
index 600db90..78c95c6 100644
--- a/screen-manage/src/main/java/com/moral/api/controller/AccountController.java
+++ b/screen-manage/src/main/java/com/moral/api/controller/AccountController.java
@@ -1,10 +1,17 @@
 package com.moral.api.controller;
 
-import com.moral.api.pojo.dto.LoginDTO;
+import com.moral.api.pojo.dto.account.AccountInsertDTO;
+import com.moral.api.pojo.dto.account.AccountQueryDTO;
+import com.moral.api.pojo.dto.account.AccountUpdateDTO;
+import com.moral.api.pojo.dto.login.LoginDTO;
+import com.moral.api.pojo.request.*;
+import com.moral.api.pojo.vo.account.AccountInsertVO;
+import com.moral.api.pojo.vo.account.AccountQueryVO;
+import com.moral.api.pojo.vo.account.AccountUpdateVO;
+import com.moral.api.pojo.vo.login.LoginVO;
 import com.moral.api.service.ManageAccountService;
 import com.moral.constant.Constants;
 import com.moral.constant.ResultMessage;
-import com.moral.util.ObjectUtils;
 import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -14,7 +21,6 @@
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.util.Map;
 
 @Slf4j
 @Api(tags = {"������������������"})
@@ -29,31 +35,73 @@
 
 
     @PostMapping("login")
-    public ResultMessage login(@RequestBody Map<String, Object> parameters) {
-        if (!ObjectUtils.isNotAllEmpty(parameters, "account", "password"))
+    public ResultMessage login(@RequestBody LoginRequest loginRequest) {
+        if (!loginRequest.valid())
             return ResultMessage.fail(Constants.CODE_PARAMETER_IS_MISSING,Constants.MSG_PARAMETER_IS_MISSING);
-        String AESAccount = (String) parameters.get("account");
-        String AESPassword = (String) parameters.get("password");
 
-        LoginDTO loginDTO = accountService.login(AESAccount,AESPassword);
+        LoginDTO loginDTO = accountService.login(loginRequest);
 
-        if(loginDTO.getCode().equals(LoginDTO.SUCCESS))
-            return ResultMessage.ok(loginDTO);
-        return ResultMessage.fail(loginDTO);
+        LoginVO loginVO = LoginVO.convert(loginDTO);
+
+        if(loginVO.getCode().equals(loginVO.SUCCESS))
+            return ResultMessage.ok(loginVO);
+        return ResultMessage.fail(loginVO);
     }
 
 
     @PostMapping("logout")
-    public ResultMessage logout(@RequestBody Map<String, Object> parameters, HttpServletRequest request) {
-        if(!ObjectUtils.isNotAllEmpty(parameters,"accountId"))
+    public ResultMessage logout(@RequestBody LogoutRequest logoutRequest, HttpServletRequest request) {
+        if(!logoutRequest.valid())
             return ResultMessage.fail(Constants.CODE_PARAMETER_IS_MISSING,Constants.MSG_PARAMETER_IS_MISSING);
         String token = request.getHeader("token");
+        logoutRequest.setToken(token);
 
-        if(accountService.logout(String.valueOf(parameters.get("accountId")),token))
+        if(accountService.logout(logoutRequest))
             return ResultMessage.ok("������������");
         return ResultMessage.fail("������������");
 
     }
 
+    @PostMapping("insert")
+    public ResultMessage insert(@RequestBody AccountInsertRequest accountInsertRequest){
+        if(!accountInsertRequest.valid())
+            return ResultMessage.fail(Constants.CODE_PARAMETER_IS_MISSING,Constants.MSG_PARAMETER_IS_MISSING);
+
+        AccountInsertDTO accountInsertDTO = accountService.insertAccount(accountInsertRequest);
+
+        AccountInsertVO accountInsertVO = AccountInsertVO.convert(accountInsertDTO);
+
+        if(accountInsertVO.getCode().equals(accountInsertVO.SUCCESS))
+            return ResultMessage.ok(accountInsertVO);
+        return ResultMessage.fail(accountInsertVO);
+    }
+
+    @GetMapping("query")
+    public ResultMessage query(AccountQueryRequest accountQueryRequest){
+        if(!accountQueryRequest.valid())
+            return ResultMessage.fail(Constants.CODE_PARAMETER_IS_MISSING,Constants.MSG_PARAMETER_IS_MISSING);
+
+        AccountQueryDTO accountQueryDTO = accountService.queryAccount(accountQueryRequest);
+
+        AccountQueryVO accountQueryVO = AccountQueryVO.convert(accountQueryDTO);
+
+        return ResultMessage.ok(accountQueryVO);
+    }
+
+    @PostMapping("update")
+    public ResultMessage update(@RequestBody AccountUpdateRequest accountQeuryRequest){
+        if(!accountQeuryRequest.valid())
+            return ResultMessage.fail(Constants.CODE_PARAMETER_IS_MISSING,Constants.MSG_PARAMETER_IS_MISSING);
+
+        AccountUpdateDTO accountUpdateDTO = accountService.updateAccount(accountQeuryRequest);
+
+        AccountUpdateVO accountUpdateVO = AccountUpdateVO.convert(accountUpdateDTO);
+
+        if(accountUpdateVO.getCode().equals(accountUpdateVO.SUCCESS))
+            return ResultMessage.ok(accountUpdateVO);
+        return ResultMessage.fail(accountUpdateVO);
+    }
+
+
 
 }

--
Gitblit v1.8.0