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);
             }
         }

@@ -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");