From 23ad681499f8652fe4e2084e6492ececb6fc7551 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Wed, 01 Nov 2023 16:56:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
screen-manage/src/main/java/com/moral/api/pojo/form/user/UserInsertForm.java | 100 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 99 insertions(+), 1 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/pojo/form/user/UserInsertForm.java b/screen-manage/src/main/java/com/moral/api/pojo/form/user/UserInsertForm.java
index 23d6dcb..1ed98e1 100644
--- a/screen-manage/src/main/java/com/moral/api/pojo/form/user/UserInsertForm.java
+++ b/screen-manage/src/main/java/com/moral/api/pojo/form/user/UserInsertForm.java
@@ -1,14 +1,112 @@
package com.moral.api.pojo.form.user;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.moral.api.entity.User;
+import com.moral.api.pojo.dto.user.UserDTO;
+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.format.annotation.DateTimeFormat;
+import org.springframework.util.ObjectUtils;
+
+import java.util.Date;
+
/**
* @ClassName UserInsertForm
* @Description TODO
* @Author ���������
- * @Date 2021/3/22 14:05
+ * @Date 2021/5/6 10:35
* @Version TODO
**/
+@Data
public class UserInsertForm {
+ private String account;
+ private String password;
+
+ private String userName;
+
+ private Integer organizationId;
+
+ private String email;
+
+ private String mobile;
+
+ private String wechat;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ private Date expireTime;
+
+
+ public boolean valid() {
+ if (
+ ObjectUtils.isEmpty(account) ||
+ ObjectUtils.isEmpty(password) ||
+ ObjectUtils.isEmpty(userName) ||
+ ObjectUtils.isEmpty(organizationId) ||
+ ObjectUtils.isEmpty(expireTime)
+ )
+ return false;
+ return true;
+ }
+
+ public UserDTO paramValid() {
+ UserDTO dto = new UserDTO();
+ //������������������������������
+ if (!RegexUtils.checkAccount(account)) {
+ dto.setCode(ResponseCodeEnum.ACCOUNT_INVALID.getCode());
+ dto.setMsg(ResponseCodeEnum.ACCOUNT_INVALID.getMsg());
+ return dto;
+ }
+ //���������������������������������
+ if(userName.contains(" ")){
+ dto.setCode(ResponseCodeEnum.USERNAME_INVALID.getCode());
+ dto.setMsg(ResponseCodeEnum.USERNAME_INVALID.getMsg());
+ return dto;
+ }
+ //������������������������������
+ if (!RegexUtils.checkPassword(AESUtils.decrypt(password))) {
+ dto.setCode(ResponseCodeEnum.PASSWORD_INVALID.getCode());
+ dto.setMsg(ResponseCodeEnum.PASSWORD_INVALID.getMsg());
+ return dto;
+ }
+ //���������������������������������
+ if (!ObjectUtils.isEmpty(mobile)) {
+ if (!RegexUtils.checkMobile(mobile)) {
+ dto.setCode(ResponseCodeEnum.MOBILE_INVALID.getCode());
+ dto.setMsg(ResponseCodeEnum.MOBILE_INVALID.getMsg());
+ return dto;
+ }
+ }
+ //������������������������������
+ if (!ObjectUtils.isEmpty(email)) {
+ if (!RegexUtils.checkEmail(email)) {
+ dto.setCode(ResponseCodeEnum.EMAIL_INVALID.getCode());
+ dto.setMsg(ResponseCodeEnum.EMAIL_INVALID.getMsg());
+ return dto;
+ }
+ }
+ dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
+ dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
+ return dto;
+ }
+
+ public User formConvertEntity() {
+ User user = new User();
+ user.setAccount(account);
+ user.setPassword(MD5Utils.saltMD5(AESUtils.decrypt(password)));
+ user.setUserName(userName);
+ user.setOrganizationId(organizationId);
+ user.setEmail(email);
+ user.setMobile(mobile);
+ user.setWechat(wechat);
+ user.setExpireTime(expireTime);
+ user.setIsAdmin(true);
+ return user;
+ }
}
--
Gitblit v1.8.0