创建米脂分支

DataFusion/res/config.properties

@@ -1,7 +1,7 @@
 #DB-connected partners
-jdbcUrl_connected  = jdbc:sqlserver://188.188.2.1:1433;DatabaseName=PACS
-#jdbcUrl_connected  = jdbc:oracle:thin:@192.168.100.4:1521:pacs
-user_connected 	   = sa
-password_connected = YZPACS
+#jdbcUrl_connected  = jdbc:sqlserver://188.188.2.1:1433;DatabaseName=PACS
+jdbcUrl_connected  = jdbc:oracle:thin:@10.0.0.4:1521:orcl
+user_connected 	   = ZL_MXYYX
+password_connected = ZL_MXYYX
 #DATA-Parms
-institution_id     = 73000005
+institution_id     = 71900006

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

@@ -68,9 +68,9 @@ public class ZskkConfig extends JFinalConfig {
 		me.add(druidPluginConnected);
 
 		// 配置ActiveRecord插件
-		ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
-		arpConnected.setDialect(new SqlServerDialect());
-		me.add(arpConnected);
+//		ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
+//		arpConnected.setDialect(new SqlServerDialect());
+//		me.add(arpConnected);
 		
 		Cron4jPlugin cpData = new Cron4jPlugin();
 		cpData.addTask("*/5 * * * *", new DataTask());

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

@@ -14,6 +14,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;
 
@@ -44,7 +45,7 @@ public class ViewController extends Controller {
             druidPluginConnected.start();
 			// 配置ActiveRecord插件
 			ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
-			arpConnected.setDialect(new SqlServerDialect());
+			arpConnected.setDialect(new OracleDialect());
 			arpConnected.start();
 
 		} catch (Exception e) {