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

---
 screen-manage/src/main/java/com/moral/api/controller/AccountController.java |  103 ++++++++++++++++++++++++++++++++-------------------
 1 files changed, 65 insertions(+), 38 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 960862c..ece5b58 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,15 +1,22 @@
 package com.moral.api.controller;
 
-import com.moral.api.pojo.dto.AccountDTO;
-import com.moral.api.pojo.dto.LoginDTO;
-import com.moral.api.pojo.request.AccountAddRequest;
-import com.moral.api.pojo.request.LoginRequest;
-import com.moral.api.pojo.request.LogoutRequest;
-import com.moral.api.pojo.vo.AccountVO;
-import com.moral.api.pojo.vo.LoginVO;
+import com.moral.api.pojo.dto.account.AccountDeleteDTO;
+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.form.*;
+import com.moral.api.pojo.vo.account.AccountDeleteVO;
+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.ResponseCodeEnum;
 import com.moral.constant.ResultMessage;
+import com.moral.util.KaptchaUtils;
+import com.moral.util.TokenUtils;
 import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,59 +26,79 @@
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 
 @Slf4j
 @Api(tags = {"������������������"})
 @RestController
 @RequestMapping("/account")
 public class AccountController {
-    @Resource
-    ManageAccountService accountService;
     @Autowired
-    @Qualifier("tokenRedisTemplate")
-    RedisTemplate redisTemplate;
+    ManageAccountService accountService;
 
+    @PostMapping("insert")
+    public ResultMessage insert(@RequestBody AccountInsertForm accountInsertForm) {
+        if (!accountInsertForm.valid())
+            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+        //������������������������������
+        AccountInsertDTO conditionDTO = accountInsertForm.paramValid();
+        if (conditionDTO.getCode() != ResponseCodeEnum.SUCCESS.getCode()) {
+            return new ResultMessage(conditionDTO.getCode(), conditionDTO.getMsg(), null);
+        }
 
-    @PostMapping("login")
-    public ResultMessage login(@RequestBody LoginRequest loginRequest) {
-        if (!loginRequest.valid())
-            return ResultMessage.fail(Constants.CODE_PARAMETER_IS_MISSING,Constants.MSG_PARAMETER_IS_MISSING);
+        AccountInsertDTO accountInsertDTO = accountService.insertAccount(accountInsertForm);
 
-        LoginDTO loginDTO = accountService.login(loginRequest);
+        AccountInsertVO accountInsertVO = AccountInsertVO.convert(accountInsertDTO);
 
-        LoginVO loginVO = LoginVO.convert(loginDTO);
+        return new ResultMessage(accountInsertDTO.getCode(), accountInsertDTO.getMsg(), accountInsertVO);
+    }
 
-        if(loginVO.getCode().equals(loginVO.SUCCESS))
-            return ResultMessage.ok(loginVO);
-        return ResultMessage.fail(loginVO);
+    @GetMapping("query")
+    public ResultMessage query(AccountQueryForm accountQueryForm) {
+        if (!accountQueryForm.valid())
+            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+
+        AccountQueryDTO accountQueryDTO = accountService.queryAccount(accountQueryForm);
+
+        AccountQueryVO accountQueryVO = AccountQueryVO.convert(accountQueryDTO);
+
+        return new ResultMessage(accountQueryDTO.getCode(), accountQueryDTO.getMsg(), accountQueryVO);
     }
 
 
-    @PostMapping("logout")
-    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);
+    @PostMapping("update")
+    public ResultMessage update(@RequestBody AccountUpdateForm accountUpdateRequest) {
+        if (!accountUpdateRequest.valid())
+            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
 
-        if(accountService.logout(logoutRequest))
-            return ResultMessage.ok("������������");
-        return ResultMessage.fail("������������");
+        //������������������������������
+        AccountUpdateDTO conditionDTO = accountUpdateRequest.paramValid();
+        if (conditionDTO.getCode() != ResponseCodeEnum.SUCCESS.getCode()) {
+            return new ResultMessage(conditionDTO.getCode(), conditionDTO.getMsg(), null);
+        }
 
+        AccountUpdateDTO accountUpdateDTO = accountService.updateAccount(accountUpdateRequest);
+
+        AccountUpdateVO accountUpdateVO = AccountUpdateVO.convert(accountUpdateDTO);
+
+        return new ResultMessage(accountUpdateDTO.getCode(), accountUpdateDTO.getMsg(), accountUpdateVO);
     }
 
-    @PostMapping("add")
-    public ResultMessage add(@RequestBody AccountAddRequest accountAddRequest){
-        if(!accountAddRequest.valid())
-            return ResultMessage.fail(Constants.CODE_PARAMETER_IS_MISSING,Constants.MSG_PARAMETER_IS_MISSING);
+    @PostMapping("delete")
+    public ResultMessage delete(@RequestBody AccountDeleteForm accountDeleteForm) {
+        if (!accountDeleteForm.valid())
+            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
 
-        AccountDTO accountDTO = accountService.addAccount(accountAddRequest);
+        AccountDeleteDTO accountDeleteDTO = accountService.deleteAccount(accountDeleteForm);
 
-        AccountVO accountVO = AccountVO.convertToInsert(accountDTO);
+        AccountDeleteVO accountDeleteVO = AccountDeleteVO.convert(accountDeleteDTO);
 
-        if(accountVO.getCode().equals(accountVO.SUCCESS))
-            return ResultMessage.ok(accountVO);
-        return ResultMessage.fail(accountVO);
+        return new ResultMessage(accountDeleteDTO.getCode(), accountDeleteDTO.getMsg(), accountDeleteVO);
     }
 
 

--
Gitblit v1.8.0