From 6ebf2b2a84b903f3600238dd084b3ae9ee4d6d3b Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 16 Apr 2021 17:33:07 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-manage/src/main/java/com/moral/api/pojo/form/account/AccountInsertForm.java | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/form/account/AccountInsertForm.java b/screen-manage/src/main/java/com/moral/api/pojo/form/account/AccountInsertForm.java
index 56d7d25..e11731f 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/form/account/AccountInsertForm.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/form/account/AccountInsertForm.java
@@ -1,14 +1,14 @@
package com.moral.api.pojo.form.account;
-import com.moral.api.pojo.dto.account.AccountInsertDTO;
+import com.moral.api.entity.ManageAccount;
+import com.moral.api.pojo.dto.account.AccountDTO;
import com.moral.constant.ResponseCodeEnum;
import com.moral.util.AESUtils;
+import com.moral.util.MD5Utils;
import com.moral.util.RegexUtils;
import lombok.Data;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.util.ObjectUtils;
-import java.io.Serializable;
import java.util.List;
/**
@@ -19,7 +19,7 @@
* @Version TODO
**/
@Data
-public class AccountInsertForm implements Serializable{
+public class AccountInsertForm {
private String account;
@@ -39,29 +39,20 @@
private String wechat;
-
- private String createTime;
-
-
- private String updateTime;
-
-
private List<String> roleIds;
public boolean valid() {
if (
ObjectUtils.isEmpty(account) ||
ObjectUtils.isEmpty(password) ||
- ObjectUtils.isEmpty(email) ||
- ObjectUtils.isEmpty(mobile) ||
ObjectUtils.isEmpty(userName)
)
return false;
return true;
}
- public AccountInsertDTO paramValid(){
- AccountInsertDTO dto = new AccountInsertDTO();
+ public AccountDTO paramValid(){
+ AccountDTO dto = new AccountDTO();
//���������������������������������
if(!RegexUtils.checkAccount(account)){
dto.setCode(ResponseCodeEnum.ACCOUNT_INVALID.getCode());
@@ -90,4 +81,15 @@
dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
return dto;
}
+
+ public ManageAccount formConvertEntity(){
+ ManageAccount manageAccount = new ManageAccount();
+ manageAccount.setAccount(account);
+ manageAccount.setPassword(MD5Utils.saltMD5(AESUtils.decrypt(password)));
+ manageAccount.setUserName(userName);
+ manageAccount.setEmail(email);
+ manageAccount.setMobile(mobile);
+ manageAccount.setWechat(wechat);
+ return manageAccount;
+ }
}
--
Gitblit v1.8.0