From d242427d40c46d2d344694fa54e91b969283b3b3 Mon Sep 17 00:00:00 2001 From: wyb <1977763549@qq.com> Date: Mon, 4 Nov 2024 14:37:38 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=A2=85=E5=B7=9E=E4=B8=89=E9=99=A2?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7=E7=94=B5=E8=AF=9D?= =?UTF-8?q?=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/MzsyUserInfoSyncServiceImpl.java | 12 +++++++ .../server/mzsy/entity/MzsyHisUserInfo.java | 14 ++++++++ .../mzsy/mapper/MzsyHisUserInfoMapper.java | 14 ++++++++ src/main/resources/bootstrap.yml | 22 +++++++++++++ .../mapper/MzsyHisUserInfoMapper.xml | 32 +++++++++++++++++++ 5 files changed, 94 insertions(+) create mode 100644 src/main/java/com/docus/server/mzsy/entity/MzsyHisUserInfo.java create mode 100644 src/main/java/com/docus/server/mzsy/mapper/MzsyHisUserInfoMapper.java create mode 100644 src/main/resources/mapper/MzsyHisUserInfoMapper.xml diff --git a/src/main/java/com/docus/server/archive/service/impl/MzsyUserInfoSyncServiceImpl.java b/src/main/java/com/docus/server/archive/service/impl/MzsyUserInfoSyncServiceImpl.java index 3f4912a..7710b0a 100644 --- a/src/main/java/com/docus/server/archive/service/impl/MzsyUserInfoSyncServiceImpl.java +++ b/src/main/java/com/docus/server/archive/service/impl/MzsyUserInfoSyncServiceImpl.java @@ -9,8 +9,10 @@ import com.docus.server.archive.entity.PowerUser; import com.docus.server.archive.mapper.PowerUserMapper; import com.docus.server.archive.service.UserInfoSyncService; import com.docus.server.mzsy.entity.MzsyDeptInfoView; +import com.docus.server.mzsy.entity.MzsyHisUserInfo; import com.docus.server.mzsy.entity.MzsyUserInfoView; import com.docus.server.mzsy.mapper.MzsyDeptInfoViewMapper; +import com.docus.server.mzsy.mapper.MzsyHisUserInfoMapper; import com.docus.server.mzsy.mapper.MzsyUserInfoViewMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -33,6 +35,8 @@ public class MzsyUserInfoSyncServiceImpl implements UserInfoSyncService { @Resource private MzsyUserInfoViewMapper userInfoViewMapper; @Resource + private MzsyHisUserInfoMapper hisUserInfoMapper; + @Resource private MzsyDeptInfoViewMapper deptInfoViewMapper; @Resource private IdService idService; @@ -55,6 +59,13 @@ public class MzsyUserInfoSyncServiceImpl implements UserInfoSyncService { List powerUsers = userInfoViews.stream() .map(MzsyUserInfoConverter::convertUserInfo) .collect(Collectors.toList()); + // 360his查询用户电话信息并设置 + List userNames = powerUsers.stream().map(PowerUser::getUserName).collect(Collectors.toList()); + List hisUserInfoList = hisUserInfoMapper.findByYgDms(userNames); + Map userTelMap = hisUserInfoList.stream().collect(Collectors.toMap(MzsyHisUserInfo::getYGDM, MzsyHisUserInfo::getYGDH)); + for (PowerUser powerUser : powerUsers) { + powerUser.setUserTel(userTelMap.get(powerUser.getUserName())); + } saveOrUpdate(powerUsers); } if (Func.isEmpty(userInfoViews) || userInfoViews.size() < size) { @@ -103,6 +114,7 @@ public class MzsyUserInfoSyncServiceImpl implements UserInfoSyncService { powerAttendings.add(iuPowerUser.getPowerAttending()); powerAttending = String.join(delimiter, powerAttendings); } + powerUser.setUserTel(iuPowerUser.getUserTel()); powerUser.setName(iuPowerUser.getName()); powerUser.setEnabled(iuPowerUser.getEnabled()); powerUser.setEffective(iuPowerUser.getEffective()); diff --git a/src/main/java/com/docus/server/mzsy/entity/MzsyHisUserInfo.java b/src/main/java/com/docus/server/mzsy/entity/MzsyHisUserInfo.java new file mode 100644 index 0000000..1b15b32 --- /dev/null +++ b/src/main/java/com/docus/server/mzsy/entity/MzsyHisUserInfo.java @@ -0,0 +1,14 @@ +package com.docus.server.mzsy.entity; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel("梅州三院360His员工信息") +@Data +public class MzsyHisUserInfo { + @ApiModelProperty("员工工号") + private String YGDM; + @ApiModelProperty("员工电话") + private String YGDH; +} diff --git a/src/main/java/com/docus/server/mzsy/mapper/MzsyHisUserInfoMapper.java b/src/main/java/com/docus/server/mzsy/mapper/MzsyHisUserInfoMapper.java new file mode 100644 index 0000000..6f6a812 --- /dev/null +++ b/src/main/java/com/docus/server/mzsy/mapper/MzsyHisUserInfoMapper.java @@ -0,0 +1,14 @@ +package com.docus.server.mzsy.mapper; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.docus.server.mzsy.entity.MzsyHisUserInfo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + + +@DS("mzsy-360his") +public interface MzsyHisUserInfoMapper { + + List findByYgDms(@Param("ygDms") List ygDms); +} diff --git a/src/main/resources/bootstrap.yml b/src/main/resources/bootstrap.yml index 8e65289..617fa81 100644 --- a/src/main/resources/bootstrap.yml +++ b/src/main/resources/bootstrap.yml @@ -59,6 +59,28 @@ spring: test-on-borrow: false test-on-return: false validation-query: select 1 + mzsy-360his: + url: jdbc:sqlserver://192.168.0.247:1433;DatabaseName=360his + username: sa + password: zaq12wsx@@ + driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver + type: com.alibaba.druid.pool.DruidDataSource + # 初始化配置 + initial-size: 3 + # 最小连接数 + min-idle: 3 + # 最大连接数 + max-active: 10 + # 获取连接超 时时间 + max-wait: 5000 + # 连接有效性检测时间 + time-between-eviction-runs-millis: 90000 + # 最大空闲时间 + min-evictable-idle-time-millis: 1800000 + test-while-idle: true + test-on-borrow: false + test-on-return: false + validation-query: select 1 # zqdyry: # url: jdbc:oracle:thin:@10.20.28.15:1521:cdrdb # username: zqry_blgd diff --git a/src/main/resources/mapper/MzsyHisUserInfoMapper.xml b/src/main/resources/mapper/MzsyHisUserInfoMapper.xml new file mode 100644 index 0000000..a7fa57d --- /dev/null +++ b/src/main/resources/mapper/MzsyHisUserInfoMapper.xml @@ -0,0 +1,32 @@ + + + + + + + +