common模块： 增加了convert工具类，驼峰和下划线相互转换 更新了Date工具类，添加根据Date，day获取目标date的...

kaiyu

2021-03-31 f0376f72170c2eb236bec5560b8c5734edd222f1

 screen-manage/src/main/java/com/moral/api/pojo/form/account/AccountUpdateForm.java

@@ -1,9 +1,11 @@
package com.moral.api.pojo.form.account;

import com.moral.api.entity.ManageAccount;
import com.moral.api.pojo.dto.account.AccountInsertDTO;
import com.moral.api.pojo.dto.account.AccountUpdateDTO;
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.util.ObjectUtils;
@@ -35,15 +37,15 @@
    private List<Integer> roleIds;

    public boolean valid() {
        if(ObjectUtils.isEmpty(accountId))
        if (ObjectUtils.isEmpty(accountId))
            return false;
        if(
                ObjectUtils.isEmpty(userName)&&
                ObjectUtils.isEmpty(password)&&
                ObjectUtils.isEmpty(email)&&
                ObjectUtils.isEmpty(mobile)&&
                ObjectUtils.isEmpty(wechat)&&
                ObjectUtils.isEmpty(roleIds)
        if (
                ObjectUtils.isEmpty(userName) &&
                        ObjectUtils.isEmpty(password) &&
                        ObjectUtils.isEmpty(email) &&
                        ObjectUtils.isEmpty(mobile) &&
                        ObjectUtils.isEmpty(wechat) &&
                        ObjectUtils.isEmpty(roleIds)
                )
            return false;
        return true;
@@ -68,16 +70,27 @@
            }
        }
        //判断密码是否符合规则
        if (!ObjectUtils.isEmpty(password)){
            if(!RegexUtils.checkPassword(AESUtils.decrypt(password))){
        if (!ObjectUtils.isEmpty(password)) {
            if (!RegexUtils.checkPassword(AESUtils.decrypt(password))) {
                dto.setCode(ResponseCodeEnum.PASSWORD_INVALID.getCode());
                dto.setMsg(ResponseCodeEnum.PASSWORD_INVALID.getMsg());
                return dto;
            }
        }
            dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
        dto.setCode(ResponseCodeEnum.SUCCESS.getCode());
        dto.setMsg(ResponseCodeEnum.SUCCESS.getMsg());
        return dto;
    }

    public ManageAccount formConvertEntity() {
        ManageAccount manageAccount = new ManageAccount();
        manageAccount.setId(accountId);
        if (!ObjectUtils.isEmpty(password))
            manageAccount.setPassword(MD5Utils.saltMD5(AESUtils.decrypt(password)));
        manageAccount.setUserName(userName);
        manageAccount.setEmail(email);
        manageAccount.setMobile(mobile);
        manageAccount.setWechat(wechat);
        return manageAccount;
    }
}