commit

DataFusion/res/config.properties

@@ -1,13 +1,13 @@
 #DB-connected partners
-jdbcUrl_connected  = jdbc:sqlserver://192.168.6.8:1433;DatabaseName=Dbhistech501_FS
-#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 	   = YYX
-password_connected = YYX@123
+#jdbcUrl_connected  = jdbc:sqlserver://192.168.6.8:1433;DatabaseName=Dbhistech501_FS
+jdbcUrl_connected  = jdbc:oracle:thin:@//10.11.23.135:1521/pacs
+user_connected 	   = gcyxzx
+password_connected = gcyxzx
 #DATA-Parms
-institution_id     = 83000004
+institution_id     = 10000006
 
 #DB-connected partners
 jdbcUrl_local  = jdbc:mysql://127.0.0.1:3306/pacsonline?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&serverTimezone=Asia/Shanghai
 #jdbcUrl_connected  = jdbc:oracle:thin:@192.168.100.4:1521:pacs
 user_local	   = zskk
-password_local = Zskk_2022
+password_local = Zskk@2023

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

@@ -82,7 +82,7 @@ public class ZskkConfig extends JFinalConfig {
 
 		// 配置ActiveRecord插件
 		ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
-		arpConnected.setDialect(new SqlServerDialect());
+		arpConnected.setDialect(new OracleDialect());
 		me.add(arpConnected);
 		
 		ActiveRecordPlugin arpLocal = new ActiveRecordPlugin("local", druidPluginLocal);
@@ -90,14 +90,14 @@ public class ZskkConfig extends JFinalConfig {
 		me.add(arpLocal);
 		
 		//同步报告
-		Cron4jPlugin cpData = new Cron4jPlugin();
-		cpData.addTask("*/4 * * * *", new DataTask());
-		me.add(cpData);
+//		Cron4jPlugin cpData = new Cron4jPlugin();
+//		cpData.addTask("*/4 * * * *", new DataTask());
+//		me.add(cpData);
 		
 		//将cfind请求检查录入待检查库
-		Cron4jPlugin inData = new Cron4jPlugin();
-		inData.addTask("*/4 * * * *", new UpdateTask());
-		me.add(inData);
+//		Cron4jPlugin inData = new Cron4jPlugin();
+//		inData.addTask("*/4 * * * *", new UpdateTask());
+//		me.add(inData);
 		
 		//执行cfind请求
 		Cron4jPlugin cgData = new Cron4jPlugin();
@@ -105,24 +105,24 @@ 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();
-		ifData.addTask("*/1 * * * *", new InfoTask());
-		me.add(ifData);
+//		Cron4jPlugin ifData = new Cron4jPlugin();
+//		ifData.addTask("*/1 * * * *", new InfoTask());
+//		me.add(ifData);
 		
 		// comve获取检查影像
-		Cron4jPlugin rcData = new Cron4jPlugin();
-		rcData.addTask("*/20 * * * *", new ReCMoveTask());
-		me.add(rcData);
+//		Cron4jPlugin rcData = new Cron4jPlugin();
+//		rcData.addTask("*/20 * * * *", new ReCMoveTask());
+//		me.add(rcData);
 		
 		// 重新匹配审核后的报告
-		Cron4jPlugin rrData = new Cron4jPlugin();
-		rrData.addTask("*/7 * * * *", new ReviewTask());
-		me.add(rrData);
+//		Cron4jPlugin rrData = new Cron4jPlugin();
+//		rrData.addTask("*/7 * * * *", new ReviewTask());
+//		me.add(rrData);
 	}
 
 	@Override

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

@@ -21,6 +21,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;
@@ -46,6 +47,7 @@ public class ViewController extends Controller {
 	 * 在被连接数据库执行sql语句
 	 */
 	public void executeSql() {
+		
 		List<Record> d = Db.use("connected").find(this.getPara("sqlstr"));
 		this.renderJson(d);
 	}
@@ -107,7 +109,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) {
@@ -116,6 +118,21 @@ public class ViewController extends Controller {
 		}
 	}
 	
+	public void testcdind() {
+		try {
+			String dateString = "20230907";
+			String fileString = dateString.replace("0", "o");
+			String execCmd = ExecUtil.execCmd("/zskk_system/other/cfind.sh " + dateString + " STUDYUID_" + fileString + ".xml");
+			if (execCmd.contains("Connection refused")) {
+				return;
+			}
+		} catch (Exception e) {
+			// TODO: handle exception
+			this.renderText(e.toString());
+		}
+		
+	}
+	
 	public void tempmatch() {
 		
         String fileName2String ="";