manager|实体调整

@@ -6,6 +6,7 @@ import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo;
 import com.fedex.connect.common.dependencies.util.GsonUtils;
 import com.fedex.connect.common.dependencies.util.StringExtUtil;
 import com.fedex.connect.common.dependencies.util.Utils;
+import com.fedex.connect.common.model.sys.User;
 import com.fedex.connect.manager.common.enums.FCLSessionInfoEnum;
 import com.fedex.connect.manager.controller.AbstractEtController;
 import com.fedex.connect.manager.controller.system.ISysAuthController;
@@ -128,7 +129,7 @@ public class SysAuthControllerImpl extends AbstractEtController implements ISysA
                 } else {
                     loginUser.setUserName(StringUtils.trimToEmpty(fcl_contactname));
                 }
-                loginUser.setUpdateTime(new Date());
+                loginUser.setModifyTime(new Date());
                 sysUserService.update(loginUser);
             }
         }

@@ -2,14 +2,10 @@ package com.fedex.connect.manager.data.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fedex.connect.common.dependencies.contants.DatabaseConstants;
-import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo;
-import com.fedex.connect.common.dependencies.enums.ResponseCode;
-import com.fedex.connect.common.dependencies.util.BytesUtils;
-import com.fedex.connect.common.dependencies.util.StringExtUtil;
 import com.fedex.connect.common.dependencies.util.Utils;
+import com.fedex.connect.common.model.sys.User;
 import io.swagger.annotations.ApiModel;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.math.NumberUtils;
 
 import java.util.Date;
 
