jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 1047681f402563bbd17402135eedf39d5ddcfc1c

Authored by yangfei
2 parents bee058e257 e0ca3fdf8e
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-operate-api/src/main/java/com/lyms/hospitalapi/zcfy/ConnTools.java View file @ 1047681
1 1 package com.lyms.hospitalapi.zcfy;
2 2  
  3 +import com.lyms.platform.common.utils.PropertiesUtils;
  4 +
3 5 import java.sql.Connection;
4 6 import java.sql.DriverManager;
5 7 import java.sql.SQLException;
... ... @@ -9,6 +11,8 @@
9 11 */
10 12 public class ConnTools {
11 13  
  14 + public static final String HIS_VERSION = PropertiesUtils.getPropertyValue("his_version");
  15 +
12 16 private static String hisDirverClassName = "oracle.jdbc.driver.OracleDriver";
13 17 private static String hisUrl = "jdbc:oracle:thin:@192.168.30.103:1521:crds3db";
14 18 private static String hisUser = "lyms1";
15 19  
... ... @@ -19,8 +23,13 @@
19 23 private static String fmUser = "lymsfm";
20 24 private static String fmPassword = "lyms123";
21 25  
  26 + private static String csczDirverClassName = "com.mysql.jdbc.Driver";
  27 + private static String csczUrl = "jdbc:mysql://119.90.57.26:3306/platform?useUnicode=true&characterEncoding=utf8";
  28 + private static String csczUser = "platform";
  29 + private static String csczPassword = "platform123";
  30 +
22 31 private static String czDirverClassName = "com.mysql.jdbc.Driver";
23   - private static String czUrl = "jdbc:mysql://119.90.57.26:3306/platform?useUnicode=true&characterEncoding=utf8";
  32 + private static String czUrl = "jdbc:mysql://192.168.11.98:3306/platform?useUnicode=true&characterEncoding=utf8";
24 33 private static String czUser = "platform";
25 34 private static String czPassword = "platform123";
26 35  
27 36  
28 37  
... ... @@ -67,16 +76,33 @@
67 76 */
68 77 public static Connection makeCzConnection() {
69 78 Connection conn = null;
70   - try {
71   - Class.forName(czDirverClassName);
72   - } catch (ClassNotFoundException e) {
73   - e.printStackTrace();
  79 + if ("21".equals(HIS_VERSION))
  80 + {
  81 + try {
  82 + Class.forName(csczDirverClassName);
  83 + } catch (ClassNotFoundException e) {
  84 + e.printStackTrace();
  85 + }
  86 + try {
  87 + conn = DriverManager.getConnection(csczUrl, csczUser, csczPassword);
  88 + } catch (SQLException e) {
  89 + e.printStackTrace();
  90 + }
74 91 }
75   - try {
76   - conn = DriverManager.getConnection(czUrl, czUser, czPassword);
77   - } catch (SQLException e) {
78   - e.printStackTrace();
  92 + else
  93 + {
  94 + try {
  95 + Class.forName(czDirverClassName);
  96 + } catch (ClassNotFoundException e) {
  97 + e.printStackTrace();
  98 + }
  99 + try {
  100 + conn = DriverManager.getConnection(czUrl, czUser, czPassword);
  101 + } catch (SQLException e) {
  102 + e.printStackTrace();
  103 + }
79 104 }
  105 +
80 106 return conn;
81 107 }
82 108  
platform-operate-api/src/main/java/com/lyms/hospitalapi/zcfy/ZcPrenatalService.java View file @ 1047681
... ... @@ -1083,7 +1083,7 @@
1083 1083  
1084 1084 public void handleWork() {
1085 1085 Date end = new Date();
1086   - Date start = new Date(end.getTime()-1000*60*500);
  1086 + Date start = new Date(end.getTime()-1000*60*60);
1087 1087 String startDate = DateUtil.getyyyy_MM_dd_hms(start);
1088 1088 String endDate = DateUtil.getyyyy_MM_dd_hms(end);
1089 1089 System.out.println("start=" + startDate + "end=" + endDate);
platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml View file @ 1047681
... ... @@ -248,7 +248,7 @@
248 248 </bean>
249 249  
250 250  
251   - <!-- 快速测量定时任务 -->
  251 + <!-- 诸城产检 -->
252 252 <bean id="zcChanJianWorker" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
253 253 <!-- 要调用的bean -->
254 254 <property name="targetObject" ref="zcPrenatalService"></property>
... ... @@ -289,7 +289,7 @@
289 289 <!--<ref bean="crisisTrigger"/>-->
290 290 <!--<ref bean="qhdFmHistoryTrigger"/>-->
291 291  
292   - <ref bean="zcChanJianTrigger"/>
  292 + <!--<ref bean="zcChanJianTrigger"/>-->
293 293 </list>
294 294 </property>
295 295 </bean>