commit

DataFusion/res/config.properties

@@ -1,8 +1,8 @@
 #DB-connected partners
-jdbcUrl_connected  = jdbc:sqlserver://192.168.17.58:1433;DatabaseName=visionpacs
-#jdbcUrl_connected  = jdbc:oracle:thin:@192.168.100.4:1521:pacs
-user_connected 	   = jiekou
-password_connected = jiekou
+#jdbcUrl_connected  = jdbc:sqlserver://192.168.17.58:1433;DatabaseName=visionpacs
+jdbcUrl_connected  = jdbc:oracle:thin:@10.10.100.10:1521:crcl
+user_connected 	   = yyxhr
+password_connected = yyxhr
 
 #DB-connected partners
 jdbcUrl_print  = jdbc:sqlserver://200.200.200.163:1433;DatabaseName=DICOMSOFT
@@ -11,7 +11,7 @@ user_print 	   = zskk
 password_print = zskk
 
 #DATA-Parms
-institution_id     = 06300006
+institution_id     = 121403004061412685
 #OSS
 oss_endpoint       = https://oss-cn-beijing.aliyuncs.com
 oss_accessKey      = LTAI5tLyAFqdCs9qxxhHRFwG

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

@@ -81,45 +81,45 @@ public class ZskkConfig extends JFinalConfig {
 		ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
 		arpConnected.setDialect(new SqlServerDialect());
 		me.add(arpConnected);
-		
-		// 配置数据库连接池插件
-		DruidPlugin druidPluginPrint = createPrintDruidPlugin();
-		me.add(druidPluginPrint);
-		
-		// 配置ActiveRecord插件
-		ActiveRecordPlugin arpPrint = new ActiveRecordPlugin("print", druidPluginPrint);
-		arpPrint.setDialect(new SqlServerDialect());
-		me.add(arpPrint);
-
-		//匹配报告
-		Cron4jPlugin cpData = new Cron4jPlugin();
-		cpData.addTask("*/17 * * * *", new DataTask());
-		me.add(cpData);
-		
-		//更新审核后报告
-		Cron4jPlugin upData = new Cron4jPlugin();
-		upData.addTask("*/5 * * * *", new CheckTask());
-		me.add(upData);
-		
-		//更新患者信息
-		Cron4jPlugin pifData = new Cron4jPlugin();
-		pifData.addTask("*/1 * * * *", new UpdateTask());
-		me.add(pifData);
-		
-		//更新患者付费信息至PACS
-	    Cron4jPlugin bdData = new Cron4jPlugin();
-	    bdData.addTask("*/10 * * * *", new BindTask());
-		me.add(bdData);
-		
-		//将打印png上传云端
-	    Cron4jPlugin prData = new Cron4jPlugin();
-	    prData.addTask("*/2 * * * *", new PrintTask());
-		me.add(prData);
-		
-		//统计打印数量
-	    Cron4jPlugin pnData = new Cron4jPlugin();
-	    pnData.addTask("0 */6 * * *", new PrintNumTask());
-		me.add(pnData);
+//		
+//		// 配置数据库连接池插件
+//		DruidPlugin druidPluginPrint = createPrintDruidPlugin();
+//		me.add(druidPluginPrint);
+//		
+//		// 配置ActiveRecord插件
+//		ActiveRecordPlugin arpPrint = new ActiveRecordPlugin("print", druidPluginPrint);
+//		arpPrint.setDialect(new SqlServerDialect());
+//		me.add(arpPrint);
+//
+//		//匹配报告
+//		Cron4jPlugin cpData = new Cron4jPlugin();
+//		cpData.addTask("*/17 * * * *", new DataTask());
+//		me.add(cpData);
+//		
+//		//更新审核后报告
+//		Cron4jPlugin upData = new Cron4jPlugin();
+//		upData.addTask("*/5 * * * *", new CheckTask());
+//		me.add(upData);
+//		
+//		//更新患者信息
+//		Cron4jPlugin pifData = new Cron4jPlugin();
+//		pifData.addTask("*/1 * * * *", new UpdateTask());
+//		me.add(pifData);
+//		
+//		//更新患者付费信息至PACS
+//	    Cron4jPlugin bdData = new Cron4jPlugin();
+//	    bdData.addTask("*/10 * * * *", new BindTask());
+//		me.add(bdData);
+//		
+//		//将打印png上传云端
+//	    Cron4jPlugin prData = new Cron4jPlugin();
+//	    prData.addTask("*/2 * * * *", new PrintTask());
+//		me.add(prData);
+//		
+//		//统计打印数量
+//	    Cron4jPlugin pnData = new Cron4jPlugin();
+//	    pnData.addTask("0 */6 * * *", new PrintNumTask());
+//		me.add(pnData);
 	}
 
 	@Override

DataFusion/src/com/zskk/control/ViewController.java

@@ -23,6 +23,7 @@ import com.jfinal.kit.PropKit;
 import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Record;
+import com.jfinal.plugin.activerecord.dialect.OracleDialect;
 import com.jfinal.plugin.activerecord.dialect.SqlServerDialect;
 import com.jfinal.plugin.druid.DruidPlugin;
 import com.zskk.service.DataService;
@@ -89,8 +90,8 @@ public class ViewController extends Controller {
 			DruidPlugin druidPluginConnected = createConnectedDruidPlugin();
             druidPluginConnected.start();
 			// 配置ActiveRecord插件
-			ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("print", druidPluginConnected);
-			arpConnected.setDialect(new SqlServerDialect());
+			ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
+			arpConnected.setDialect(new OracleDialect());
 			arpConnected.start();
 
 		} catch (Exception e) {