@@ -19,119 +15,6 @@ import java.util.Date;
 @ApiModel(value = "用户相关DTO")
 public class SysUserDto {
 
-    public static SysUserDto dataProcessing(SysUserDto dto){
-        dto.setAccNo(Utils.trim(dto.getAccNo()));
-        dto.setUserName(Utils.trim(dto.getUserName()));
-        dto.setPassword(Utils.trim(dto.getPassword()));
-        dto.setPassword2(Utils.trim(dto.getPassword2()));
-        dto.setFedexAccNo(Utils.trim(dto.getFedexAccNo()));
-        dto.setFedexAccNo2(Utils.trim(dto.getFedexAccNo2()));
-        //邮箱@后面转小写处理
-        dto.setEmail(StringExtUtil.emailSuffixDispose(Utils.trim(dto.getEmail())));
-        dto.setPhone(Utils.trim(dto.getPhone()));
-        dto.setCompanyName(Utils.trim(dto.getCompanyName()));
-        dto.setUnifiedBusinessNum(Utils.trim(dto.getUnifiedBusinessNum()));
-        dto.setCustomsSerialNum(Utils.trim(dto.getCustomsSerialNum()));
-        dto.setUserSource(DatabaseConstants.USER_SOURCE_TW);
-        dto.setTypeCode(DatabaseConstants.DICT_USER_DEFAULT_CODE);
-        return dto;
-    }
-
-    /**
-     * dto的校验方法
-     * @param dto
-     * @return
-     */
-    public static ResponseResultVo validatedDto(SysUserDto dto){
-        if (dto == null){
-            ResponseResultVo.fail(ResponseCode.REQUEST_PARAM_NULL.getMsg());
-        }
-        //必填校验
-        if (StringUtils.isBlank(dto.getAccNo())){
-            ResponseResultVo.fail("dto_vali_user_accno_null");
-        }
-        if (BytesUtils.getStrUTF8ByteLength(dto.getAccNo()) > 200){
-            ResponseResultVo.fail("dto_vali_user_accno_max");
-        }
-        if (StringUtils.isBlank(dto.getUserName())){
-            ResponseResultVo.fail("dto_vali_user_name_null");
-        }
-        if (BytesUtils.getStrUTF8ByteLength(dto.getUserName()) > 200){
-            ResponseResultVo.fail("dto_vali_user_name_max");
-        }
-        if (StringUtils.isBlank(dto.getPassword())){
-            ResponseResultVo.fail("dto_vali_user_pwd_null");
-        }
-        if (BytesUtils.getStrUTF8ByteLength(dto.getPassword()) > 255){
-            ResponseResultVo.fail("dto_vali_user_pwd_max");
-        }
-        if (StringUtils.isBlank(dto.getPassword2())){
-            ResponseResultVo.fail("dto_vali_user_pwd2_null");
-        }
-        if (StringUtils.equals(dto.getPassword(),dto.getPassword2())){
-            ResponseResultVo.fail("dto_vali_user_pwd3_null");
-        }
-        if (StringUtils.isBlank(dto.getFedexAccNo())){
-            ResponseResultVo.fail("dto_vali_user_fed_no_null");
-        }
-        if (BytesUtils.getStrUTF8ByteLength(dto.getFedexAccNo()) > 200){
-            ResponseResultVo.fail("dto_vali_user_fed_no_max");
-        }
-        if (!NumberUtils.isDigits(dto.getFedexAccNo()) || dto.getFedexAccNo().length() != 9){
-            ResponseResultVo.fail("dto_vali_user_fed_no_num");
-        }
-        if (StringUtils.isBlank(dto.getFedexAccNo2())){
-            ResponseResultVo.fail("dto_vali_user_fed_no_null");
-        }
-        if (!NumberUtils.isDigits(dto.getFedexAccNo2()) || dto.getFedexAccNo2().length() != 9){
-            ResponseResultVo.fail("dto_vali_user_fed_no_num");
-        }
-        if (StringUtils.equals(dto.getFedexAccNo(),dto.getFedexAccNo2())){
-            ResponseResultVo.fail("dto_vali_user_fed_no3_null");
-        }
-        if (StringUtils.isBlank(dto.getEmail())){
-            ResponseResultVo.fail("dto_vali_user_email_null");
-        }
-        if (BytesUtils.getStrUTF8ByteLength(dto.getEmail()) > 100){
-            ResponseResultVo.fail("dto_vali_user_email_max");
-        }
-        if (!StringExtUtil.isEmail(dto.getEmail())){
-            ResponseResultVo.fail("dto_vali_user_email_final");
-        }
-        if (StringUtils.isBlank(dto.getPhone())){
-            ResponseResultVo.fail("dto_vali_user_phone_null");
-        }
-        if (BytesUtils.getStrUTF8ByteLength(dto.getPhone()) > 20){
-            ResponseResultVo.fail("dto_vali_user_phone_max");
-        }
-        if (StringUtils.isBlank(dto.getCompanyName())){
-            ResponseResultVo.fail("dto_vali_user_com_name_null");
-        }
-        if (BytesUtils.getStrUTF8ByteLength(dto.getCompanyName()) > 255){
-            ResponseResultVo.fail("dto_vali_user_com_name_max");
-        }
-        if (StringUtils.isBlank(dto.getUnifiedBusinessNum())){
-            ResponseResultVo.fail("dto_vali_user_no_null");
-        }
-        if (BytesUtils.getStrUTF8ByteLength(dto.getUnifiedBusinessNum()) > 30){
-            ResponseResultVo.fail("dto_vali_user_no_max");
-        }
-        if (!StringUtils.isBlank(dto.getCustomsSerialNum()) &&
-                BytesUtils.getStrUTF8ByteLength(dto.getUnifiedBusinessNum()) > 30){
-            ResponseResultVo.fail("dto_vali_serlai_max");
-        }
-        if (!NumberUtils.isDigits(dto.getUnifiedBusinessNum())){
-            ResponseResultVo.fail("dto_vali_user_no_final");
-        }
-        if (!dto.isPolicyFlag()){
-            ResponseResultVo.fail("dto_vali_user_no_policy");
-        }
-        if (!dto.isClauseFlag()){
-            ResponseResultVo.fail("dto_vali_user_no_clause");
-        }
-        return ResponseResultVo.succ(null);
-    }
-
     /**
      * dto 转 dao
      * @return
@@ -144,22 +27,21 @@ public class SysUserDto {
         if (dto.getId() != null && dto.getId() != 0){
             user.setId(dto.getId());
         }
-        user.setAccNo(dto.getAccNo());
+        user.setLoginName(dto.getLoginName());
         user.setUserName(dto.getUserName());
         user.setPassword(dto.getPassword());
-        user.setFedexAccNo(dto.getFedexAccNo());
+        user.setAccountNo(dto.getAccountNo());
         user.setEmail(dto.getEmail());
         user.setPhone(dto.getPhone());
         user.setCompanyName(dto.getCompanyName());
         user.setUnifiedBusinessNum(dto.getUnifiedBusinessNum());
         user.setCustomsSerialNum(dto.getCustomsSerialNum());
         user.setCreateTime(new Date());
-        user.setUpdateTime(new Date());
-        user.setPwdLastUpdTime(null);
+        user.setModifyTime(new Date());
         user.setTypeId(0L);
         user.setStatus(DatabaseConstants.GLOBAL_STATUS_VALID);
         user.setRemark(dto.getRemark());
-        user.setUserSource(dto.getUserSource());
+        user.setTypeId(dto.getTypeId());
         return user;
     }
 
@@ -167,7 +49,7 @@ public class SysUserDto {
         String fcl_acc_no = DatabaseConstants.FCL_PREFIX + "_" + uuid;
         String fcl_pwd = DatabaseConstants.FCL_PREFIX + "_" + uuid + "_pwd";
 
-        this.accNo = uuid;
+        this.loginName = uuid;
         if (Utils.isNotEmpty(contactname)){
             this.userName = StringUtils.trimToEmpty(contactname);
         } else {
@@ -175,13 +57,12 @@ public class SysUserDto {
         }
 
         this.password = fcl_pwd;
-        this.fedexAccNo = uuid;
+        this.loginName = uuid;
         this.email = null;
         this.phone = null;
         this.companyName = null;
         this.unifiedBusinessNum = null;
         this.customsSerialNum = null;
-        this.userSource = DatabaseConstants.USER_SOURCE_FCL;
         this.typeCode = DatabaseConstants.DICT_USER_FEDEX_CODE;
     }
 
@@ -193,7 +74,7 @@ public class SysUserDto {
     /**
      * 用户账号
      */
-    private String accNo;
+    private String loginName;
 
     /**
      * 姓名
@@ -213,7 +94,7 @@ public class SysUserDto {
     /**
      * FedEx账户
      */
-    private String fedexAccNo;
+    private String accountNo;
 
     /**
      * FedEx账户
@@ -277,12 +158,6 @@ public class SysUserDto {
     @JsonIgnore
     private String remark;
 
-    /**
-     * 用户信息来源。1：台湾项目注册。2：FCL
-     */
-    @JsonIgnore
-    private Long userSource;
-
     public Long getId() {
         return id;
     }
@@ -291,12 +166,12 @@ public class SysUserDto {
         this.id = id;
     }
 
-    public String getAccNo() {
-        return accNo;
+    public String getLoginName() {
+        return loginName;
     }
 
-    public void setAccNo(String accNo) {
-        this.accNo = accNo;
+    public void setLoginName(String loginName) {
+        this.loginName = loginName;
     }
 
     public String getUserName() {
@@ -315,12 +190,28 @@ public class SysUserDto {
         this.password = password;
     }
 
-    public String getFedexAccNo() {
-        return fedexAccNo;
+    public String getPassword2() {
+        return password2;
+    }
+
+    public void setPassword2(String password2) {
+        this.password2 = password2;
+    }
+
+    public String getAccountNo() {
+        return accountNo;
+    }
+
+    public void setAccountNo(String accountNo) {
+        this.accountNo = accountNo;
     }
 
-    public void setFedexAccNo(String fedexAccNo) {
-        this.fedexAccNo = fedexAccNo;
+    public String getFedexAccNo2() {
+        return fedexAccNo2;
+    }
+
+    public void setFedexAccNo2(String fedexAccNo2) {
+        this.fedexAccNo2 = fedexAccNo2;
     }
 
     public String getEmail() {
@@ -371,28 +262,20 @@ public class SysUserDto {
         this.typeId = typeId;
     }
 
-    public Long getStatus() {
-        return status;
-    }
-
-    public void setStatus(Long status) {
-        this.status = status;
-    }
-
-    public String getPassword2() {
-        return password2;
+    public String getTypeCode() {
+        return typeCode;
     }
 
-    public void setPassword2(String password2) {
-        this.password2 = password2;
+    public void setTypeCode(String typeCode) {
+        this.typeCode = typeCode;
     }
 
-    public String getFedexAccNo2() {
-        return fedexAccNo2;
+    public Long getStatus() {
+        return status;
     }
 
-    public void setFedexAccNo2(String fedexAccNo2) {
-        this.fedexAccNo2 = fedexAccNo2;
+    public void setStatus(Long status) {
+        this.status = status;
     }
 
     public boolean isPolicyFlag() {
@@ -418,45 +301,4 @@ public class SysUserDto {
     public void setRemark(String remark) {
         this.remark = remark;
     }
-
-    public Long getUserSource() {
-        return userSource;
-    }
-
-    public void setUserSource(Long userSource) {
-        this.userSource = userSource;
-    }
-
-    public String getTypeCode() {
-        return typeCode;
-    }
-
-    public void setTypeCode(String typeCode) {
-        this.typeCode = typeCode;
-    }
-
-    public SysUserDto() {
-    }
-
-    public SysUserDto(Long id, String accNo, String userName, String password, String password2, String fedexAccNo, String fedexAccNo2, String email, String phone, String companyName, String unifiedBusinessNum, String customsSerialNum, Long typeId, String typeCode, Long status, boolean policyFlag, boolean clauseFlag, String remark, Long userSource) {
-        this.id = id;
-        this.accNo = accNo;
-        this.userName = userName;
-        this.password = password;
-        this.password2 = password2;
-        this.fedexAccNo = fedexAccNo;
-        this.fedexAccNo2 = fedexAccNo2;
-        this.email = email;
-        this.phone = phone;
-        this.companyName = companyName;
-        this.unifiedBusinessNum = unifiedBusinessNum;
-        this.customsSerialNum = customsSerialNum;
-        this.typeId = typeId;
-        this.typeCode = typeCode;
-        this.status = status;
-        this.policyFlag = policyFlag;
-        this.clauseFlag = clauseFlag;
-        this.remark = remark;
-        this.userSource = userSource;
-    }
 }

@@ -4,6 +4,8 @@ import com.fedex.connect.common.dao.bi.DictionaryEntriesMapper;
 import com.fedex.connect.common.dao.log.UserLoginInfoMapper;
 import com.fedex.connect.common.dao.sys.RedisSlabMapper;
 import com.fedex.connect.common.dao.sys.RoleMapper;
+import com.fedex.connect.common.dao.sys.UserMapper;
+import com.fedex.connect.common.dao.sys.UserRoleMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 
 public class BaseDao {

 package com.fedex.connect.manager.repository.repo.sys;
 
+import com.fedex.connect.common.model.sys.User;
+import com.fedex.connect.common.model.sys.UserExample;
+
 import java.util.List;
 
 public interface IUserRepository {

 package com.fedex.connect.manager.repository.repo.sys;
 
+import com.fedex.connect.common.model.sys.UserRole;
+import com.fedex.connect.common.model.sys.UserRoleExample;
+
 import java.util.List;
 
 public interface IUserRoleRepository {

 package com.fedex.connect.manager.repository.repo.sys.impl;
 
+import com.fedex.connect.common.model.sys.User;
+import com.fedex.connect.common.model.sys.UserExample;
 import com.fedex.connect.manager.repository.base.BaseDao;
 import com.fedex.connect.manager.repository.repo.sys.IUserRepository;
 import org.springframework.stereotype.Repository;

 package com.fedex.connect.manager.repository.repo.sys.impl;
 
+import com.fedex.connect.common.model.sys.UserRole;
+import com.fedex.connect.common.model.sys.UserRoleExample;
 import com.fedex.connect.manager.repository.base.BaseDao;
 import com.fedex.connect.manager.repository.repo.sys.IUserRoleRepository;
 import org.springframework.stereotype.Repository;

@@ -3,6 +3,8 @@ package com.fedex.connect.manager.service.base;
 
 import com.fedex.connect.common.dao.log.UserLoginInfoMapper;
 import com.fedex.connect.common.dao.sys.RoleMapper;
+import com.fedex.connect.common.dao.sys.UserMapper;
+import com.fedex.connect.common.dao.sys.UserRoleMapper;
 import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil;
 import com.fedex.connect.manager.repository.repo.log.IUserLoginLogRepository;
 import com.fedex.connect.manager.repository.repo.sys.*;

 package com.fedex.connect.manager.service.sys;
 
 import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo;
+import com.fedex.connect.common.model.sys.User;
 import com.fedex.connect.manager.data.dto.LoginRequest;
 import com.google.gson.JsonObject;
 

 package com.fedex.connect.manager.service.sys;
 
+import com.fedex.connect.common.model.sys.User;
 import com.fedex.connect.manager.data.dto.SysUserDto;
 
 public interface ISysUserService {

@@ -9,6 +9,7 @@ import com.fedex.connect.common.dependencies.util.GsonUtils;
 import com.fedex.connect.common.dependencies.util.JwtTokenUtils;
 import com.fedex.connect.common.model.sys.RedisSlab;
 import com.fedex.connect.common.model.sys.Role;
+import com.fedex.connect.common.model.sys.User;
 import com.fedex.connect.manager.data.dto.LoginRequest;
 import com.fedex.connect.manager.service.base.AbstractEtService;
 import com.fedex.connect.manager.service.sys.IRedisUtilService;
@@ -58,7 +59,7 @@ public class SysAuthServiceImpl extends AbstractEtService implements ISysAuthSer
         }
 
         //存进redis的token，8小时有效期
-        String token = JwtTokenUtils.createAccessToken(user.getAccNo(), user.getId().toString(), roleCodeList, loginRequest.getRememberMe());
+        String token = JwtTokenUtils.createAccessToken(user.getLoginName(), user.getId().toString(), roleCodeList, loginRequest.getRememberMe());
         try {
             int redisExpireTime = loginRequest.getRememberMe() ? 8 : 2;
             redisUtilService.set(RedisConstants.REDIS_KEY_TOKEN + user.getId(), token, redisExpireTime);

@@ -6,6 +6,8 @@ import com.fedex.connect.common.dependencies.util.Utils;
 import com.fedex.connect.common.model.bi.DictionaryEntries;
 import com.fedex.connect.common.model.sys.Role;
 import com.fedex.connect.common.model.sys.RoleExample;
+import com.fedex.connect.common.model.sys.UserRole;
+import com.fedex.connect.common.model.sys.UserRoleExample;
 import com.fedex.connect.manager.data.model.LogShowModel;
 import com.fedex.connect.manager.service.base.AbstractEtService;
 import com.fedex.connect.manager.service.sys.ISysRoleService;

 package com.fedex.connect.manager.service.sys.impl;
 
 import com.fedex.connect.common.dependencies.contants.DatabaseConstants;
+import com.fedex.connect.common.model.sys.UserRole;
 import com.fedex.connect.manager.data.model.LogShowModel;
 import com.fedex.connect.manager.service.base.AbstractEtService;
 import com.fedex.connect.manager.service.sys.ISysUserRoleService;
@@ -34,7 +35,7 @@ public class SysUserRoleServiceImpl extends AbstractEtService implements ISysUse
             userRole.setRoleId(roleId);
             userRole.setStatus(DatabaseConstants.GLOBAL_STATUS_VALID);
             userRole.setCreateTime(new Date());
-            userRole.setUpdateTime(new Date());
+            userRole.setModifyTime(new Date());
             return userRoleRepository.insert(userRole);
         } catch (Exception e){
             log.error(LogShowModel.showException("Exception",e));

@@ -7,6 +7,8 @@ import com.fedex.connect.common.dependencies.contants.DatabaseConstants;
 import com.fedex.connect.common.dependencies.util.Utils;
 import com.fedex.connect.common.model.bi.DictionaryEntries;
 import com.fedex.connect.common.model.sys.Role;
+import com.fedex.connect.common.model.sys.User;
+import com.fedex.connect.common.model.sys.UserExample;
 import com.fedex.connect.manager.data.dto.SysUserDto;
 import com.fedex.connect.manager.data.model.LogShowModel;
 import com.fedex.connect.manager.service.base.AbstractEtService;
@@ -58,8 +60,7 @@ public class SysUserServiceImpl extends AbstractEtService implements ISysUserSer
             UserExample example = new UserExample();
             UserExample.Criteria criteria = example.createCriteria();
             criteria.andStatusEqualTo(DatabaseConstants.GLOBAL_STATUS_VALID);
-            criteria.andUserSourceEqualTo(DatabaseConstants.USER_SOURCE_FCL);
-            criteria.andAccNoEqualTo(fclUuid);
+            criteria.andLoginNameEqualTo(fclUuid);
             //criteria.andFedexAccNoEqualTo(fclUuid);
             example.setOrderByClause("ID DESC");