diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/zcfy/ConnTools.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/zcfy/ConnTools.java index d8b9a27..aa80297 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/zcfy/ConnTools.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/zcfy/ConnTools.java @@ -1,5 +1,7 @@ package com.lyms.hospitalapi.zcfy; +import com.lyms.platform.common.utils.PropertiesUtils; + import java.sql.Connection; import java.sql.DriverManager; import java.sql.SQLException; @@ -9,6 +11,8 @@ import java.sql.SQLException; */ public class ConnTools { + public static final String HIS_VERSION = PropertiesUtils.getPropertyValue("his_version"); + private static String hisDirverClassName = "oracle.jdbc.driver.OracleDriver"; private static String hisUrl = "jdbc:oracle:thin:@192.168.30.103:1521:crds3db"; private static String hisUser = "lyms1"; @@ -19,8 +23,13 @@ public class ConnTools { private static String fmUser = "lymsfm"; private static String fmPassword = "lyms123"; + private static String csczDirverClassName = "com.mysql.jdbc.Driver"; + private static String csczUrl = "jdbc:mysql://119.90.57.26:3306/platform?useUnicode=true&characterEncoding=utf8"; + private static String csczUser = "platform"; + private static String csczPassword = "platform123"; + private static String czDirverClassName = "com.mysql.jdbc.Driver"; - private static String czUrl = "jdbc:mysql://119.90.57.26:3306/platform?useUnicode=true&characterEncoding=utf8"; + private static String czUrl = "jdbc:mysql://192.168.11.98:3306/platform?useUnicode=true&characterEncoding=utf8"; private static String czUser = "platform"; private static String czPassword = "platform123"; @@ -67,16 +76,33 @@ public class ConnTools { */ public static Connection makeCzConnection() { Connection conn = null; - try { - Class.forName(czDirverClassName); - } catch (ClassNotFoundException e) { - e.printStackTrace(); + if ("21".equals(HIS_VERSION)) + { + try { + Class.forName(csczDirverClassName); + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } + try { + conn = DriverManager.getConnection(csczUrl, csczUser, csczPassword); + } catch (SQLException e) { + e.printStackTrace(); + } } - try { - conn = DriverManager.getConnection(czUrl, czUser, czPassword); - } catch (SQLException e) { - e.printStackTrace(); + else + { + try { + Class.forName(czDirverClassName); + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } + try { + conn = DriverManager.getConnection(czUrl, czUser, czPassword); + } catch (SQLException e) { + e.printStackTrace(); + } } + return conn; } diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/zcfy/ZcPrenatalService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/zcfy/ZcPrenatalService.java index 8b7c944..e53cb5e 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/zcfy/ZcPrenatalService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/zcfy/ZcPrenatalService.java @@ -1083,7 +1083,7 @@ public class ZcPrenatalService { public void handleWork() { Date end = new Date(); - Date start = new Date(end.getTime()-1000*60*500); + Date start = new Date(end.getTime()-1000*60*60); String startDate = DateUtil.getyyyy_MM_dd_hms(start); String endDate = DateUtil.getyyyy_MM_dd_hms(end); System.out.println("start=" + startDate + "end=" + endDate); diff --git a/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml b/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml index e674a16..8d0f0ec 100644 --- a/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml +++ b/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml @@ -248,7 +248,7 @@ - + @@ -289,7 +289,7 @@ - +