commit

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;
@@ -87,16 +88,16 @@ public class ZskkConfig extends JFinalConfig {
 		me.add(arpLocal);
 		
 //		Cron4jPlugin cpData = new Cron4jPlugin();
-//		cpData.addTask("*/8 * * * *", new DataTask());
+//		cpData.addTask("*/5 * * * *", new DataTask());
 //		me.add(cpData);
 //		
 //		Cron4jPlugin inData = new Cron4jPlugin();
 //		inData.addTask("*/4 * * * *", new UpdateTask());
 //		me.add(inData);
 //		
-//		Cron4jPlugin cgData = new Cron4jPlugin();
-//		cgData.addTask("*/1 * * * *", new CGetTask());
-//		me.add(cgData);
+		Cron4jPlugin cgData = new Cron4jPlugin();
+		cgData.addTask("*/5 * * * *", new CFindTask());
+		me.add(cgData);
 	}
 
 	@Override

DataFusion/src/com/zskk/service/DataService.java

@@ -6,6 +6,8 @@ import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
@@ -95,7 +97,7 @@ public class DataService {
 	}
     
     public static void main(String[] args) throws IOException, ParserConfigurationException {
-    	File fin_floder = new File("/Users/liutao/Desktop/test/test51.xml");
+    	File fin_floder = new File("/Users/liutao/Desktop/test/test81.xml");
 
 		//创建从文件读取数据的FileInputStream流
 		FileInputStream fin;
@@ -122,25 +124,25 @@ public class DataService {
 			System.out.println(s);
 		    XmlHelper xmlHelper = XmlHelper.of(s);
 
-           int ount = 0;
 		    NodeList nodeList = xmlHelper.getNodeList("/a/NativeDicomModel/DicomAttribute");
 		    for (int i = 0; i < nodeList.getLength(); i++) {
 				NamedNodeMap as = nodeList.item(i).getAttributes();
 			    if (as != null && as.getLength() > 0) {
 			      for (int j = 0; j < as.getLength(); j++) {
-			    	  if (as.item(j).getNodeName().equals("keyword")) {
-						if (as.item(j).getNodeValue().equals("StudyDate")) {
+			    	  if (as.item(j).getNodeName().equals("tag")) {
+						if (as.item(j).getNodeValue().equals("0020000D")) {
 							String b =xmlHelper.getString("/a/NativeDicomModel["+i+"]/DicomAttribute["+j+"]/Value");
-
 							System.out.println(xmlHelper.getString(nodeList.item(i), "Value"));
-							ount++;
 						}
 					}
 			      }
 			    }
 			}
-		      System.out.println(ount);
-
+		    SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
+			Date date = new Date();
+			long dInteger = date.getTime() - 86400000;
+			String daString = sdf.format(new Date(dInteger));
+			System.out.println(daString);
 		} catch (FileNotFoundException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();

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

@@ -0,0 +1,42 @@
+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 execCmd = ExecUtil.execCmd("/zskk_system/other/cfind.sh " + parseStringToDate() + " STUDYUID_" + parseStringToDate() + ".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() - 86400000;
+		String daString = sdf.format(new Date(dInteger));
+		return daString;
+
+	}
+
+}