From e5d189bc1ff0d6b9e77dc1834173b5a70ffa07eb Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Fri, 19 Mar 2021 09:16:24 +0800
Subject: [PATCH] 角色菜单配置
---
screen-manage/src/main/java/com/moral/api/controller/AccountController.java | 106 +++++++++++++++++++----------------------------------
1 files changed, 38 insertions(+), 68 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..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,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,102 +34,72 @@
@RestController
@RequestMapping("/account")
public class AccountController {
- @Resource
- ManageAccountService accountService;
@Autowired
- @Qualifier("tokenRedisTemplate")
- RedisTemplate redisTemplate;
-
- @PostMapping("login")
- public ResultMessage login(@RequestBody LoginRequest loginRequest) {
- if (!loginRequest.valid())
- return ResultMessage.fail(Constants.CODE_PARAMETER_IS_MISSING,Constants.MSG_PARAMETER_IS_MISSING);
-
- LoginDTO loginDTO = accountService.login(loginRequest);
-
- LoginVO loginVO = LoginVO.convert(loginDTO);
-
- if(loginVO.getCode().equals(loginVO.SUCCESS))
- return ResultMessage.ok(loginVO);
- return ResultMessage.fail(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);
- String token = request.getHeader("token");
- logoutRequest.setToken(token);
-
- if(accountService.logout(logoutRequest))
- return ResultMessage.ok("������������");
- return ResultMessage.fail("������������");
-
- }
+ ManageAccountService accountService;
@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 conditionDTO = accountInsertForm.paramValid();
+ if (conditionDTO.getCode() != ResponseCodeEnum.SUCCESS.getCode()) {
+ return new ResultMessage(conditionDTO.getCode(), conditionDTO.getMsg(), null);
+ }
- 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())
- 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(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){
- 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);
- 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())
- 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(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")
- public String yanzhengma(HttpServletResponse response) throws IOException {
- KaptchaUtils.createVerificationCode();
- TokenUtils.getToken("1",1);
- return null;
- }
-
}
--
Gitblit v1.8.0