diff --git a/src/main/java/com/docus/server/archive/service/impl/MzsyPatientInfoSyncServiceImpl.java b/src/main/java/com/docus/server/archive/service/impl/MzsyPatientInfoSyncServiceImpl.java index 3eb128f..d593a5b 100644 --- a/src/main/java/com/docus/server/archive/service/impl/MzsyPatientInfoSyncServiceImpl.java +++ b/src/main/java/com/docus/server/archive/service/impl/MzsyPatientInfoSyncServiceImpl.java @@ -42,10 +42,11 @@ public class MzsyPatientInfoSyncServiceImpl implements PatientInfoSyncService { } @Override - @Transactional(rollbackFor = Exception.class) +// @Transactional(rollbackFor = Exception.class) public void syncByModifyTimeAndCyrq(String cyrqStart, String startTime) { int size = 1000; int pageNumber = 1; + log.info("参数"+cyrqStart+startTime); while (true) { List patientInfoViews = mzsyPatientInfoViewMapper.pageByViwe(cyrqStart, startTime, pageNumber, size); if (Func.isNotEmpty(patientInfoViews)) { diff --git a/src/main/java/com/docus/server/mzsy/mapper/MzsyPatientInfoViewMapper.java b/src/main/java/com/docus/server/mzsy/mapper/MzsyPatientInfoViewMapper.java index 00efcc5..3ddd169 100644 --- a/src/main/java/com/docus/server/mzsy/mapper/MzsyPatientInfoViewMapper.java +++ b/src/main/java/com/docus/server/mzsy/mapper/MzsyPatientInfoViewMapper.java @@ -14,5 +14,5 @@ public interface MzsyPatientInfoViewMapper { /** * @return 患者视图数据根据上次同步时间往后查询 */ - List pageByViwe(@Param("cyrqStart") String cyrqStart,@Param("startTime") String startTime,@Param("pageNum") Integer pageNum, @Param("pageNum") Integer pageSize); + List pageByViwe(@Param("cyrqStart") String cyrqStart,@Param("startTime") String startTime,@Param("pageNum") Integer pageNum, @Param("pageSize") Integer pageSize); } diff --git a/src/main/resources/bootstrap.yml b/src/main/resources/bootstrap.yml index 61645b9..1ad2521 100644 --- a/src/main/resources/bootstrap.yml +++ b/src/main/resources/bootstrap.yml @@ -33,6 +33,32 @@ spring: test-on-borrow: false test-on-return: false validation-query: select 1 + mzsy: + url: jdbc:sqlserver://192.168.16.103\DOCUS;DatabaseName=docus + username: sa + password: docus702 + driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver + # url: jdbc:sqlserver://192.168.0.109:1433;DatabaseName=interface_xmjs + # username: xmjs + # password: xmjs + # 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 @@ -55,12 +81,8 @@ spring: # test-on-borrow: false # test-on-return: false # validation-query: select 1 from dual - mzsy: - url: jdbc:sqlserver://192.168.0.109:1433;DatabaseName=interface_xmjs - username: xmjs - password: xmjs - driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver - type: com.alibaba.druid.pool.DruidDataSource + + redis: host: redis.docus.cn password: JSdocus@702 diff --git a/src/main/resources/mapper/MzsyPatientInfoViewMapper.xml b/src/main/resources/mapper/MzsyPatientInfoViewMapper.xml index f96b97c..ffcabf3 100644 --- a/src/main/resources/mapper/MzsyPatientInfoViewMapper.xml +++ b/src/main/resources/mapper/MzsyPatientInfoViewMapper.xml @@ -7,11 +7,11 @@