Fedex / iClear-Connect-Pre-Clearance

Go to a project
Toggle navigation Toggle navigation pinning
zelong.shao
aff10582 1 parent 270519c0

manager|实体调整

Expand all
Inline Side-by-side
Showing 14 changed files with 27 additions and 5 deletions
...@@ -6,6 +6,7 @@ import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo; ...@@ -6,6 +6,7 @@ import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo;
6 import com.fedex.connect.common.dependencies.util.GsonUtils; 6 import com.fedex.connect.common.dependencies.util.GsonUtils;
7 import com.fedex.connect.common.dependencies.util.StringExtUtil; 7 import com.fedex.connect.common.dependencies.util.StringExtUtil;
8 import com.fedex.connect.common.dependencies.util.Utils; 8 import com.fedex.connect.common.dependencies.util.Utils;
9 +import com.fedex.connect.common.model.sys.User;
9 import com.fedex.connect.manager.common.enums.FCLSessionInfoEnum; 10 import com.fedex.connect.manager.common.enums.FCLSessionInfoEnum;
10 import com.fedex.connect.manager.controller.AbstractEtController; 11 import com.fedex.connect.manager.controller.AbstractEtController;
11 import com.fedex.connect.manager.controller.system.ISysAuthController; 12 import com.fedex.connect.manager.controller.system.ISysAuthController;
...@@ -128,7 +129,7 @@ public class SysAuthControllerImpl extends AbstractEtController implements ISysA ...@@ -128,7 +129,7 @@ public class SysAuthControllerImpl extends AbstractEtController implements ISysA
128 } else { 129 } else {
129 loginUser.setUserName(StringUtils.trimToEmpty(fcl_contactname)); 130 loginUser.setUserName(StringUtils.trimToEmpty(fcl_contactname));
130 } 131 }
131 - loginUser.setUpdateTime(new Date()); 132 + loginUser.setModifyTime(new Date());
132 sysUserService.update(loginUser); 133 sysUserService.update(loginUser);
133 } 134 }
134 } 135 }
......
...@@ -4,6 +4,8 @@ import com.fedex.connect.common.dao.bi.DictionaryEntriesMapper; ...@@ -4,6 +4,8 @@ import com.fedex.connect.common.dao.bi.DictionaryEntriesMapper;
4 import com.fedex.connect.common.dao.log.UserLoginInfoMapper; 4 import com.fedex.connect.common.dao.log.UserLoginInfoMapper;
5 import com.fedex.connect.common.dao.sys.RedisSlabMapper; 5 import com.fedex.connect.common.dao.sys.RedisSlabMapper;
6 import com.fedex.connect.common.dao.sys.RoleMapper; 6 import com.fedex.connect.common.dao.sys.RoleMapper;
7 +import com.fedex.connect.common.dao.sys.UserMapper;
8 +import com.fedex.connect.common.dao.sys.UserRoleMapper;
7 import org.springframework.beans.factory.annotation.Autowired; 9 import org.springframework.beans.factory.annotation.Autowired;
8 10
9 public class BaseDao { 11 public class BaseDao {
......
1 package com.fedex.connect.manager.repository.repo.sys; 1 package com.fedex.connect.manager.repository.repo.sys;
2 2
3 +import com.fedex.connect.common.model.sys.User;
4 +import com.fedex.connect.common.model.sys.UserExample;
5 +
3 import java.util.List; 6 import java.util.List;
4 7
5 public interface IUserRepository { 8 public interface IUserRepository {
......
1 package com.fedex.connect.manager.repository.repo.sys; 1 package com.fedex.connect.manager.repository.repo.sys;
2 2
3 +import com.fedex.connect.common.model.sys.UserRole;
4 +import com.fedex.connect.common.model.sys.UserRoleExample;
5 +
3 import java.util.List; 6 import java.util.List;
4 7
5 public interface IUserRoleRepository { 8 public interface IUserRoleRepository {
......
1 package com.fedex.connect.manager.repository.repo.sys.impl; 1 package com.fedex.connect.manager.repository.repo.sys.impl;
2 2
3 +import com.fedex.connect.common.model.sys.User;
4 +import com.fedex.connect.common.model.sys.UserExample;
3 import com.fedex.connect.manager.repository.base.BaseDao; 5 import com.fedex.connect.manager.repository.base.BaseDao;
4 import com.fedex.connect.manager.repository.repo.sys.IUserRepository; 6 import com.fedex.connect.manager.repository.repo.sys.IUserRepository;
5 import org.springframework.stereotype.Repository; 7 import org.springframework.stereotype.Repository;
......
1 package com.fedex.connect.manager.repository.repo.sys.impl; 1 package com.fedex.connect.manager.repository.repo.sys.impl;
2 2
3 +import com.fedex.connect.common.model.sys.UserRole;
4 +import com.fedex.connect.common.model.sys.UserRoleExample;
3 import com.fedex.connect.manager.repository.base.BaseDao; 5 import com.fedex.connect.manager.repository.base.BaseDao;
4 import com.fedex.connect.manager.repository.repo.sys.IUserRoleRepository; 6 import com.fedex.connect.manager.repository.repo.sys.IUserRoleRepository;
5 import org.springframework.stereotype.Repository; 7 import org.springframework.stereotype.Repository;
......
...@@ -3,6 +3,8 @@ package com.fedex.connect.manager.service.base; ...@@ -3,6 +3,8 @@ package com.fedex.connect.manager.service.base;
3 3
4 import com.fedex.connect.common.dao.log.UserLoginInfoMapper; 4 import com.fedex.connect.common.dao.log.UserLoginInfoMapper;
5 import com.fedex.connect.common.dao.sys.RoleMapper; 5 import com.fedex.connect.common.dao.sys.RoleMapper;
6 +import com.fedex.connect.common.dao.sys.UserMapper;
7 +import com.fedex.connect.common.dao.sys.UserRoleMapper;
6 import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil; 8 import com.fedex.connect.common.dependencies.i18n.LocaleMessageUtil;
7 import com.fedex.connect.manager.repository.repo.log.IUserLoginLogRepository; 9 import com.fedex.connect.manager.repository.repo.log.IUserLoginLogRepository;
8 import com.fedex.connect.manager.repository.repo.sys.*; 10 import com.fedex.connect.manager.repository.repo.sys.*;
......
1 package com.fedex.connect.manager.service.sys; 1 package com.fedex.connect.manager.service.sys;
2 2
3 import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo; 3 import com.fedex.connect.common.dependencies.date.vo.ResponseResultVo;
4 +import com.fedex.connect.common.model.sys.User;
4 import com.fedex.connect.manager.data.dto.LoginRequest; 5 import com.fedex.connect.manager.data.dto.LoginRequest;
5 import com.google.gson.JsonObject; 6 import com.google.gson.JsonObject;
6 7
......
1 package com.fedex.connect.manager.service.sys; 1 package com.fedex.connect.manager.service.sys;
2 2
3 +import com.fedex.connect.common.model.sys.User;
3 import com.fedex.connect.manager.data.dto.SysUserDto; 4 import com.fedex.connect.manager.data.dto.SysUserDto;
4 5
5 public interface ISysUserService { 6 public interface ISysUserService {
......
...@@ -9,6 +9,7 @@ import com.fedex.connect.common.dependencies.util.GsonUtils; ...@@ -9,6 +9,7 @@ import com.fedex.connect.common.dependencies.util.GsonUtils;
9 import com.fedex.connect.common.dependencies.util.JwtTokenUtils; 9 import com.fedex.connect.common.dependencies.util.JwtTokenUtils;
10 import com.fedex.connect.common.model.sys.RedisSlab; 10 import com.fedex.connect.common.model.sys.RedisSlab;
11 import com.fedex.connect.common.model.sys.Role; 11 import com.fedex.connect.common.model.sys.Role;
12 +import com.fedex.connect.common.model.sys.User;
12 import com.fedex.connect.manager.data.dto.LoginRequest; 13 import com.fedex.connect.manager.data.dto.LoginRequest;
13 import com.fedex.connect.manager.service.base.AbstractEtService; 14 import com.fedex.connect.manager.service.base.AbstractEtService;
14 import com.fedex.connect.manager.service.sys.IRedisUtilService; 15 import com.fedex.connect.manager.service.sys.IRedisUtilService;
...@@ -58,7 +59,7 @@ public class SysAuthServiceImpl extends AbstractEtService implements ISysAuthSer ...@@ -58,7 +59,7 @@ public class SysAuthServiceImpl extends AbstractEtService implements ISysAuthSer
58 } 59 }
59 60
60 //存进redis的token，8小时有效期 61 //存进redis的token，8小时有效期
61 - String token = JwtTokenUtils.createAccessToken(user.getAccNo(), user.getId().toString(), roleCodeList, loginRequest.getRememberMe()); 62 + String token = JwtTokenUtils.createAccessToken(user.getLoginName(), user.getId().toString(), roleCodeList, loginRequest.getRememberMe());
62 try { 63 try {
63 int redisExpireTime = loginRequest.getRememberMe() ? 8 : 2; 64 int redisExpireTime = loginRequest.getRememberMe() ? 8 : 2;
64 redisUtilService.set(RedisConstants.REDIS_KEY_TOKEN + user.getId(), token, redisExpireTime); 65 redisUtilService.set(RedisConstants.REDIS_KEY_TOKEN + user.getId(), token, redisExpireTime);
......
...@@ -6,6 +6,8 @@ import com.fedex.connect.common.dependencies.util.Utils; ...@@ -6,6 +6,8 @@ import com.fedex.connect.common.dependencies.util.Utils;
6 import com.fedex.connect.common.model.bi.DictionaryEntries; 6 import com.fedex.connect.common.model.bi.DictionaryEntries;
7 import com.fedex.connect.common.model.sys.Role; 7 import com.fedex.connect.common.model.sys.Role;
8 import com.fedex.connect.common.model.sys.RoleExample; 8 import com.fedex.connect.common.model.sys.RoleExample;
9 +import com.fedex.connect.common.model.sys.UserRole;
10 +import com.fedex.connect.common.model.sys.UserRoleExample;
9 import com.fedex.connect.manager.data.model.LogShowModel; 11 import com.fedex.connect.manager.data.model.LogShowModel;
10 import com.fedex.connect.manager.service.base.AbstractEtService; 12 import com.fedex.connect.manager.service.base.AbstractEtService;
11 import com.fedex.connect.manager.service.sys.ISysRoleService; 13 import com.fedex.connect.manager.service.sys.ISysRoleService;
......
1 package com.fedex.connect.manager.service.sys.impl; 1 package com.fedex.connect.manager.service.sys.impl;
2 2
3 import com.fedex.connect.common.dependencies.contants.DatabaseConstants; 3 import com.fedex.connect.common.dependencies.contants.DatabaseConstants;
4 +import com.fedex.connect.common.model.sys.UserRole;
4 import com.fedex.connect.manager.data.model.LogShowModel; 5 import com.fedex.connect.manager.data.model.LogShowModel;
5 import com.fedex.connect.manager.service.base.AbstractEtService; 6 import com.fedex.connect.manager.service.base.AbstractEtService;
6 import com.fedex.connect.manager.service.sys.ISysUserRoleService; 7 import com.fedex.connect.manager.service.sys.ISysUserRoleService;
...@@ -34,7 +35,7 @@ public class SysUserRoleServiceImpl extends AbstractEtService implements ISysUse ...@@ -34,7 +35,7 @@ public class SysUserRoleServiceImpl extends AbstractEtService implements ISysUse
34 userRole.setRoleId(roleId); 35 userRole.setRoleId(roleId);
35 userRole.setStatus(DatabaseConstants.GLOBAL_STATUS_VALID); 36 userRole.setStatus(DatabaseConstants.GLOBAL_STATUS_VALID);
36 userRole.setCreateTime(new Date()); 37 userRole.setCreateTime(new Date());
37 - userRole.setUpdateTime(new Date()); 38 + userRole.setModifyTime(new Date());
38 return userRoleRepository.insert(userRole); 39 return userRoleRepository.insert(userRole);
39 } catch (Exception e){ 40 } catch (Exception e){
40 log.error(LogShowModel.showException("Exception",e)); 41 log.error(LogShowModel.showException("Exception",e));
......
...@@ -7,6 +7,8 @@ import com.fedex.connect.common.dependencies.contants.DatabaseConstants; ...@@ -7,6 +7,8 @@ import com.fedex.connect.common.dependencies.contants.DatabaseConstants;
7 import com.fedex.connect.common.dependencies.util.Utils; 7 import com.fedex.connect.common.dependencies.util.Utils;
8 import com.fedex.connect.common.model.bi.DictionaryEntries; 8 import com.fedex.connect.common.model.bi.DictionaryEntries;
9 import com.fedex.connect.common.model.sys.Role; 9 import com.fedex.connect.common.model.sys.Role;
10 +import com.fedex.connect.common.model.sys.User;
11 +import com.fedex.connect.common.model.sys.UserExample;
10 import com.fedex.connect.manager.data.dto.SysUserDto; 12 import com.fedex.connect.manager.data.dto.SysUserDto;
11 import com.fedex.connect.manager.data.model.LogShowModel; 13 import com.fedex.connect.manager.data.model.LogShowModel;
12 import com.fedex.connect.manager.service.base.AbstractEtService; 14 import com.fedex.connect.manager.service.base.AbstractEtService;
...@@ -58,8 +60,7 @@ public class SysUserServiceImpl extends AbstractEtService implements ISysUserSer ...@@ -58,8 +60,7 @@ public class SysUserServiceImpl extends AbstractEtService implements ISysUserSer
58 UserExample example = new UserExample(); 60 UserExample example = new UserExample();
59 UserExample.Criteria criteria = example.createCriteria(); 61 UserExample.Criteria criteria = example.createCriteria();
60 criteria.andStatusEqualTo(DatabaseConstants.GLOBAL_STATUS_VALID); 62 criteria.andStatusEqualTo(DatabaseConstants.GLOBAL_STATUS_VALID);
61 - criteria.andUserSourceEqualTo(DatabaseConstants.USER_SOURCE_FCL); 63 + criteria.andLoginNameEqualTo(fclUuid);
62 - criteria.andAccNoEqualTo(fclUuid);
63 //criteria.andFedexAccNoEqualTo(fclUuid); 64 //criteria.andFedexAccNoEqualTo(fclUuid);
64 example.setOrderByClause("ID DESC"); 65 example.setOrderByClause("ID DESC");
65 66
......