From 10c218463b376967e07a9c28de565ef741a0a308 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 17 Mar 2021 17:26:24 +0800
Subject: [PATCH] Common模块： 修改用户不存在常量名 修改ResultMessage中使用的常量 manage模块： 账号的增删改查进行修改
---
screen-manage/src/main/java/com/moral/api/controller/AccountController.java | 71 +++++++++++++++--------------------
1 files changed, 31 insertions(+), 40 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 9db40fd..c624246 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,12 +1,11 @@
package com.moral.api.controller;
-import com.google.code.kaptcha.impl.DefaultKaptcha;
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.request.*;
+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;
@@ -14,6 +13,7 @@
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;
@@ -34,69 +34,64 @@
@RestController
@RequestMapping("/account")
public class AccountController {
- @Resource
- ManageAccountService accountService;
@Autowired
- @Qualifier("tokenRedisTemplate")
- RedisTemplate redisTemplate;
+ ManageAccountService accountService;
@PostMapping("login")
- public ResultMessage login(@RequestBody LoginRequest loginRequest) {
- if (!loginRequest.valid())
+ public ResultMessage login(@RequestBody LoginForm loginForm) {
+ if (!loginForm.valid())
return ResultMessage.fail(Constants.CODE_PARAMETER_IS_MISSING,Constants.MSG_PARAMETER_IS_MISSING);
- LoginDTO loginDTO = accountService.login(loginRequest);
+ LoginDTO loginDTO = accountService.login(loginForm);
LoginVO loginVO = LoginVO.convert(loginDTO);
- if(loginVO.getCode().equals(loginVO.SUCCESS))
- return ResultMessage.ok(loginVO);
- return ResultMessage.fail(loginVO);
+ return new ResultMessage(loginDTO.getCode(),loginDTO.getMsg(),loginVO);
}
@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);
+ public ResultMessage logout (@RequestBody LogoutForm logoutForm, HttpServletRequest request) {
+ if(!logoutForm.valid())
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
String token = request.getHeader("token");
- logoutRequest.setToken(token);
+ logoutForm.setToken(token);
- if(accountService.logout(logoutRequest))
- return ResultMessage.ok("������������");
- return ResultMessage.fail("������������");
+ if(accountService.logout(logoutForm))
+ return ResultMessage.ok();
+ return ResultMessage.fail();
}
@PostMapping("insert")
- public ResultMessage insert(@RequestBody AccountInsertRequest accountInsertRequest){
- if(!accountInsertRequest.valid())
- return ResultMessage.fail(Constants.CODE_PARAMETER_IS_MISSING,Constants.MSG_PARAMETER_IS_MISSING);
+ public ResultMessage insert(@RequestBody AccountInsertForm accountInsertForm){
+ if(!accountInsertForm.valid())
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
- AccountInsertDTO accountInsertDTO = accountService.insertAccount(accountInsertRequest);
+ AccountInsertDTO accountInsertDTO = accountService.insertAccount(accountInsertForm);
AccountInsertVO accountInsertVO = AccountInsertVO.convert(accountInsertDTO);
- if(accountInsertVO.getCode().equals(accountInsertVO.SUCCESS))
- return ResultMessage.ok(accountInsertVO);
- return ResultMessage.fail(accountInsertVO);
+ return new ResultMessage(accountInsertDTO.getCode(),accountInsertDTO.getMsg(),accountInsertVO);
}
@GetMapping("query")
- public ResultMessage query(AccountQueryRequest accountQueryRequest){
- if(!accountQueryRequest.valid())
+ public ResultMessage query(AccountQueryForm accountQueryForm){
+ if(!accountQueryForm.valid())
return ResultMessage.fail(Constants.CODE_PARAMETER_IS_MISSING,Constants.MSG_PARAMETER_IS_MISSING);
- AccountQueryDTO accountQueryDTO = accountService.queryAccount(accountQueryRequest);
+ AccountQueryDTO accountQueryDTO = accountService.queryAccount(accountQueryForm);
AccountQueryVO accountQueryVO = AccountQueryVO.convert(accountQueryDTO);
- return ResultMessage.ok(accountQueryVO);
+ return new ResultMessage(accountQueryDTO.getCode(),accountQueryDTO.getMsg(),accountQueryVO);
}
@PostMapping("update")
- public ResultMessage update(@RequestBody AccountUpdateRequest accountQeuryRequest){
+ public ResultMessage update(@RequestBody AccountUpdateForm accountQeuryRequest){
if(!accountQeuryRequest.valid())
return ResultMessage.fail(Constants.CODE_PARAMETER_IS_MISSING,Constants.MSG_PARAMETER_IS_MISSING);
@@ -104,23 +99,19 @@
AccountUpdateVO accountUpdateVO = AccountUpdateVO.convert(accountUpdateDTO);
- if(accountUpdateVO.getCode().equals(accountUpdateVO.SUCCESS))
- return ResultMessage.ok(accountUpdateVO);
- return ResultMessage.fail(accountUpdateVO);
+ return new ResultMessage(accountUpdateDTO.getCode(),accountUpdateDTO.getMsg(),accountUpdateVO);
}
@PostMapping("delete")
- public ResultMessage delete(@RequestBody AccountDeleteRequest accountDeleteRequest){
- if(!accountDeleteRequest.valid())
+ public ResultMessage delete(@RequestBody AccountDeleteForm accountDeleteForm){
+ if(!accountDeleteForm.valid())
return ResultMessage.fail(Constants.CODE_PARAMETER_IS_MISSING,Constants.MSG_PARAMETER_IS_MISSING);
- AccountDeleteDTO accountDeleteDTO = accountService.deleteAccount(accountDeleteRequest);
+ AccountDeleteDTO accountDeleteDTO = accountService.deleteAccount(accountDeleteForm);
AccountDeleteVO accountDeleteVO = AccountDeleteVO.convert(accountDeleteDTO);
- if(accountDeleteVO.getCode().equals(accountDeleteVO.SUCCESS))
- return ResultMessage.ok(accountDeleteVO);
- return ResultMessage.fail(accountDeleteVO);
+ return new ResultMessage(accountDeleteDTO.getCode(),accountDeleteDTO.getMsg(),accountDeleteVO);
}
@PostMapping("yanzhengma")
--
Gitblit v1.8.0