刘韬 3 vuotta sitten
vanhempi
commit
0e1a30b6f0

+ 2 - 2
DataFusion/res/config.properties

@@ -1,12 +1,12 @@
 #DB-connected partners
-jdbcUrl_connected  = jdbc:sqlserver://10.0.25.99:1433;DatabaseName=PACS
+jdbcUrl_connected  = jdbc:sqlserver://10.0.25.99:1433;DatabaseName=MedReport
 #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 	   = gyyh
 password_connected = Bsoft123
 #DATA-Parms
 institution_id     = 83000005
 
-jdbcUrl_connected_dcm  = jdbc:sqlserver://10.0.25.99:1433;DatabaseName=MedReport
+jdbcUrl_connected_dcm  = jdbc:sqlserver://10.0.25.99:1433;DatabaseName=PACS
 #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_dcm 	   = gyyh
 password_connected_dcm = Bsoft123

+ 20 - 8
DataFusion/src/com/zskk/config/ZskkConfig.java

@@ -68,25 +68,37 @@ public class ZskkConfig extends JFinalConfig {
 
 		return new DruidPlugin(PropKit.get("jdbcUrl_local"), PropKit.get("user_local"),PropKit.get("password_local").trim());
 	}
+	
+	public static DruidPlugin createDcmDruidPlugin() {
+
+		return new DruidPlugin(PropKit.get("jdbcUrl_connected_dcm"), PropKit.get("user_connected_dcm"),PropKit.get("password_connected_dcm").trim());
+	}
 
 	@Override
 	public void configPlugin(Plugins me) {
 		// 配置数据库连接池插件
-//		DruidPlugin druidPluginConnected = createConnectedDruidPlugin();
-//		me.add(druidPluginConnected);
+		DruidPlugin druidPluginConnected = createConnectedDruidPlugin();
+		me.add(druidPluginConnected);
 		
 		DruidPlugin druidPluginLocal = createLocalDruidPlugin();
 		me.add(druidPluginLocal);
+		
+		DruidPlugin druidPluginDcm = createDcmDruidPlugin();
+		me.add(druidPluginDcm);
 
 		// 配置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);
 		
 		ActiveRecordPlugin arpLocal = new ActiveRecordPlugin("local", druidPluginLocal);
 		arpLocal.setDialect(new MysqlDialect());
 		me.add(arpLocal);
 		
+		ActiveRecordPlugin arpDcm = new ActiveRecordPlugin("connected_dicom", druidPluginDcm);
+		arpDcm.setDialect(new SqlServerDialect());
+		me.add(arpDcm);
+		
 		//同步报告
 //		Cron4jPlugin cpData = new Cron4jPlugin();
 //		cpData.addTask("*/4 * * * *", new DataTask());
@@ -103,9 +115,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);
 //		
 //		//更新患者信息检查影像
 //		Cron4jPlugin ifData = new Cron4jPlugin();

+ 11 - 0
DataFusion/src/com/zskk/control/ViewController.java

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