创建石河子分支

DataFusion/res/config.properties

@@ -1,10 +1,10 @@
 #DB-connected partners
-#jdbcUrl_connected  = jdbc:sqlserver://192.168.1.215:1433;DatabaseName=DICOMSERVER
-jdbcUrl_connected  = jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=150.101.94.13)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=xepacs20)))
-user_connected 	   = c##xeyyx
-password_connected = xeyyx
+jdbcUrl_connected  = jdbc:sqlserver://192.168.6.8:1433;DatabaseName=Dbhistech501_FS
+#jdbcUrl_connected  = jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=150.101.94.13)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=xepacs20)))
+user_connected 	   = YYX
+password_connected = YYX@123
 #DATA-Parms
-institution_id     = 83000003
+institution_id     = 83000004
 
 #DB-connected partners
 jdbcUrl_local  = jdbc:mysql://127.0.0.1:3306/pacsonline?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull

DataFusion/src/com/zskk/config/ZskkConfig.java

@@ -79,7 +79,7 @@ public class ZskkConfig extends JFinalConfig {
 
 		// 配置ActiveRecord插件
 		ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
-		arpConnected.setDialect(new OracleDialect());
+		arpConnected.setDialect(new SqlServerDialect());
 		me.add(arpConnected);
 		
 		ActiveRecordPlugin arpLocal = new ActiveRecordPlugin("local", druidPluginLocal);
@@ -87,9 +87,9 @@ public class ZskkConfig extends JFinalConfig {
 		me.add(arpLocal);
 		
 		//同步报告
-		Cron4jPlugin cpData = new Cron4jPlugin();
-		cpData.addTask("*/4 * * * *", new DataTask());
-		me.add(cpData);
+//		Cron4jPlugin cpData = new Cron4jPlugin();
+//		cpData.addTask("*/4 * * * *", new DataTask());
+//		me.add(cpData);
 		
 		//将cfind请求检查录入待检查库
 		Cron4jPlugin inData = new Cron4jPlugin();
@@ -102,9 +102,9 @@ public class ZskkConfig extends JFinalConfig {
 		me.add(cgData);
 		
 		//comve获取检查影像
-		Cron4jPlugin mvData = new Cron4jPlugin();
-		mvData.addTask("*/1 * * * *", new CMoveTask());
-		me.add(mvData);
+//		Cron4jPlugin mvData = new Cron4jPlugin();
+//		mvData.addTask("*/1 * * * *", new CMoveTask());
+//		me.add(mvData);
 	}
 
 	@Override