From f1c3c5f0b840df7fa5fe08a69186c9f2b52ce243 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 18 Mar 2021 15:37:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-manage/src/main/java/com/moral/api/controller/AccountController.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 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 c624246..3e194d4 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
@@ -40,7 +40,8 @@
@PostMapping("login")
public ResultMessage login(@RequestBody LoginForm loginForm) {
if (!loginForm.valid())
- return ResultMessage.fail(Constants.CODE_PARAMETER_IS_MISSING,Constants.MSG_PARAMETER_IS_MISSING);
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
LoginDTO loginDTO = accountService.login(loginForm);
@@ -69,6 +70,11 @@
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);
+ }
AccountInsertDTO accountInsertDTO = accountService.insertAccount(accountInsertForm);
@@ -80,7 +86,8 @@
@GetMapping("query")
public ResultMessage query(AccountQueryForm accountQueryForm){
if(!accountQueryForm.valid())
- return ResultMessage.fail(Constants.CODE_PARAMETER_IS_MISSING,Constants.MSG_PARAMETER_IS_MISSING);
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
AccountQueryDTO accountQueryDTO = accountService.queryAccount(accountQueryForm);
@@ -91,11 +98,18 @@
@PostMapping("update")
- public ResultMessage update(@RequestBody AccountUpdateForm accountQeuryRequest){
- if(!accountQeuryRequest.valid())
- return ResultMessage.fail(Constants.CODE_PARAMETER_IS_MISSING,Constants.MSG_PARAMETER_IS_MISSING);
+ public ResultMessage update(@RequestBody AccountUpdateForm accountUpdateRequest){
+ if(!accountUpdateRequest.valid())
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
- AccountUpdateDTO accountUpdateDTO = accountService.updateAccount(accountQeuryRequest);
+ //������������������������������
+ 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);
@@ -105,7 +119,8 @@
@PostMapping("delete")
public ResultMessage delete(@RequestBody AccountDeleteForm accountDeleteForm){
if(!accountDeleteForm.valid())
- return ResultMessage.fail(Constants.CODE_PARAMETER_IS_MISSING,Constants.MSG_PARAMETER_IS_MISSING);
+ return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(),
+ ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
AccountDeleteDTO accountDeleteDTO = accountService.deleteAccount(accountDeleteForm);
--
Gitblit v1.8.0