Browse Source

创建定西市中医院数据融合-PACS

刘韬 6 years ago
parent
commit
437f8d03b4

+ 3 - 3
DataFusion/WebRoot/WEB-INF/classes/config.properties

@@ -3,6 +3,6 @@ jdbcUrl_zskk  = jdbc:mysql://www.pacsonline.cn:3306/pacs?characterEncoding=utf8&
 user_zskk 	  = pacs
 password_zskk = ZSKK@2017~!@#
 
-jdbcUrl_connected  = jdbc:oracle:thin:@192.168.100.4:1521:pacs
-user_connected 	   = jk
-password_connected = jk
+jdbcUrl_connected  = jdbc:sqlserver://127.0.0.1:1433;DatabaseName=PACS
+user_connected 	   = yhxx
+password_connected = 123

+ 3 - 3
DataFusion/res/config.properties

@@ -3,6 +3,6 @@ jdbcUrl_zskk  = jdbc:mysql://www.pacsonline.cn:3306/pacs?characterEncoding=utf8&
 user_zskk 	  = pacs
 password_zskk = ZSKK@2017~!@#
 
-jdbcUrl_connected  = jdbc:oracle:thin:@192.168.100.4:1521:pacs
-user_connected 	   = jk
-password_connected = jk
+jdbcUrl_connected  = jdbc:sqlserver://127.0.0.1:1433;DatabaseName=PACS
+user_connected 	   = yhxx
+password_connected = 123

+ 25 - 11
DataFusion/src/com/zskk/config/ZskkConfig.java

@@ -33,23 +33,37 @@ public class ZskkConfig extends JFinalConfig {
 
 	}
 
-	public static DruidPlugin createDruidPlugin() {
-		
-		return new DruidPlugin(PropKit.get("jdbcUrl_zskk"), PropKit.get("user_zskk"), PropKit.get("password_zskk").trim());
+	public static DruidPlugin createZskkDruidPlugin() {
+
+		return new DruidPlugin(PropKit.get("jdbcUrl_zskk"), PropKit.get("user_zskk"),PropKit.get("password_zskk").trim());
+	}
+
+	public static DruidPlugin createConnectedDruidPlugin() {
+
+		return new DruidPlugin(PropKit.get("jdbcUrl_connected"), PropKit.get("user_connected"),PropKit.get("password_connected").trim());
 	}
-	
+
 	@Override
 	public void configPlugin(Plugins me) {
-		// 配置C3p0数据库连接池插件
-		DruidPlugin druidPlugin = createDruidPlugin();
-		druidPlugin.start();
-		me.add(druidPlugin);
+		// 配置数据库连接池插件
+		DruidPlugin druidPluginZskk = createZskkDruidPlugin();
+		druidPluginZskk.start();
+		me.add(druidPluginZskk);
 
 		// 配置ActiveRecord插件
-		ActiveRecordPlugin arp = new ActiveRecordPlugin(druidPlugin);
+		ActiveRecordPlugin arpZskk = new ActiveRecordPlugin("zskk", druidPluginZskk);
 		 //所有映射在 MappingKit 中自动化搞定
-		_MappingKit.mapping(arp);
-		me.add(arp);		
+		_MappingKit.mapping(arpZskk);
+		me.add(arpZskk);
+
+		// 配置数据库连接池插件
+		DruidPlugin druidPluginConnected = createZskkDruidPlugin();
+		druidPluginConnected.start();
+		me.add(druidPluginConnected);
+
+		// 配置ActiveRecord插件
+		ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
+		me.add(arpConnected);
 	}
 
 	@Override

+ 1 - 1
DataFusion/src/com/zskk/control/ViewController.java

@@ -12,7 +12,7 @@ public class ViewController extends Controller {
 	 * 在被连接数据库执行sql语句
 	 */
 	public void executeSql() {
-		List<Record>  d =  Db.use("sx").find(this.getPara("sqlstr"));
+		List<Record>  d =  Db.use("connected").find(this.getPara("sqlstr"));
 		this.renderJson(d);
 	}
 	

+ 1 - 1
DataFusion/src/com/zskk/tools/_JFinalDemoGenerator.java

@@ -17,7 +17,7 @@ public class _JFinalDemoGenerator {
 	
 	public static DataSource getDataSource() {
 		PropKit.use("config.properties");
-		DruidPlugin druidPlugin = ZskkConfig.createDruidPlugin();
+		DruidPlugin druidPlugin = ZskkConfig.createZskkDruidPlugin();
 		druidPlugin.start();
 		return druidPlugin.getDataSource();
 	}