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/pojo/vo/login/LoginVO.java | 46 --
screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountDeleteVO.java | 21 -
screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java | 291 +++++++++++---------
screen-manage/src/main/java/com/moral/api/pojo/dto/account/AccountDTO.java | 4
screen-manage/src/main/java/com/moral/api/pojo/dto/account/AccountInsertDTO.java | 42 ---
screen-manage/src/main/java/com/moral/api/service/ManageAccountService.java | 14
screen-manage/src/main/java/com/moral/api/pojo/form/AccountUpdateForm.java | 4
screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountVO.java | 11
screen-manage/src/main/java/com/moral/api/pojo/dto/account/AccountDeleteDTO.java | 10
screen-manage/src/main/java/com/moral/api/pojo/form/LogoutForm.java | 4
screen-manage/src/main/java/com/moral/api/pojo/form/AccountInsertForm.java | 8
screen-manage/src/main/resources/mapper/ManageMenuMapper.xml | 1
screen-common/src/main/java/com/moral/constant/ResultMessage.java | 20
screen-manage/src/main/java/com/moral/api/pojo/form/LoginForm.java | 8
screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java | 2
screen-manage/src/main/java/com/moral/api/pojo/vo/login/AccountInfoVO.java | 43 +-
screen-manage/src/main/java/com/moral/api/controller/AccountController.java | 71 ++--
screen-manage/src/main/java/com/moral/api/pojo/dto/login/LoginDTO.java | 37 --
screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountQueryVO.java | 15
screen-manage/src/main/java/com/moral/api/pojo/dto/account/AccountQueryDTO.java | 4
screen-manage/src/main/java/com/moral/api/pojo/form/AccountDeleteForm.java | 4
screen-manage/src/main/java/com/moral/api/pojo/form/AccountQueryForm.java | 4
screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountInsertVO.java | 96 ++----
screen-manage/src/main/java/com/moral/api/pojo/dto/account/AccountUpdateDTO.java | 19 -
screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountUpdateVO.java | 60 +--
25 files changed, 345 insertions(+), 494 deletions(-)
diff --git a/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java b/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java
index f6c2017..1d4664d 100644
--- a/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java
+++ b/screen-common/src/main/java/com/moral/constant/ResponseCodeEnum.java
@@ -15,7 +15,7 @@
TOKEN_INVALID(-3,"token������"),
TOKEN_CREATE_ERROR(-4,"token������������"),
ACCOUNT_NOT_EXIST(-5,"���������������"),
- ACCOUNT_INVALID(-6,"������������������"),
+ ACCOUNT_EXIST(-6,"������������������"),
ACCOUNT_IS_DELETE(-7,"���������������������"),
PASSWORD_INVALID(-8,"������������"),
MOBILE_INVALID(-9,"���������������"),
diff --git a/screen-common/src/main/java/com/moral/constant/ResultMessage.java b/screen-common/src/main/java/com/moral/constant/ResultMessage.java
index 50b9fa2..2ecfe05 100644
--- a/screen-common/src/main/java/com/moral/constant/ResultMessage.java
+++ b/screen-common/src/main/java/com/moral/constant/ResultMessage.java
@@ -36,15 +36,15 @@
public static ResultMessage ok() {
ResultMessage resultMessage = new ResultMessage();
- resultMessage.setCode(Constants.CODE_OPERATION_SUCCESS);
- resultMessage.setMessage(Constants.MSG_OPERATION_SUCCESS);
+ resultMessage.setCode(ResponseCodeEnum.SUCCESS.getCode());
+ resultMessage.setMessage(ResponseCodeEnum.SUCCESS.getMsg());
resultMessage.setData(new HashMap<>());
return resultMessage;
}
public static ResultMessage ok(String msg) {
ResultMessage resultMessage = new ResultMessage();
- resultMessage.setCode(Constants.CODE_OPERATION_SUCCESS);
+ resultMessage.setCode(ResponseCodeEnum.SUCCESS.getCode());
resultMessage.setMessage(msg);
resultMessage.setData(new HashMap<>());
return resultMessage;
@@ -67,8 +67,8 @@
public static <T> ResultMessage<T> ok(T data) {
ResultMessage resultMessage = new ResultMessage();
- resultMessage.setCode(Constants.CODE_OPERATION_SUCCESS);
- resultMessage.setMessage(Constants.MSG_OPERATION_SUCCESS);
+ resultMessage.setCode(ResponseCodeEnum.SUCCESS.getCode());
+ resultMessage.setMessage(ResponseCodeEnum.SUCCESS.getMsg());
resultMessage.setData(data == null ?new HashMap<>():data);
return resultMessage;
}
@@ -83,15 +83,15 @@
public static ResultMessage fail() {
ResultMessage resultMessage = new ResultMessage();
- resultMessage.setCode(Constants.CODE_OPERATION_FAILED);
- resultMessage.setMessage(Constants.MSG_OPERATION_FAILED);
+ resultMessage.setCode(ResponseCodeEnum.FAIL.getCode());
+ resultMessage.setMessage(ResponseCodeEnum.FAIL.getMsg());
resultMessage.setData(new HashMap<>());
return resultMessage;
}
public static ResultMessage fail(String msg) {
ResultMessage resultMessage = new ResultMessage();
- resultMessage.setCode(Constants.CODE_OPERATION_FAILED);
+ resultMessage.setCode(ResponseCodeEnum.FAIL.getCode());
resultMessage.setMessage(msg);
resultMessage.setData(new HashMap<>());
return resultMessage;
@@ -107,8 +107,8 @@
public static <T> ResultMessage<T> fail(T data) {
ResultMessage resultMessage = new ResultMessage();
- resultMessage.setCode(Constants.CODE_OPERATION_FAILED);
- resultMessage.setMessage(Constants.MSG_OPERATION_FAILED);
+ resultMessage.setCode(ResponseCodeEnum.FAIL.getCode());
+ resultMessage.setMessage(ResponseCodeEnum.FAIL.getMsg());
resultMessage.setData(data == null ?new HashMap<>():data);
return resultMessage;
}
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")
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/dto/account/AccountDTO.java b/screen-manage/src/main/java/com/moral/api/pojo/dto/account/AccountDTO.java
index 2a40541..5f17674 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/dto/account/AccountDTO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/dto/account/AccountDTO.java
@@ -20,5 +20,7 @@
private List<ManageRole> roles;
- private String code;
+ private Integer code;
+
+ private String msg;
}
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/dto/account/AccountDeleteDTO.java b/screen-manage/src/main/java/com/moral/api/pojo/dto/account/AccountDeleteDTO.java
index 926319c..ecab6ed 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/dto/account/AccountDeleteDTO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/dto/account/AccountDeleteDTO.java
@@ -12,15 +12,5 @@
@Data
public class AccountDeleteDTO extends AccountDTO {
- /*
- * ������������
- * */
- public final static String SUCCESS = "0";
-
- /*
- * ���������������
- * */
- public final static String ACCOUNT_NOT_EXIST = "-1";
-
}
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/dto/account/AccountInsertDTO.java b/screen-manage/src/main/java/com/moral/api/pojo/dto/account/AccountInsertDTO.java
index 3d4b9d3..8f199bb 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/dto/account/AccountInsertDTO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/dto/account/AccountInsertDTO.java
@@ -16,46 +16,4 @@
@Data
public class AccountInsertDTO extends AccountDTO{
- /*
- * ������������
- * */
- public static final String SUCCESS = "0";
-
- /*
- * ���������������������������
- * */
- public static final String ACCOUNT_LENGTH_INVALID = "-1";
-
- /*
- * ���������������������������
- * */
- public static final String PASSWORD_LENGTH_INVALID = "-2";
-
- /*
- * ������������������������
- * */
- public static final String MOBILE_INVALID = "-3";
-
- /*
- * ���������������������
- * */
- public static final String EMAIL_INVALID = "-4";
-
- /*
- * ���������������������
- * */
- public static final String ACCOUNT_EXIST = "-5";
-
- /*
- * ���������������������������
- * */
- public static final String ACCOUNT_EXIST_SPECIAL_CHAR = "-6";
-
- /*
- * ������������������������
- * */
- public static final String PASSWORD_EXIST_SPECIAL_CHAR = "-7";
-
-
-
}
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/dto/account/AccountQueryDTO.java b/screen-manage/src/main/java/com/moral/api/pojo/dto/account/AccountQueryDTO.java
index 26e2ef6..46f3888 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/dto/account/AccountQueryDTO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/dto/account/AccountQueryDTO.java
@@ -14,6 +14,10 @@
@Data
public class AccountQueryDTO {
+ private Integer code;
+
+ private String msg;
+
private long pages;
private long total;
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/dto/account/AccountUpdateDTO.java b/screen-manage/src/main/java/com/moral/api/pojo/dto/account/AccountUpdateDTO.java
index b15c23d..b75060d 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/dto/account/AccountUpdateDTO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/dto/account/AccountUpdateDTO.java
@@ -11,24 +11,5 @@
**/
@Data
public class AccountUpdateDTO extends AccountDTO {
- /*
- * ������������
- * */
- public static final String SUCCESS = "0";
-
- /*
- * ���������������
- * */
- public static final String ACCOUNT_NOT_EXIST = "-1";
-
- /*
- * ������������������������
- * */
- public static final String MOBILE_INVALID = "-2";
-
- /*
- * ���������������������
- * */
- public static final String EMAIL_INVALID = "-3";
}
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/dto/login/LoginDTO.java b/screen-manage/src/main/java/com/moral/api/pojo/dto/login/LoginDTO.java
index 0701d68..6fdca56 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/dto/login/LoginDTO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/dto/login/LoginDTO.java
@@ -12,40 +12,15 @@
@Data
public class LoginDTO {
- /*
- * ������������
- * */
- public static final String SUCCESS = "0";
-
- /*
- * ���������������
- * */
- public static final String NOT_EXIST = "-1";
-
- /*
- * ������������������
- * */
- public static final String IS_DELETE = "-2";
-
- /*
- * ������������
- * */
- public static final String PASSWORD_ERROR = "-3";
-
- /*
- * ������������������
- * */
- public static final String ROLE_EMPTY = "-4";
-
- /*
- * ������������������
- * */
- public static final String MENU_EMPTY = "-5";
-
/*
* ���������
* */
- private String code;
+ private Integer code;
+
+ /*
+ * ������������
+ * */
+ private String msg;
/*
*������token
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/request/AccountDeleteRequest.java b/screen-manage/src/main/java/com/moral/api/pojo/form/AccountDeleteForm.java
similarity index 81%
rename from screen-manage/src/main/java/com/moral/api/pojo/request/AccountDeleteRequest.java
rename to screen-manage/src/main/java/com/moral/api/pojo/form/AccountDeleteForm.java
index 426717a..b70764c 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/request/AccountDeleteRequest.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/form/AccountDeleteForm.java
@@ -1,4 +1,4 @@
-package com.moral.api.pojo.request;
+package com.moral.api.pojo.form;
import lombok.Data;
@@ -10,7 +10,7 @@
* @Version TODO
**/
@Data
-public class AccountDeleteRequest {
+public class AccountDeleteForm {
private Integer accountId;
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/request/AccountInsertRequest.java b/screen-manage/src/main/java/com/moral/api/pojo/form/AccountInsertForm.java
similarity index 78%
rename from screen-manage/src/main/java/com/moral/api/pojo/request/AccountInsertRequest.java
rename to screen-manage/src/main/java/com/moral/api/pojo/form/AccountInsertForm.java
index d070492..d4f1f96 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/request/AccountInsertRequest.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/form/AccountInsertForm.java
@@ -1,6 +1,5 @@
-package com.moral.api.pojo.request;
+package com.moral.api.pojo.form;
-import com.moral.api.entity.ManageRole;
import lombok.Data;
import org.springframework.util.ObjectUtils;
@@ -15,7 +14,7 @@
* @Version TODO
**/
@Data
-public class AccountInsertRequest implements Serializable{
+public class AccountInsertForm implements Serializable{
private String account;
@@ -50,8 +49,7 @@
ObjectUtils.isEmpty(password) ||
ObjectUtils.isEmpty(email) ||
ObjectUtils.isEmpty(mobile) ||
- ObjectUtils.isEmpty(userName) ||
- ObjectUtils.isEmpty(roleIds)
+ ObjectUtils.isEmpty(userName)
)
return false;
return true;
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/request/AccountQueryRequest.java b/screen-manage/src/main/java/com/moral/api/pojo/form/AccountQueryForm.java
similarity index 87%
rename from screen-manage/src/main/java/com/moral/api/pojo/request/AccountQueryRequest.java
rename to screen-manage/src/main/java/com/moral/api/pojo/form/AccountQueryForm.java
index 1a8fb2f..ce49cb5 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/request/AccountQueryRequest.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/form/AccountQueryForm.java
@@ -1,4 +1,4 @@
-package com.moral.api.pojo.request;
+package com.moral.api.pojo.form;
import lombok.Data;
import org.springframework.util.ObjectUtils;
@@ -13,7 +13,7 @@
* @Version TODO
**/
@Data
-public class AccountQueryRequest implements Serializable {
+public class AccountQueryForm implements Serializable {
private Integer page;
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/request/AccountUpdateRequest.java b/screen-manage/src/main/java/com/moral/api/pojo/form/AccountUpdateForm.java
similarity index 90%
rename from screen-manage/src/main/java/com/moral/api/pojo/request/AccountUpdateRequest.java
rename to screen-manage/src/main/java/com/moral/api/pojo/form/AccountUpdateForm.java
index 6745a7a..60060ff 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/request/AccountUpdateRequest.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/form/AccountUpdateForm.java
@@ -1,4 +1,4 @@
-package com.moral.api.pojo.request;
+package com.moral.api.pojo.form;
import lombok.Data;
import org.springframework.util.ObjectUtils;
@@ -13,7 +13,7 @@
* @Version TODO
**/
@Data
-public class AccountUpdateRequest {
+public class AccountUpdateForm {
private Integer accountId;
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/request/LoginRequest.java b/screen-manage/src/main/java/com/moral/api/pojo/form/LoginForm.java
similarity index 64%
rename from screen-manage/src/main/java/com/moral/api/pojo/request/LoginRequest.java
rename to screen-manage/src/main/java/com/moral/api/pojo/form/LoginForm.java
index 4f60a54..7bab60f 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/request/LoginRequest.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/form/LoginForm.java
@@ -1,4 +1,4 @@
-package com.moral.api.pojo.request;
+package com.moral.api.pojo.form;
import lombok.Data;
import org.springframework.util.ObjectUtils;
@@ -13,15 +13,15 @@
* @Version TODO
**/
@Data
-public class LoginRequest implements Serializable {
+public class LoginForm implements Serializable {
private String account;
private String password;
public boolean valid(){
- if(ObjectUtils.isEmpty(account)||ObjectUtils.isEmpty(password))
- return false;
+ if(ObjectUtils.isEmpty(account)||ObjectUtils.isEmpty(password))
+ return false;
return true;
}
}
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/request/LogoutRequest.java b/screen-manage/src/main/java/com/moral/api/pojo/form/LogoutForm.java
similarity index 81%
rename from screen-manage/src/main/java/com/moral/api/pojo/request/LogoutRequest.java
rename to screen-manage/src/main/java/com/moral/api/pojo/form/LogoutForm.java
index c559c40..8847656 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/request/LogoutRequest.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/form/LogoutForm.java
@@ -1,4 +1,4 @@
-package com.moral.api.pojo.request;
+package com.moral.api.pojo.form;
import lombok.Data;
import org.springframework.util.ObjectUtils;
@@ -13,7 +13,7 @@
* @Version TODO
**/
@Data
-public class LogoutRequest implements Serializable {
+public class LogoutForm implements Serializable {
private String accountId;
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountDeleteVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountDeleteVO.java
index f06ea46..ef0b15e 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountDeleteVO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountDeleteVO.java
@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonInclude;
import com.moral.api.entity.ManageAccount;
import com.moral.api.pojo.dto.account.AccountDeleteDTO;
+import com.moral.constant.ResponseCodeEnum;
import lombok.Data;
import org.springframework.util.ObjectUtils;
@@ -18,24 +19,14 @@
public class AccountDeleteVO extends AccountVO {
- /*
- * ������������
- * */
- public final static String SUCCESS = "0";
-
- /*
- * ���������������
- * */
- public final static String ACCOUNT_NOT_EXIST = "-1";
public static AccountDeleteVO convert(AccountDeleteDTO dto) {
+ if (dto.getCode() != ResponseCodeEnum.SUCCESS.getCode())
+ return null;
AccountDeleteVO vo = new AccountDeleteVO();
- vo.setCode(dto.getCode());
- if (!ObjectUtils.isEmpty(dto.getAccount())) {
- ManageAccount account = dto.getAccount();
- vo.setId(account.getId());
- vo.setUserName(account.getUserName());
- }
+ ManageAccount account = dto.getAccount();
+ vo.setId(account.getId());
+ vo.setUserName(account.getUserName());
return vo;
}
}
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountInsertVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountInsertVO.java
index 8cc4d31..7c4e4cf 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountInsertVO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountInsertVO.java
@@ -3,7 +3,9 @@
import com.fasterxml.jackson.annotation.JsonInclude;
import com.moral.api.entity.ManageRole;
import com.moral.api.pojo.dto.account.AccountInsertDTO;
+import com.moral.constant.ResponseCodeEnum;
import lombok.Data;
+import org.springframework.util.ObjectUtils;
import java.util.ArrayList;
import java.util.List;
@@ -18,79 +20,37 @@
@Data
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class AccountInsertVO extends AccountVO {
- /*
- * ������������
- * */
- public static final String SUCCESS = "0";
-
- /*
- * ���������������������������
- * */
- public static final String ACCOUNT_LENGTH_INVALID = "-1";
-
- /*
- * ���������������������������
- * */
- public static final String PASSWORD_LENGTH_INVALID = "-2";
-
- /*
- * ������������������������
- * */
- public static final String MOBILE_INVALID = "-3";
-
- /*
- * ���������������������
- * */
- public static final String EMAIL_INVALID = "-4";
-
- /*
- * ���������������������
- * */
- public static final String ACCOUNT_EXIST = "-5";
-
- /*
- * ���������������������������
- * */
- public static final String ACCOUNT_EXIST_SPECIAL_CHAR = "-6";
-
- /*
- * ������������������������
- * */
- public static final String PASSWORD_EXIST_SPECIAL_CHAR = "-7";
-
-
/**
- * @Description: ������������������������������������
- * @Param: [dto]
- * @return: com.moral.api.pojo.vo.account.AccountVO
- * @Author: ���������
- * @Date: 2021/3/15
- */
- public static AccountInsertVO convert(AccountInsertDTO dto){
+ * @Description: ������������������������������������
+ * @Param: [dto]
+ * @return: com.moral.api.pojo.vo.account.AccountVO
+ * @Author: ���������
+ * @Date: 2021/3/15
+ */
+ public static AccountInsertVO convert(AccountInsertDTO dto) {
+ if (dto.getCode() != ResponseCodeEnum.SUCCESS.getCode())
+ return null;
+
AccountInsertVO vo = new AccountInsertVO();
- if(dto.getCode()== AccountInsertDTO.SUCCESS){
- Integer id = dto.getAccount().getId();
- String userName = dto.getAccount().getUserName();
- String email = dto.getAccount().getEmail();
- String mobile = dto.getAccount().getMobile();
- String wechat = dto.getAccount().getWechat();
-
- //������������������������
- List<ManageRole> roles = dto.getRoles();
- List<String> roleNames = new ArrayList<>();
- roles.forEach(role->roleNames.add(role.getName()));
-
- vo.setId(id);
- vo.setUserName(userName);
- vo.setEmail(email);
- vo.setMobile(mobile);
- vo.setWechat(wechat);
- vo.setRoleNames(roleNames);
+ Integer id = dto.getAccount().getId();
+ String userName = dto.getAccount().getUserName();
+ String email = dto.getAccount().getEmail();
+ String mobile = dto.getAccount().getMobile();
+ String wechat = dto.getAccount().getWechat();
+ //������������������������
+ List<ManageRole> roles = dto.getRoles();
+ List<String> roleNames = new ArrayList<>();
+ if (!ObjectUtils.isEmpty(roles)) {
+ roles.forEach(role -> roleNames.add(role.getName()));
}
+ vo.setId(id);
+ vo.setUserName(userName);
+ vo.setEmail(email);
+ vo.setMobile(mobile);
+ vo.setWechat(wechat);
+ vo.setRoleNames(roleNames);
- String code = dto.getCode();
- vo.setCode(code);
return vo;
}
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountQueryVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountQueryVO.java
index 16462d3..77b190b 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountQueryVO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountQueryVO.java
@@ -3,7 +3,9 @@
import com.fasterxml.jackson.annotation.JsonInclude;
import com.moral.api.pojo.dto.account.AccountDTO;
import com.moral.api.pojo.dto.account.AccountQueryDTO;
+import com.moral.constant.ResponseCodeEnum;
import lombok.Data;
+import org.springframework.util.ObjectUtils;
import java.util.ArrayList;
import java.util.List;
@@ -29,16 +31,21 @@
private List<AccountVO> accountVOs;
- public static AccountQueryVO convert(AccountQueryDTO dto){
+ public static AccountQueryVO convert(AccountQueryDTO dto) {
+ if (dto.getCode() != ResponseCodeEnum.SUCCESS.getCode())
+ return null;
+
long total = dto.getTotal();
long current = dto.getCurrent();
long pages = dto.getPages();
long size = dto.getSize();
List<AccountVO> accountVOs = new ArrayList<>();
List<AccountDTO> accountDTOs = dto.getAccountDTOS();
- for (AccountDTO accountDTO : accountDTOs) {
- AccountVO vo = AccountVO.convert(accountDTO);
- accountVOs.add(vo);
+ if (!ObjectUtils.isEmpty(accountDTOs)) {
+ for (AccountDTO accountDTO : accountDTOs) {
+ AccountVO vo = AccountVO.convert(accountDTO);
+ accountVOs.add(vo);
+ }
}
AccountQueryVO vo = new AccountQueryVO();
vo.setTotal(total);
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountUpdateVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountUpdateVO.java
index cfbf96f..a99e42d 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountUpdateVO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountUpdateVO.java
@@ -4,7 +4,9 @@
import com.moral.api.entity.ManageRole;
import com.moral.api.pojo.dto.account.AccountInsertDTO;
import com.moral.api.pojo.dto.account.AccountUpdateDTO;
+import com.moral.constant.ResponseCodeEnum;
import lombok.Data;
+import org.springframework.util.ObjectUtils;
import java.util.ArrayList;
import java.util.List;
@@ -19,51 +21,33 @@
@Data
@JsonInclude(JsonInclude.Include.NON_EMPTY)
-public class AccountUpdateVO extends AccountVO{
- /*
- * ������������
- * */
- public static final String SUCCESS = "0";
+public class AccountUpdateVO extends AccountVO {
- /*
- * ���������������
- * */
- public static final String ACCOUNT_NOT_EXIST = "-1";
+ public static AccountUpdateVO convert(AccountUpdateDTO dto) {
+ if (dto.getCode() != ResponseCodeEnum.SUCCESS.getCode())
+ return null;
- /*
- * ������������������������
- * */
- public static final String MOBILE_INVALID = "-2";
-
- /*
- * ���������������������
- * */
- public static final String EMAIL_INVALID = "-3";
-
- public static AccountUpdateVO convert(AccountUpdateDTO dto){
AccountUpdateVO vo = new AccountUpdateVO();
- if(dto.getCode()== AccountUpdateDTO.SUCCESS){
- Integer id = dto.getAccount().getId();
- String userName = dto.getAccount().getUserName();
- String email = dto.getAccount().getEmail();
- String mobile = dto.getAccount().getMobile();
- String wechat = dto.getAccount().getWechat();
- //������������������������
- List<ManageRole> roles = dto.getRoles();
- List<String> roleNames = new ArrayList<>();
- roles.forEach(role->roleNames.add(role.getName()));
+ Integer id = dto.getAccount().getId();
+ String userName = dto.getAccount().getUserName();
+ String email = dto.getAccount().getEmail();
+ String mobile = dto.getAccount().getMobile();
+ String wechat = dto.getAccount().getWechat();
- vo.setId(id);
- vo.setUserName(userName);
- vo.setEmail(email);
- vo.setMobile(mobile);
- vo.setWechat(wechat);
- vo.setRoleNames(roleNames);
+ //������������������������
+ List<ManageRole> roles = dto.getRoles();
+ List<String> roleNames = new ArrayList<>();
+ if (!ObjectUtils.isEmpty(roles)) {
+ roles.forEach(role -> roleNames.add(role.getName()));
}
+ vo.setId(id);
+ vo.setUserName(userName);
+ vo.setEmail(email);
+ vo.setMobile(mobile);
+ vo.setWechat(wechat);
+ vo.setRoleNames(roleNames);
- String code = dto.getCode();
- vo.setCode(code);
return vo;
}
}
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountVO.java
index 155685e..3f6463b 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountVO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/account/AccountVO.java
@@ -5,6 +5,7 @@
import com.moral.api.entity.ManageRole;
import com.moral.api.pojo.dto.account.AccountDTO;
import lombok.Data;
+import org.springframework.util.ObjectUtils;
import java.util.ArrayList;
import java.util.List;
@@ -20,8 +21,6 @@
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class AccountVO {
- private String code;
-
private Integer id;
private String userName;
@@ -34,14 +33,16 @@
private List<String> roleNames;
- public static AccountVO convert(AccountDTO dto){
- if(dto.getAccount()==null)
+ public static AccountVO convert(AccountDTO dto) {
+ if (dto.getAccount() == null)
return null;
AccountVO vo = new AccountVO();
ManageAccount account = dto.getAccount();
List<ManageRole> roles = dto.getRoles();
List<String> roleNames = new ArrayList<>();
- roles.forEach(role->roleNames.add(role.getName()));
+ if (!ObjectUtils.isEmpty(roles)) {
+ roles.forEach(role -> roleNames.add(role.getName()));
+ }
vo.setId(account.getId());
vo.setUserName(account.getUserName());
vo.setEmail(account.getEmail());
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/login/AccountInfoVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/login/AccountInfoVO.java
index 4edf55a..dbd42ca 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/login/AccountInfoVO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/login/AccountInfoVO.java
@@ -6,6 +6,7 @@
import com.moral.api.entity.ManageRole;
import com.moral.api.pojo.dto.login.AccountInfoDTO;
import lombok.Data;
+import org.springframework.util.ObjectUtils;
import java.util.ArrayList;
import java.util.List;
@@ -42,32 +43,36 @@
private List<ManageMenu> menus;
/**
- * @Description: DTO������VO
- * @Param: [dto]
- * @return: com.moral.api.pojo.vo.login.AccountInfoVO
- * @Author: ���������
- * @Date: 2021/3/13
- */
- public static AccountInfoVO convert(AccountInfoDTO dto){
+ * @Description: DTO������VO
+ * @Param: [dto]
+ * @return: com.moral.api.pojo.vo.login.AccountInfoVO
+ * @Author: ���������
+ * @Date: 2021/3/13
+ */
+ public static AccountInfoVO convert(AccountInfoDTO dto) {
AccountInfoVO vo = new AccountInfoVO();
ManageAccount account = dto.getAccount();
List<ManageMenu> menus = dto.getMenus();
List<ManageRole> roles = dto.getRoles();
//������roleNames
ArrayList<String> roleNames = new ArrayList<>();
- roles.forEach(role->roleNames.add(role.getName()));
+ if (!ObjectUtils.isEmpty(roles)) {
+ roles.forEach(role -> roleNames.add(role.getName()));
+ }
/*������menu������������*/
- for (ManageMenu menu : menus) {
- menu.setCreateTime(null);
- menu.setIsDelete(null);
- menu.setUpdateTime(null);
- menu.setParentId(null);
- List<ManageMenu> children = menu.getChildren();
- for (ManageMenu child : children) {
- child.setCreateTime(null);
- child.setIsDelete(null);
- child.setUpdateTime(null);
- child.setParentId(null);
+ if (!ObjectUtils.isEmpty(menus)) {
+ for (ManageMenu menu : menus) {
+ menu.setCreateTime(null);
+ menu.setIsDelete(null);
+ menu.setUpdateTime(null);
+ menu.setParentId(null);
+ List<ManageMenu> children = menu.getChildren();
+ for (ManageMenu child : children) {
+ child.setCreateTime(null);
+ child.setIsDelete(null);
+ child.setUpdateTime(null);
+ child.setParentId(null);
+ }
}
}
vo.setAccountId(account.getId());
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/vo/login/LoginVO.java b/screen-manage/src/main/java/com/moral/api/pojo/vo/login/LoginVO.java
index acc760f..52878a0 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/vo/login/LoginVO.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/vo/login/LoginVO.java
@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonInclude;
import com.moral.api.pojo.dto.login.AccountInfoDTO;
import com.moral.api.pojo.dto.login.LoginDTO;
+import com.moral.constant.ResponseCodeEnum;
import lombok.Data;
import org.springframework.util.ObjectUtils;
@@ -17,40 +18,6 @@
@Data
@JsonInclude(JsonInclude.Include.NON_EMPTY)
public class LoginVO {
- /*
- * ������������
- * */
- public static final String SUCCESS = "0";
-
- /*
- * ���������������
- * */
- public static final String NOT_EXIST = "-1";
-
- /*
- * ������������������
- * */
- public static final String IS_DELETE = "-2";
-
- /*
- * ������������
- * */
- public static final String PASSWORD_ERROR = "-3";
-
- /*
- * ������������������
- * */
- public static final String ROLE_EMPTY = "-4";
-
- /*
- * ������������������
- * */
- public static final String MENU_EMPTY = "-5";
-
- /*
- * ���������
- * */
- private String code;
/*
*������token
@@ -70,16 +37,15 @@
* @Date: 2021/3/13
*/
public static LoginVO convert(LoginDTO dto) {
+ if (dto.getCode() != ResponseCodeEnum.SUCCESS.getCode())
+ return null;
+
LoginVO vo = new LoginVO();
- String code = dto.getCode();
String token = dto.getToken();
AccountInfoDTO accountInfoDTO = dto.getAccountInfoDTO();
- if (!ObjectUtils.isEmpty(accountInfoDTO)) {
- AccountInfoVO accountInfoVO = AccountInfoVO.convert(accountInfoDTO);
- vo.setAccountInfoVO(accountInfoVO);
- }
+ AccountInfoVO accountInfoVO = AccountInfoVO.convert(accountInfoDTO);
+ vo.setAccountInfoVO(accountInfoVO);
vo.setToken(token);
- vo.setCode(code);
return vo;
}
}
diff --git a/screen-manage/src/main/java/com/moral/api/service/ManageAccountService.java b/screen-manage/src/main/java/com/moral/api/service/ManageAccountService.java
index 12bb024..3f1aa80 100644
--- a/screen-manage/src/main/java/com/moral/api/service/ManageAccountService.java
+++ b/screen-manage/src/main/java/com/moral/api/service/ManageAccountService.java
@@ -4,7 +4,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.moral.api.pojo.dto.account.*;
import com.moral.api.pojo.dto.login.LoginDTO;
-import com.moral.api.pojo.request.*;
+import com.moral.api.pojo.form.*;
/**
* <p>
@@ -22,7 +22,7 @@
* @Author: ���������
* @Date: 2021/3/12
*/
- LoginDTO login(LoginRequest loginRequest);
+ LoginDTO login(LoginForm loginForm);
/**
* @Description: ������
@@ -31,7 +31,7 @@
* @Author: ���������
* @Date: 2021/3/12
*/
- boolean logout(LogoutRequest logoutRequest);
+ boolean logout(LogoutForm logoutForm);
/**
* @Description: ������������������
@@ -40,7 +40,7 @@
* @Author: ���������
* @Date: 2021/3/13
*/
- AccountInsertDTO insertAccount(AccountInsertRequest accountInsertRequest);
+ AccountInsertDTO insertAccount(AccountInsertForm accountInsertForm);
/**
* @Description: ������������
@@ -49,7 +49,7 @@
* @Author: ���������
* @Date: 2021/3/15
*/
- AccountQueryDTO queryAccount(AccountQueryRequest accountQueryRequest);
+ AccountQueryDTO queryAccount(AccountQueryForm accountQueryForm);
/**
* @Description: ������������
@@ -58,7 +58,7 @@
* @Author: ���������
* @Date: 2021/3/15
*/
- AccountUpdateDTO updateAccount(AccountUpdateRequest accountUpdateRequest);
+ AccountUpdateDTO updateAccount(AccountUpdateForm accountUpdateForm);
/**
* @Description: ������������
@@ -67,5 +67,5 @@
* @Author: ���������
* @Date: 2021/3/16
*/
- AccountDeleteDTO deleteAccount(AccountDeleteRequest accountDeleteRequest);
+ AccountDeleteDTO deleteAccount(AccountDeleteForm accountDeleteForm);
}
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java
index 41b198b..d5f40cb 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/ManageAccountServiceImpl.java
@@ -14,12 +14,14 @@
import com.moral.api.pojo.dto.account.*;
import com.moral.api.pojo.dto.login.AccountInfoDTO;
import com.moral.api.pojo.dto.login.LoginDTO;
-import com.moral.api.pojo.request.*;
+import com.moral.api.pojo.form.*;
import com.moral.api.service.ManageAccountService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.constant.ResponseCodeEnum;
import com.moral.util.AESUtils;
import com.moral.util.MD5Utils;
import com.moral.util.TokenUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -43,13 +45,13 @@
@Value("${AES.KEY}")
private String AESKey;
- @Resource
+ @Autowired
ManageAccountMapper manageAccountMapper;
- @Resource
+ @Autowired
ManageRoleMapper manageRoleMapper;
- @Resource
+ @Autowired
ManageMenuMapper manageMenuMapper;
- @Resource
+ @Autowired
ManageAccountRoleMapper manageAccountRoleMapper;
public final static String specialCharRegEx = "[ _`~!@#$%^&*()+=|{}':;',\\[\\].<>/?~���@#���%������&*������������+|{}������������������������������������]|\n|\r|\t";
@@ -61,55 +63,53 @@
/**
* @Description: ������
* @Param: [parameters]
- * @return: java.util.Map<java.lang.String , java.lang.Object>
+ * @return: java.util.Map<java.lang.String , java.lang.Object>
* @Author: ���������
* @Date: 2021/3/11
*/
@Override
- public LoginDTO login(LoginRequest loginRequest) {
+ public LoginDTO login(LoginForm loginForm) {
LoginDTO loginDTO = new LoginDTO();
//������
- String AESAccount = loginRequest.getAccount();
- String AESPassword = loginRequest.getPassword();
+ String account = loginForm.getAccount();
+ String AESPassword = loginForm.getPassword();
//������
- String account = AESUtils.decrypt(AESAccount, AESKey);
String password = AESUtils.decrypt(AESPassword, AESKey);
//������������������
QueryWrapper<ManageAccount> wrapper = new QueryWrapper<>();
wrapper.eq("account", account);
List<ManageAccount> manageAccounts = manageAccountMapper.selectList(wrapper);
if (ObjectUtils.isEmpty(manageAccounts)) {
- loginDTO.setCode(LoginDTO.NOT_EXIST);
+ loginDTO.setCode(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getCode());
+ loginDTO.setMsg(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
return loginDTO;
}
//������������������������
ManageAccount manageAccount = null;
for (ManageAccount value : manageAccounts) {
- if("0".equals(value.getIsDelete()))
+ if ("0".equals(value.getIsDelete()))
manageAccount = value;
}
if (ObjectUtils.isEmpty(manageAccount)) {
- loginDTO.setCode(LoginDTO.IS_DELETE);
+ loginDTO.setCode(ResponseCodeEnum.ACCOUNT_IS_DELETE.getCode());
+ loginDTO.setMsg(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
return loginDTO;
}
//������������
if (!MD5Utils.saltMD5Verify(password, manageAccount.getPassword())) {
- loginDTO.setCode(LoginDTO.PASSWORD_ERROR);
+ loginDTO.setCode(ResponseCodeEnum.PASSWORD_INVALID.getCode());
+ loginDTO.setMsg(ResponseCodeEnum.PASSWORD_INVALID.getMsg());
return loginDTO;
}
//������������
List<ManageRole> roles = manageRoleMapper.getManageRoleByAccountId(manageAccount.getId());
- if (ObjectUtils.isEmpty(roles)) {//������������������������������
- loginDTO.setCode(LoginDTO.ROLE_EMPTY);
- return loginDTO;
- }
+
//������������
- List<ManageMenu> menus = manageMenuMapper.getParentChildrenMenusByRoles(roles);
- if (ObjectUtils.isEmpty(menus)) {//������������������������������
- loginDTO.setCode(LoginDTO.MENU_EMPTY);
- return loginDTO;
+ List<ManageMenu> menus = null;
+ if (!ObjectUtils.isEmpty(roles)) {
+ menus = manageMenuMapper.getParentChildrenMenusByRoles(roles);
}
//������������������
@@ -122,7 +122,8 @@
String token = TokenUtils.getToken(String.valueOf(manageAccount.getId()), accountInfoDTO);
//������������������
- loginDTO.setCode(LoginDTO.SUCCESS);
+ loginDTO.setCode(ResponseCodeEnum.SUCCESS.getCode());
+ loginDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
loginDTO.setAccountInfoDTO(accountInfoDTO);
loginDTO.setToken(token);
@@ -132,14 +133,14 @@
/**
* @Description: ������
* @Param: [parameters]
- * @return: java.util.Map<java.lang.String , java.lang.Object>
+ * @return: java.util.Map<java.lang.String , java.lang.Object>
* @Author: ���������
* @Date: 2021/3/11
*/
@Override
- public boolean logout(LogoutRequest logoutRequest) {
- String accountId = logoutRequest.getAccountId();
- String token = logoutRequest.getToken();
+ public boolean logout(LogoutForm logoutForm) {
+ String accountId = logoutForm.getAccountId();
+ String token = logoutForm.getToken();
TokenUtils.destoryToken(accountId, token);
return true;
}
@@ -153,47 +154,52 @@
*/
@Override
@Transactional
- public AccountInsertDTO insertAccount(AccountInsertRequest accountInsertRequest) {
+ public AccountInsertDTO insertAccount(AccountInsertForm accountInsertForm) {
AccountInsertDTO accountInsertDTO = new AccountInsertDTO();
//������
- String AESAccount = accountInsertRequest.getAccount();
- String AESPassword = accountInsertRequest.getPassword();
- String account = AESUtils.decrypt(AESAccount, AESKey);
+ String account = accountInsertForm.getAccount();
+ String AESPassword = accountInsertForm.getPassword();
String password = MD5Utils.saltMD5(AESUtils.decrypt(AESPassword, AESKey));
- String userName = accountInsertRequest.getUserName();
- String email = accountInsertRequest.getEmail();
- String mobile = accountInsertRequest.getMobile();
- String wechat = accountInsertRequest.getWechat();
- List<String> roleIdsStr = accountInsertRequest.getRoleIds();
+ String userName = accountInsertForm.getUserName();
+ String email = accountInsertForm.getEmail();
+ String mobile = accountInsertForm.getMobile();
+ String wechat = accountInsertForm.getWechat();
+ List<String> roleIdsStr = accountInsertForm.getRoleIds();
//������������������������������������
/*���������������������������������������*/
if (isSpecialChar(account)) {
- accountInsertDTO.setCode(AccountInsertDTO.ACCOUNT_EXIST_SPECIAL_CHAR);
+ accountInsertDTO.setCode(ResponseCodeEnum.ACCOUNT_EXIST_SPECIAL_CHAR.getCode());
+ accountInsertDTO.setMsg(ResponseCodeEnum.ACCOUNT_EXIST_SPECIAL_CHAR.getMsg());
return accountInsertDTO;
}
/*������������������������������������*/
if (isSpecialChar(password)) {
- accountInsertDTO.setCode(AccountInsertDTO.PASSWORD_EXIST_SPECIAL_CHAR);
+ accountInsertDTO.setCode(ResponseCodeEnum.PASSWORD_EXIST_SPECIAL_CHAR.getCode());
+ accountInsertDTO.setMsg(ResponseCodeEnum.PASSWORD_EXIST_SPECIAL_CHAR.getMsg());
return accountInsertDTO;
}
/*���������������������������������*/
- if (account.length() >= 20||account.length()<=6) {
- accountInsertDTO.setCode(AccountInsertDTO.ACCOUNT_LENGTH_INVALID);
+ if (account.length() >= 20 || account.length() <= 6) {
+ accountInsertDTO.setCode(ResponseCodeEnum.ACCOUNT_LENGTH_INVALID.getCode());
+ accountInsertDTO.setMsg(ResponseCodeEnum.ACCOUNT_LENGTH_INVALID.getMsg());
return accountInsertDTO;
}
/*������������������������������*/
- if (AESUtils.decrypt(AESPassword, AESKey).length() >= 20||AESUtils.decrypt(AESPassword, AESKey).length() <= 6) {
- accountInsertDTO.setCode(AccountInsertDTO.PASSWORD_LENGTH_INVALID);
+ if (AESUtils.decrypt(AESPassword, AESKey).length() >= 20 || AESUtils.decrypt(AESPassword, AESKey).length() <= 6) {
+ accountInsertDTO.setCode(ResponseCodeEnum.PASSWORD_LENGTH_INVALID.getCode());
+ accountInsertDTO.setMsg(ResponseCodeEnum.PASSWORD_LENGTH_INVALID.getMsg());
return accountInsertDTO;
}
/*���������������������������������*/
if (!isValidMobile(mobile)) {
- accountInsertDTO.setCode(AccountInsertDTO.MOBILE_INVALID);
+ accountInsertDTO.setCode(ResponseCodeEnum.MOBILE_INVALID.getCode());
+ accountInsertDTO.setMsg(ResponseCodeEnum.MOBILE_INVALID.getMsg());
return accountInsertDTO;
}
/*������������������������������*/
if (!isValidEmail(email)) {
- accountInsertDTO.setCode(AccountInsertDTO.EMAIL_INVALID);
+ accountInsertDTO.setCode(ResponseCodeEnum.EMAIL_INVALID.getCode());
+ accountInsertDTO.setMsg(ResponseCodeEnum.EMAIL_INVALID.getMsg());
return accountInsertDTO;
}
/*������������������������*/
@@ -204,13 +210,10 @@
wrapper.setEntity(exitAccount);
List<ManageAccount> exitAccounts = manageAccountMapper.selectList(wrapper);
if (!ObjectUtils.isEmpty(exitAccounts)) {
- accountInsertDTO.setCode(AccountInsertDTO.ACCOUNT_EXIST);
+ accountInsertDTO.setCode(ResponseCodeEnum.ACCOUNT_EXIST.getCode());
+ accountInsertDTO.setMsg(ResponseCodeEnum.ACCOUNT_EXIST.getMsg());
return accountInsertDTO;
}
-
- //String to Integer
- List<Integer> roleIds = new ArrayList<>();
- roleIdsStr.forEach(str -> roleIds.add(Integer.parseInt(str)));
//������account
ManageAccount manageAccount = new ManageAccount();
@@ -222,20 +225,29 @@
manageAccount.setWechat(wechat);
manageAccountMapper.insert(manageAccount);
//������account_role
- Integer accountId = manageAccount.getId();
- roleIdsStr.forEach(
- value -> {
- ManageAccountRole manageAccountRole = new ManageAccountRole();
- manageAccountRole.setAccountId(accountId);
- manageAccountRole.setRoleId(Integer.parseInt(value));
- manageAccountRoleMapper.insert(manageAccountRole);
- }
- );
+ /*String to Integer*/
+ List<ManageRole> roles = null;
+ //������������������������������������������������������
+ if (!ObjectUtils.isEmpty(roleIdsStr)) {
+ List<Integer> roleIds = new ArrayList<>();
+ roleIdsStr.forEach(str -> roleIds.add(Integer.parseInt(str)));
+
+ Integer accountId = manageAccount.getId();
+ roleIdsStr.forEach(
+ value -> {
+ ManageAccountRole manageAccountRole = new ManageAccountRole();
+ manageAccountRole.setAccountId(accountId);
+ manageAccountRole.setRoleId(Integer.parseInt(value));
+ manageAccountRoleMapper.insert(manageAccountRole);
+ }
+ );
+ roles = manageRoleMapper.selectBatchIds(roleIds);
+ }
//������������������
- List<ManageRole> roles = manageRoleMapper.selectBatchIds(roleIds);
accountInsertDTO.setAccount(manageAccount);
accountInsertDTO.setRoles(roles);
- accountInsertDTO.setCode(AccountInsertDTO.SUCCESS);
+ accountInsertDTO.setCode(ResponseCodeEnum.SUCCESS.getCode());
+ accountInsertDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
return accountInsertDTO;
}
@@ -247,46 +259,63 @@
* @Date: 2021/3/15
*/
@Override
- public AccountQueryDTO queryAccount(AccountQueryRequest accountQueryRequest) {
+ public AccountQueryDTO queryAccount(AccountQueryForm accountQueryForm) {
AccountQueryDTO accountQueryDTO = new AccountQueryDTO();
//������
- Integer pageCount = accountQueryRequest.getPage();
- Integer size = accountQueryRequest.getSize();
- Integer accountId = accountQueryRequest.getAccountId();
- String account = accountQueryRequest.getAccount();
- String userName = accountQueryRequest.getUserName();
- String email = accountQueryRequest.getEmail();
- String mobile = accountQueryRequest.getMobile();
- String wechat = accountQueryRequest.getWechat();
- String isDelete = accountQueryRequest.getIsDelete();
- //������������������
- Map<String, Object> queryParams = new HashMap<>();
- queryParams.put("id", accountId);
- queryParams.put("account", account);
- queryParams.put("user_name", userName);
- queryParams.put("email", email);
- queryParams.put("mobile", mobile);
- queryParams.put("wechat", wechat);
- if(!ObjectUtils.isEmpty(isDelete))
- queryParams.put("is_delete", isDelete);
- else
- queryParams.put("is_delete","0");
- //���������null���������
- queryParams.values().removeIf(value -> ObjectUtils.isEmpty(value));
+ Integer pageCount = accountQueryForm.getPage();
+ Integer size = accountQueryForm.getSize();
+ Integer accountId = accountQueryForm.getAccountId();
+ String account = accountQueryForm.getAccount();
+ String userName = accountQueryForm.getUserName();
+ String email = accountQueryForm.getEmail();
+ String mobile = accountQueryForm.getMobile();
+ String wechat = accountQueryForm.getWechat();
+ String isDelete = accountQueryForm.getIsDelete();
+
//������������
Page<ManageAccount> page = new Page<>(pageCount, size);
QueryWrapper<ManageAccount> wrapper = new QueryWrapper();
- wrapper.allEq(queryParams);
+ if(!ObjectUtils.isEmpty(accountId)){
+ wrapper.eq("id",accountId);
+ }
+
+ if(!ObjectUtils.isEmpty(userName)){
+ wrapper.like("user_name",userName);
+ }
+
+ if(!ObjectUtils.isEmpty(account)){
+ wrapper.like("account",account);
+ }
+
+ if(!ObjectUtils.isEmpty(email)){
+ wrapper.like("email",email);
+ }
+
+ if(!ObjectUtils.isEmpty(mobile)){
+ wrapper.like("mobile",mobile);
+ }
+
+ if(!ObjectUtils.isEmpty(wechat)){
+ wrapper.like("wechat",wechat);
+ }
+
+ if (!ObjectUtils.isEmpty(isDelete))
+ wrapper.eq("is_delete", isDelete);
+ else
+ wrapper.eq("is_delete", "0");
+
Page resultPage = manageAccountMapper.selectPage(page, wrapper);
//���������������������������
List<ManageAccount> accounts = resultPage.getRecords();
List<AccountDTO> accountDTOS = new ArrayList<>();
- for (ManageAccount manageAccount : accounts) {
- AccountDTO accountDTO = new AccountDTO();
- List<ManageRole> roles = manageRoleMapper.getManageRoleByAccountId(manageAccount.getId());
- accountDTO.setRoles(roles);
- accountDTO.setAccount(manageAccount);
- accountDTOS.add(accountDTO);
+ if (!ObjectUtils.isEmpty(accounts)) {
+ for (ManageAccount manageAccount : accounts) {
+ AccountDTO accountDTO = new AccountDTO();
+ List<ManageRole> roles = manageRoleMapper.getManageRoleByAccountId(manageAccount.getId());
+ accountDTO.setRoles(roles);
+ accountDTO.setAccount(manageAccount);
+ accountDTOS.add(accountDTO);
+ }
}
//������������������
accountQueryDTO.setAccountDTOS(accountDTOS);
@@ -294,28 +323,30 @@
accountQueryDTO.setPages(resultPage.getPages());
accountQueryDTO.setSize(resultPage.getSize());
accountQueryDTO.setTotal(resultPage.getTotal());
+ accountQueryDTO.setCode(ResponseCodeEnum.SUCCESS.getCode());
+ accountQueryDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
return accountQueryDTO;
}
/**
- * @Description: ������������������
- * @Param: [accountUpdateRequest]
- * @return: com.moral.api.pojo.dto.account.AccountUpdateDTO
- * @Author: ���������
- * @Date: 2021/3/16
- */
+ * @Description: ������������������
+ * @Param: [accountUpdateRequest]
+ * @return: com.moral.api.pojo.dto.account.AccountUpdateDTO
+ * @Author: ���������
+ * @Date: 2021/3/16
+ */
@Override
@Transactional
- public AccountUpdateDTO updateAccount(AccountUpdateRequest accountUpdateRequest) {
+ public AccountUpdateDTO updateAccount(AccountUpdateForm accountUpdateForm) {
AccountUpdateDTO accountUpdateDTO = new AccountUpdateDTO();
//������
- Integer accountId = accountUpdateRequest.getAccountId();
- String email = accountUpdateRequest.getEmail();
- String mobile = accountUpdateRequest.getMobile();
- String wechat = accountUpdateRequest.getWechat();
- String userName = accountUpdateRequest.getUserName();
- List<Integer> roleIds = accountUpdateRequest.getRoleIds();
+ Integer accountId = accountUpdateForm.getAccountId();
+ String email = accountUpdateForm.getEmail();
+ String mobile = accountUpdateForm.getMobile();
+ String wechat = accountUpdateForm.getWechat();
+ String userName = accountUpdateForm.getUserName();
+ List<Integer> roleIds = accountUpdateForm.getRoleIds();
//������������������������������
/*������������������������������������*/
QueryWrapper<ManageAccount> exitWrapper = new QueryWrapper<>();
@@ -324,18 +355,21 @@
exitManageAccount.setIsDelete("0");
exitWrapper.setEntity(exitManageAccount);
List<ManageAccount> manageAccounts = manageAccountMapper.selectList(exitWrapper);
- if(ObjectUtils.isEmpty(manageAccounts)){
- accountUpdateDTO.setCode(AccountUpdateDTO.ACCOUNT_NOT_EXIST);
+ if (ObjectUtils.isEmpty(manageAccounts)) {
+ accountUpdateDTO.setCode(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getCode());
+ accountUpdateDTO.setMsg(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
return accountUpdateDTO;
}
/*���������������������������������*/
if (!isValidMobile(mobile)) {
- accountUpdateDTO.setCode(AccountUpdateDTO.MOBILE_INVALID);
+ accountUpdateDTO.setCode(ResponseCodeEnum.MOBILE_INVALID.getCode());
+ accountUpdateDTO.setMsg(ResponseCodeEnum.MOBILE_INVALID.getMsg());
return accountUpdateDTO;
}
/*������������������������������*/
if (!isValidEmail(email)) {
- accountUpdateDTO.setCode(AccountUpdateDTO.EMAIL_INVALID);
+ accountUpdateDTO.setCode(ResponseCodeEnum.EMAIL_INVALID.getCode());
+ accountUpdateDTO.setMsg(ResponseCodeEnum.EMAIL_INVALID.getMsg());
return accountUpdateDTO;
}
//������ManageAccount���
@@ -345,12 +379,12 @@
manageAccount.setWechat(wechat);
manageAccount.setUserName(userName);
QueryWrapper<ManageAccount> wrapper = new QueryWrapper<>();
- wrapper.eq("id",accountId);
- manageAccountMapper.update(manageAccount,wrapper);
+ wrapper.eq("id", accountId);
+ manageAccountMapper.update(manageAccount, wrapper);
//������ManageAccountRole���
/*������������������������������*/
QueryWrapper<ManageAccountRole> deleteWrapper = new QueryWrapper<>();
- deleteWrapper.eq("account_id",accountId);
+ deleteWrapper.eq("account_id", accountId);
manageAccountRoleMapper.delete(deleteWrapper);
/*������������������*/
for (Integer roleId : roleIds) {
@@ -362,7 +396,8 @@
//������������������������
List<ManageRole> manageRoles = manageRoleMapper.selectBatchIds(roleIds);
//������������������
- accountUpdateDTO.setCode(AccountUpdateDTO.SUCCESS);
+ accountUpdateDTO.setCode(ResponseCodeEnum.SUCCESS.getCode());
+ accountUpdateDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
accountUpdateDTO.setRoles(manageRoles);
accountUpdateDTO.setAccount(manageAccountMapper.selectById(accountId));
return accountUpdateDTO;
@@ -370,18 +405,18 @@
/**
- * @Description: ������������������
- * @Param: [accountDeleteRequest]
- * @return: com.moral.api.pojo.dto.account.AccountDeleteDTO
- * @Author: ���������
- * @Date: 2021/3/16
- */
+ * @Description: ������������������
+ * @Param: [accountDeleteRequest]
+ * @return: com.moral.api.pojo.dto.account.AccountDeleteDTO
+ * @Author: ���������
+ * @Date: 2021/3/16
+ */
@Override
@Transactional
- public AccountDeleteDTO deleteAccount(AccountDeleteRequest accountDeleteRequest) {
+ public AccountDeleteDTO deleteAccount(AccountDeleteForm accountDeleteForm) {
AccountDeleteDTO accountDeleteDTO = new AccountDeleteDTO();
//������
- Integer accountId = accountDeleteRequest.getAccountId();
+ Integer accountId = accountDeleteForm.getAccountId();
//������������������
ManageAccount manageAccount = new ManageAccount();
manageAccount.setIsDelete("0");
@@ -389,21 +424,23 @@
QueryWrapper<ManageAccount> queryWrapper = new QueryWrapper<>();
queryWrapper.setEntity(manageAccount);
ManageAccount existManageAccount = manageAccount.selectOne(queryWrapper);
- if(ObjectUtils.isEmpty(existManageAccount)){
- accountDeleteDTO.setCode(AccountDeleteDTO.ACCOUNT_NOT_EXIST);
+ if (ObjectUtils.isEmpty(existManageAccount)) {
+ accountDeleteDTO.setCode(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getCode());
+ accountDeleteDTO.setMsg(ResponseCodeEnum.ACCOUNT_NOT_EXIST.getMsg());
return accountDeleteDTO;
}
//������������������
existManageAccount.setIsDelete("1");
UpdateWrapper<ManageAccount> deleteAccountWrapper = new UpdateWrapper<>();
- deleteAccountWrapper.set("is_delete","1").eq("id",manageAccount.getId());
- manageAccountMapper.update(null,deleteAccountWrapper);
+ deleteAccountWrapper.set("is_delete", "1").eq("id", manageAccount.getId());
+ manageAccountMapper.update(null, deleteAccountWrapper);
//������������������������������
UpdateWrapper<ManageAccountRole> deleteManageAccountRoleWrapper = new UpdateWrapper<>();
- deleteManageAccountRoleWrapper.set("is_delete","1").eq("account_id",manageAccount.getId());
- manageAccountRoleMapper.update(null,deleteManageAccountRoleWrapper);
+ deleteManageAccountRoleWrapper.set("is_delete", "1").eq("account_id", manageAccount.getId());
+ manageAccountRoleMapper.update(null, deleteManageAccountRoleWrapper);
//������������������
- accountDeleteDTO.setCode(AccountDeleteDTO.SUCCESS);
+ accountDeleteDTO.setCode(ResponseCodeEnum.SUCCESS.getCode());
+ accountDeleteDTO.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
accountDeleteDTO.setAccount(existManageAccount);
return accountDeleteDTO;
}
diff --git a/screen-manage/src/main/resources/mapper/ManageMenuMapper.xml b/screen-manage/src/main/resources/mapper/ManageMenuMapper.xml
index 33dfcee..7dbef4e 100644
--- a/screen-manage/src/main/resources/mapper/ManageMenuMapper.xml
+++ b/screen-manage/src/main/resources/mapper/ManageMenuMapper.xml
@@ -69,6 +69,7 @@
<!--���������������������������������������-->
<select id="getParentChildrenMenusByRoles" resultMap="ParentChildrenResultMap">
select
+ DISTINCT
<include refid="Base_Column_List"></include>
from
manage_menu mm
--
Gitblit v1.8.0