From 82b5c11b7f3bb0f74c108fe2c06721968ae2b5da Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 18 Mar 2021 17:23:14 +0800
Subject: [PATCH] common:     完成验证码工具类 生成校验

---
 screen-manage/src/main/java/com/moral/api/controller/AccountController.java |   90 ++++++++++++++++++++++++++++++++++++--------
 1 files changed, 73 insertions(+), 17 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 779cea6..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,8 +1,22 @@
 package com.moral.api.controller;
 
+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.ObjectUtils;
+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;
@@ -12,37 +26,79 @@
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.util.Map;
+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 Map<String, Object> paramters) {
-        if (!ObjectUtils.checkParamAndMap(paramters, "account", "password"))
-            return ResultMessage.fail("���������������");
+        AccountInsertDTO accountInsertDTO = accountService.insertAccount(accountInsertForm);
 
-        Map<String, Object> result = accountService.login(paramters);
+        AccountInsertVO accountInsertVO = AccountInsertVO.convert(accountInsertDTO);
 
-        if ((int) result.get("accountId") < 0)
-            return ResultMessage.fail(result);
-        return ResultMessage.ok(result);
+        return new ResultMessage(accountInsertDTO.getCode(), accountInsertDTO.getMsg(), accountInsertVO);
+    }
+
+    @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 Map<String, Object> paramters, HttpServletRequest request) {
+    @PostMapping("update")
+    public ResultMessage update(@RequestBody AccountUpdateForm accountUpdateRequest) {
+        if (!accountUpdateRequest.valid())
+            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
 
-        return null;
+        //������������������������������
+        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("delete")
+    public ResultMessage delete(@RequestBody AccountDeleteForm accountDeleteForm) {
+        if (!accountDeleteForm.valid())
+            return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+                    ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+
+        AccountDeleteDTO accountDeleteDTO = accountService.deleteAccount(accountDeleteForm);
+
+        AccountDeleteVO accountDeleteVO = AccountDeleteVO.convert(accountDeleteDTO);
+
+        return new ResultMessage(accountDeleteDTO.getCode(), accountDeleteDTO.getMsg(), accountDeleteVO);
     }
 
 

--
Gitblit v1.8.0