commit

DataFusion/res/config.properties

@@ -1,8 +1,8 @@
 #DB-connected partners
-jdbcUrl_connected  = jdbc:sqlserver://192.168.1.215:1433;DatabaseName=DICOMSERVER
+jdbcUrl_connected  = jdbc:sqlserver://192.168.1.112:1433;DatabaseName=RIS_BASIC
 #jdbcUrl_connected  = jdbc:oracle:thin:@192.168.100.4:1521:pacs
-user_connected 	   = Interface_YCHZ
-password_connected = interface_ychz
+user_connected 	   = cloudimage
+password_connected = cloudimage
 #DATA-Parms
 institution_id     = 65000001
 

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

@@ -17,6 +17,7 @@ import com.jfinal.plugin.druid.DruidPlugin;
 import com.jfinal.template.Engine;
 import com.zskk.control.ViewController;
 import com.zskk.service.ServiceFactory;
+import com.zskk.task.CFindTask;
 import com.zskk.task.CGetTask;
 import com.zskk.task.DataTask;
 import com.zskk.task.UpdateTask;
@@ -86,17 +87,21 @@ public class ZskkConfig extends JFinalConfig {
 		arpLocal.setDialect(new MysqlDialect());
 		me.add(arpLocal);
 		
-		Cron4jPlugin cpData = new Cron4jPlugin();
-		cpData.addTask("*/8 * * * *", new DataTask());
-		me.add(cpData);
+		Cron4jPlugin cfData = new Cron4jPlugin();
+		cfData.addTask("*/2 * * * *", new CFindTask());
+		me.add(cfData);
 		
-		Cron4jPlugin inData = new Cron4jPlugin();
-		inData.addTask("*/4 * * * *", new UpdateTask());
-		me.add(inData);
+//		Cron4jPlugin cpData = new Cron4jPlugin();
+//		cpData.addTask("*/8 * * * *", new DataTask());
+//		me.add(cpData);
 		
-		Cron4jPlugin cgData = new Cron4jPlugin();
-		cgData.addTask("*/1 * * * *", new CGetTask());
-		me.add(cgData);
+//		Cron4jPlugin inData = new Cron4jPlugin();
+//		inData.addTask("*/4 * * * *", new UpdateTask());
+//		me.add(inData);
+		
+//		Cron4jPlugin cgData = new Cron4jPlugin();
+//		cgData.addTask("*/1 * * * *", new CGetTask());
+//		me.add(cgData);
 	}
 
 	@Override

DataFusion/src/com/zskk/task/CFindTask.java

@@ -0,0 +1,44 @@
+package com.zskk.task;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import com.jfinal.plugin.activerecord.Db;
+import com.jfinal.plugin.activerecord.Record;
+import com.jfinal.plugin.cron4j.ITask;
+import com.zskk.tools.ExecUtil;
+
+public class CFindTask implements ITask {
+
+	@Override
+	public void run() {
+		// TODO Auto-generated method stub
+		String dateString = parseStringToDate();
+		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;
+		}
+	}
+
+	@Override
+	public void stop() {
+		// TODO Auto-generated method stub
+
+	}
+	
+	/**
+	 * 日期字符串格式转换
+	 * 
+	 * @param dateStr
+	 * @return
+	 */
+	private String parseStringToDate() {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+		Date date = new Date();
+		long dInteger = date.getTime();
+		String daString = sdf.format(new Date(dInteger));
+		return daString;
+
+	}
+
+}