From 680467cafe81445bda4cd71d93fb489ca436c5a1 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 25 Mar 2021 14:22:08 +0800
Subject: [PATCH] 角色菜单模糊查询
---
screen-manage/src/main/java/com/moral/api/controller/AccountController.java | 81 +++++++++++++++-------------------------
1 files changed, 30 insertions(+), 51 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..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
@@ -37,90 +37,69 @@
@Autowired
ManageAccountService accountService;
- @PostMapping("login")
- 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(loginForm);
-
- LoginVO loginVO = LoginVO.convert(loginDTO);
-
- return new ResultMessage(loginDTO.getCode(),loginDTO.getMsg(),loginVO);
- }
-
-
- @PostMapping("logout")
- 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");
- logoutForm.setToken(token);
-
- if(accountService.logout(logoutForm))
- return ResultMessage.ok();
- return ResultMessage.fail();
-
- }
-
@PostMapping("insert")
- public ResultMessage insert(@RequestBody AccountInsertForm accountInsertForm){
- if(!accountInsertForm.valid())
+ 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);
+ }
AccountInsertDTO accountInsertDTO = accountService.insertAccount(accountInsertForm);
AccountInsertVO accountInsertVO = AccountInsertVO.convert(accountInsertDTO);
- return new ResultMessage(accountInsertDTO.getCode(),accountInsertDTO.getMsg(),accountInsertVO);
+ return new ResultMessage(accountInsertDTO.getCode(), accountInsertDTO.getMsg(), accountInsertVO);
}
@GetMapping("query")
- public ResultMessage query(AccountQueryForm accountQueryForm){
- if(!accountQueryForm.valid())
- return ResultMessage.fail(Constants.CODE_PARAMETER_IS_MISSING,Constants.MSG_PARAMETER_IS_MISSING);
+ 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);
+ return new ResultMessage(accountQueryDTO.getCode(), accountQueryDTO.getMsg(), accountQueryVO);
}
@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);
- return new ResultMessage(accountUpdateDTO.getCode(),accountUpdateDTO.getMsg(),accountUpdateVO);
+ return new ResultMessage(accountUpdateDTO.getCode(), accountUpdateDTO.getMsg(), accountUpdateVO);
}
@PostMapping("delete")
- public ResultMessage delete(@RequestBody AccountDeleteForm accountDeleteForm){
- if(!accountDeleteForm.valid())
- return ResultMessage.fail(Constants.CODE_PARAMETER_IS_MISSING,Constants.MSG_PARAMETER_IS_MISSING);
+ 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);
+ return new ResultMessage(accountDeleteDTO.getCode(), accountDeleteDTO.getMsg(), accountDeleteVO);
}
-
- @PostMapping("yanzhengma")
- public String yanzhengma(HttpServletResponse response) throws IOException {
- KaptchaUtils.createVerificationCode();
- TokenUtils.getToken("1",1);
- return null;
- }
-
}
--
Gitblit v1.8.0