From 25aeb531c8064ca768bb2d6f179ec7411b824b43 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 25 Mar 2021 17:33:27 +0800
Subject: [PATCH] 增加验证码配置常量，特殊字段名映射
---
screen-manage/src/main/java/com/moral/api/controller/AccountController.java | 106 +++++++++++++++++++++++++++++++----------------------
1 files changed, 62 insertions(+), 44 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..eddbd67 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,77 +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.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.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.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.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
@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.convertToInsertPage(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