Commit 353ee7b3 authored by luzhuang's avatar luzhuang

feat: 同步功能 添加日志(zx-1.0)

parent 4bb6bf86
...@@ -24,10 +24,11 @@ public class UserManageTask { ...@@ -24,10 +24,11 @@ public class UserManageTask {
@Autowired @Autowired
private SysRoleRepository sysRoleRepository; private SysRoleRepository sysRoleRepository;
@Scheduled(cron = "${eduJob.userManageJob:0 0 /2 * * ?}") @Scheduled(cron = "${eduJob.userManageJob:0 0/5 * * * ?}")
public void work() { public void work() {
//获取 智学开通所有企业id //获取 智学开通所有企业id
List<String> corpIds = sysRoleRepository.getCorpIds(); List<String> corpIds = sysRoleRepository.getCorpIds();
log.info("------UserManageTask----定时任务调用获取当前企业ids-"+corpIds);
//循环调用 同步接口 //循环调用 同步接口
corpIds.forEach(c->sysUserService.synchronizedALL(c)); corpIds.forEach(c->sysUserService.synchronizedALL(c));
} }
......
...@@ -415,6 +415,10 @@ public class SysUserServiceImpl implements SysUserService { ...@@ -415,6 +415,10 @@ public class SysUserServiceImpl implements SysUserService {
} else { } else {
sysUser.setCreateDate(new Date()); sysUser.setCreateDate(new Date());
sysUser.setUpdateDate(new Date()); sysUser.setUpdateDate(new Date());
if (null == sysUser.getCreateBy())
sysUser.setCreateBy("");
if (null == sysUser.getUpdateBy())
sysUser.setUpdateBy("");
sysUserMapper.insertSelective(sysUser); sysUserMapper.insertSelective(sysUser);
line++; line++;
} }
...@@ -487,8 +491,10 @@ public class SysUserServiceImpl implements SysUserService { ...@@ -487,8 +491,10 @@ public class SysUserServiceImpl implements SysUserService {
//获取当前企业 主管理员角色id //获取当前企业 主管理员角色id
String mRId = sysRoleRepository.getRoleId(corpId,"0"); String mRId = sysRoleRepository.getRoleId(corpId,"0");
log.info("---------synchronizedManages-----主管理员角色Id-"+mRId);
//获取智信接口 所有主管理员 //获取智信接口 所有主管理员
List<CorpGetManager> userMainList = cotactApiRequestClient.corpGetManager(corpId,"1"); List<CorpGetManager> userMainList = cotactApiRequestClient.corpGetManager(corpId,"1");
log.info("---------synchronizedManages-----主管理员list-"+userMainList);
if (userMainList != null && userMainList.size() > 0){ if (userMainList != null && userMainList.size() > 0){
userMainList = this.accountIdToBusinessId(userMainList,corpId); userMainList = this.accountIdToBusinessId(userMainList,corpId);
List<UserRoleDTO> userRoleDTOList = setUserRole(userMainList,mRId); List<UserRoleDTO> userRoleDTOList = setUserRole(userMainList,mRId);
...@@ -496,12 +502,14 @@ public class SysUserServiceImpl implements SysUserService { ...@@ -496,12 +502,14 @@ public class SysUserServiceImpl implements SysUserService {
sysRoleRepository.deleteUserRole(mRId); sysRoleRepository.deleteUserRole(mRId);
//再插入s_r_user_role //再插入s_r_user_role
sysRoleRepository.addUserRole(userRoleDTOList); sysRoleRepository.addUserRole(userRoleDTOList);
log.info("---------synchronizedManages-----插入成功---当前主管理员-"+userRoleDTOList);
} }
//获取当前企业 子管理员角色id //获取当前企业 子管理员角色id
String sRId = sysRoleRepository.getRoleId(corpId,"1"); String sRId = sysRoleRepository.getRoleId(corpId,"1");
log.info("---------synchronizedManages-----子管理员角色Id-"+sRId);
List<CorpGetManager> userSubMainList = cotactApiRequestClient.corpGetManager(corpId,"2"); List<CorpGetManager> userSubMainList = cotactApiRequestClient.corpGetManager(corpId,"2");
log.info("---------synchronizedManages-----子管理员list-"+userSubMainList);
if (userSubMainList != null && userSubMainList.size() > 0){ if (userSubMainList != null && userSubMainList.size() > 0){
userSubMainList = this.accountIdToBusinessId(userSubMainList,corpId); userSubMainList = this.accountIdToBusinessId(userSubMainList,corpId);
List<UserRoleDTO> userSubRoleDTOList = setUserRole(userSubMainList,sRId); List<UserRoleDTO> userSubRoleDTOList = setUserRole(userSubMainList,sRId);
...@@ -509,6 +517,7 @@ public class SysUserServiceImpl implements SysUserService { ...@@ -509,6 +517,7 @@ public class SysUserServiceImpl implements SysUserService {
sysRoleRepository.deleteUserRole(sRId); sysRoleRepository.deleteUserRole(sRId);
//插入s_r_user_role表 //插入s_r_user_role表
sysRoleRepository.addUserRole(userSubRoleDTOList); sysRoleRepository.addUserRole(userSubRoleDTOList);
log.info("---------synchronizedManages-----插入成功---当前子管理员-"+userSubRoleDTOList);
} }
} }
...@@ -610,9 +619,11 @@ public class SysUserServiceImpl implements SysUserService { ...@@ -610,9 +619,11 @@ public class SysUserServiceImpl implements SysUserService {
*/ */
@Override @Override
public int synchronizedALL(String corpId){ public int synchronizedALL(String corpId){
log.info("----------synchronizedALL----开始调用同步管理员接口-------当前企业--"+corpId);
synchronizedManages(corpId); synchronizedManages(corpId);
int line = 0; int line = 0;
try { try {
log.info("----------synchronizedALL----开始调用同步用户接口-------当前企业--"+corpId);
line = synchronizedUsers(corpId); line = synchronizedUsers(corpId);
} catch (ParseException e) { } catch (ParseException e) {
e.printStackTrace(); e.printStackTrace();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment