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 | 96 +++++++++++++++++++++++++++++++++++------------
1 files changed, 71 insertions(+), 25 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..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,10 +1,22 @@
package com.moral.api.controller;
-import com.moral.api.pojo.dto.LoginDTO;
+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;
@@ -14,45 +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> parameters) {
- if (!ObjectUtils.isNotAllEmpty(parameters, "account", "password"))
- 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");
+ AccountInsertDTO accountInsertDTO = accountService.insertAccount(accountInsertForm);
- LoginDTO loginDTO = accountService.login(AESAccount,AESPassword);
+ AccountInsertVO accountInsertVO = AccountInsertVO.convert(accountInsertDTO);
- if(loginDTO.getCode().equals(LoginDTO.SUCCESS))
- return ResultMessage.ok(loginDTO);
- return ResultMessage.fail(loginDTO);
+ 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> parameters, HttpServletRequest request) {
- if(!ObjectUtils.isNotAllEmpty(parameters,"accountId"))
- return ResultMessage.fail(Constants.CODE_PARAMETER_IS_MISSING,Constants.MSG_PARAMETER_IS_MISSING);
- String token = request.getHeader("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(String.valueOf(parameters.get("accountId")),token))
- 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("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