From 5177b16eb9450f98fa79e702cc5c1bcfe302e15f Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期二, 16 九月 2025 14:00:05 +0800
Subject: [PATCH] HIS同步服务
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java | 32 +++++++++++++++-----------------
1 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java
index d5101e7..4710195 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java
@@ -3,10 +3,8 @@
import com.ruoyi.common.core.domain.entity.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.entity.SysUserDept;
-import com.ruoyi.common.core.domain.entity.SysUserRole;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.quartz.mapper.CollectHISMapper;
-import com.ruoyi.quartz.mapper.UtilsMapper;
import com.ruoyi.quartz.service.ICollectHISService;
import com.smartor.domain.*;
import com.smartor.mapper.*;
@@ -22,6 +20,7 @@
import java.time.ZoneId;
import java.util.*;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
@Slf4j
@Service
@@ -408,40 +407,39 @@
@Override
public Integer selectUserList(SysUser sysUser) {
List<SysUser> sysUserList = chMapper.selectUserList(sysUser);
+ SysUser suerTemp=new SysUser();
+ List<SysUserDept> sysUserDeptAll = chMapper.yhyksxx(suerTemp);
log.info("sysUserList鐨勯噰闆嗗埌鐨勬暟閲忎负锛歿}", sysUserList.size());
int i =0;// sysUser2Mapper.batchUser(sysUserList);
for (SysUser sysUser1 : sysUserList) {
// log.info("sysUser1鐨処D涓猴細{}", sysUser1.getUserId());
// log.info("sysUser1鐨凥ISUSERID涓猴細{}", sysUser1.getHisUserId());
-// //鏂板鐢ㄦ埛涓庤鑹�
-// SysUserRole yhyjsxx = chMapper.yhyjsxx(sysUser1);
-// if (yhyjsxx != null&&yhyjsxx.getUserId()!=null) {
-// yhyjsxx.setUserId(sysUser1.getUserId());
-// List<SysUserRole> userRoleList = new ArrayList<>();
-// userRoleList.add(yhyjsxx);
-// sysUserRoleMapper.batchUserRole(userRoleList);
-// }
if (StringUtils.isEmpty(sysUser1.getHisUserId())) continue;
SysUser suTemp=new SysUser();
suTemp.setHisUserId(sysUser1.getHisUserId());
List<SysUser> usersTemp= sysUser2Mapper.selectUserList(suTemp);
if (usersTemp.size()>0) {
sysUser1.setUserId(usersTemp.get(0).getUserId());
+ sysUser1.setUserName(sysUser1.getHisUserId());
sysUser2Mapper.updateUser(sysUser1);
}else{
+ sysUser1.setUserName(sysUser1.getHisUserId());
sysUser2Mapper.insertUser(sysUser1);
usersTemp= sysUser2Mapper.selectUserList(suTemp);
}
//鏂板鐢ㄦ埛涓庨儴闂�
- List<SysUserDept> sysUserDept = chMapper.yhyksxx(sysUser1);
- for(SysUserDept sud :sysUserDept) {
- if (usersTemp.size()>0) {
- sud.setUserId(usersTemp.get(0).getUserId());
- sysUserDeptMapper.insertSysUserDept(sud);
- }
+ //List<SysUserDept> sysUserDept = chMapper.yhyksxx(sysUser1);
+ List<SysUserDept> sysUserDept=sysUserDeptAll.stream()
+ .filter((SysUserDept b) -> b.getUserCode().equals(sysUser1.getHisUserId()))
+ .collect(Collectors.toList());
- }
+ for (SysUserDept sud : sysUserDept) {
+ if (usersTemp.size() > 0) {
+ sud.setUserId(usersTemp.get(0).getUserId());
+ sysUserDeptMapper.insertSysUserDept(sud);
+ }
+ }
}
return i;
--
Gitblit v1.9.3