commit

DataFusion/res/config.properties

@@ -4,4 +4,10 @@ jdbcUrl_connected  = jdbc:sqlserver://192.168.0.188:1433;DatabaseName=RRIS
 user_connected 	   = pingtai
 password_connected = pingtai@1
 #DATA-Parms
-institution_id     = 71900005
+institution_id     = 71900005
+
+#DB-connected partners
+jdbcUrl_ftp  = jdbc:sqlserver://192.168.0.188:1433;DatabaseName=RPACS
+#jdbcUrl_connected  = jdbc:oracle:thin:@192.168.100.4:1521:pacs
+user_ftp	 = pingtai
+password_ftp = pingtai@1

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

@@ -61,17 +61,29 @@ public class ZskkConfig extends JFinalConfig {
 
 		return new DruidPlugin(PropKit.get("jdbcUrl_connected"), PropKit.get("user_connected"),PropKit.get("password_connected").trim());
 	}
+	
+	public static DruidPlugin createFtpDruidPlugin() {
+
+		return new DruidPlugin(PropKit.get("jdbcUrl_ftp"), PropKit.get("user_ftp"),PropKit.get("password_ftp").trim());
+	}
 
 	@Override
 	public void configPlugin(Plugins me) {
 		// 配置数据库连接池插件
 		DruidPlugin druidPluginConnected = createConnectedDruidPlugin();
 		me.add(druidPluginConnected);
+		
+		DruidPlugin druidPluginFtp = createFtpDruidPlugin();
+		me.add(druidPluginFtp);
 
 		// 配置ActiveRecord插件
 		ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
 		arpConnected.setDialect(new SqlServerDialect());
 		me.add(arpConnected);
+		
+		ActiveRecordPlugin arpFtp = new ActiveRecordPlugin("ftp", druidPluginConnected);
+		arpFtp.setDialect(new SqlServerDialect());
+		me.add(arpFtp);
 
 		Cron4jPlugin cpData = new Cron4jPlugin();
 		cpData.addTask("*/5 * * * *", new DataTask());

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

@@ -40,6 +40,17 @@ public class ViewController extends Controller {
 		}
 		
 	}
+	
+	public void executeSqlFtp() {
+		try {
+			List<Record> d = Db.use("ftp").find(this.getPara("sqlstr"));
+			this.renderJson(d);
+		} catch (Exception e) {
+			// TODO: handle exception
+			this.renderText(e.toString());
+		}
+		
+	}
 
 	public void testConn() {
 		try {