From a5b27c528bb73886ccc6b97ea1262b9d7f403cca Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Wed, 12 May 2021 17:50:11 +0800
Subject: [PATCH] 站点文件提交

---
 screen-manage/src/main/java/com/moral/api/controller/AccountController.java |  107 +++++++++++++++++++++++++++++++----------------------
 1 files changed, 62 insertions(+), 45 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 149ff67..e361433 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,78 +1,95 @@
 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.*;
+import com.moral.api.pojo.form.account.AccountDeleteForm;
+import com.moral.api.pojo.form.account.AccountInsertForm;
+import com.moral.api.pojo.form.account.AccountQueryForm;
+import com.moral.api.pojo.form.account.AccountUpdateForm;
+import com.moral.api.pojo.vo.account.AccountQueryVO;
 import com.moral.api.service.ManageAccountService;
-import com.moral.constant.Constants;
+import com.moral.constant.ResponseCodeEnum;
 import com.moral.constant.ResultMessage;
 import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
 
 @Slf4j
 @Api(tags = {"������������������"})
 @RestController
+@CrossOrigin(origins = "*", maxAge = 3600)
 @RequestMapping("/account")
 public class AccountController {
-    @Resource
-    ManageAccountService accountService;
     @Autowired
-    @Qualifier("tokenRedisTemplate")
-    RedisTemplate redisTemplate;
+    ManageAccountService accountService;
 
+    @PostMapping("insert")
+    public ResultMessage insert(@RequestBody AccountInsertForm form) {
+        //������������������������
+        if (!form.valid())
+            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
 
-    @PostMapping("login")
-    public ResultMessage login(@RequestBody LoginRequest loginRequest) {
-        if (!loginRequest.valid())
-            return ResultMessage.fail(Constants.CODE_PARAMETER_IS_MISSING,Constants.MSG_PARAMETER_IS_MISSING);
+        //������������������������
+        AccountDTO conditionDTO = form.paramValid();
+        if (conditionDTO.getCode() != ResponseCodeEnum.SUCCESS.getCode()) {
+            return new ResultMessage(conditionDTO.getCode(), conditionDTO.getMsg(), null);
+        }
 
-        LoginDTO loginDTO = accountService.login(loginRequest);
+        //������������������
+        AccountDTO dto = accountService.insertAccount(form);
 
-        LoginVO loginVO = LoginVO.convert(loginDTO);
-
-        if(loginVO.getCode().equals(loginVO.SUCCESS))
-            return ResultMessage.ok(loginVO);
-        return ResultMessage.fail(loginVO);
+        return new ResultMessage(dto.getCode(), dto.getMsg(), null);
     }
 
+    @PostMapping("update")
+    public ResultMessage update(@RequestBody AccountUpdateForm form) {
+        //������������������������
+        if (!form.valid())
+            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
 
-    @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);
+        //������������������������
+        AccountDTO conditionDTO = form.paramValid();
+        if (conditionDTO.getCode() != ResponseCodeEnum.SUCCESS.getCode()) {
+            return new ResultMessage(conditionDTO.getCode(), conditionDTO.getMsg(), null);
+        }
 
-        if(accountService.logout(logoutRequest))
-            return ResultMessage.ok("������������");
-        return ResultMessage.fail("������������");
+        //������������������
+        AccountDTO dto = accountService.updateAccount(form);
 
+        return new ResultMessage(dto.getCode(), dto.getMsg(), null);
     }
 
-    @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 form) {
+        //������������������������
+        if (!form.valid())
+            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
 
-        AccountDTO accountDTO = accountService.addAccount(accountAddRequest);
+        //������������������
+        AccountDTO dto = accountService.deleteAccount(form);
 
-        AccountVO accountVO = AccountVO.convertToInsertPage(accountDTO);
-
-        if(accountVO.getCode().equals(accountVO.SUCCESS))
-            return ResultMessage.ok(accountVO);
-        return ResultMessage.fail(accountVO);
+        return new ResultMessage(dto.getCode(), dto.getMsg(), null);
     }
 
+    @GetMapping("query")
+    public ResultMessage query(AccountQueryForm form) {
+        //������������������������
+        if (!form.valid())
+            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+
+        //������������������
+        AccountQueryDTO accountQueryDTO = accountService.queryAccount(form);
+
+        //���������������������������
+        AccountQueryVO accountQueryVO = AccountQueryVO.convert(accountQueryDTO);
+
+
+        return new ResultMessage(accountQueryDTO.getCode(), accountQueryDTO.getMsg(), accountQueryVO);
+    }
 
 }

--
Gitblit v1.8.0