commit

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

@@ -94,13 +94,13 @@ public class ZskkConfig extends JFinalConfig {
 		
 		//将cfind请求检查录入待检查库
 		Cron4jPlugin inData = new Cron4jPlugin();
-		inData.addTask("*/1 * * * *", new UpdateTask());
+		inData.addTask("*/4 * * * *", new UpdateTask());
 		me.add(inData);
 		
 		//执行cfind请求
-//		Cron4jPlugin cgData = new Cron4jPlugin();
-//		cgData.addTask("*/2 * * * *", new CFindTask());
-//		me.add(cgData);
+		Cron4jPlugin cgData = new Cron4jPlugin();
+		cgData.addTask("*/2 * * * *", new CFindTask());
+		me.add(cgData);
 		
 		//comve获取检查影像
 		Cron4jPlugin mvData = new Cron4jPlugin();

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

@@ -196,7 +196,7 @@ public class ViewController extends Controller {
 	 * @param dateStr
 	 * @return
 	 */
-	private String parseStringToDateTime() {
+	private static String parseStringToDateTime() {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		Date date = new Date();
 		String daString = sdf.format(date);
@@ -204,4 +204,5 @@ public class ViewController extends Controller {
 
 	}
 
+	
 }

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

@@ -1,15 +1,25 @@
 package com.zskk.service;
 
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 import javax.xml.parsers.ParserConfigurationException;
+
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.NodeList;
+
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.jfinal.kit.PropKit;
+import com.zskk.tools.XmlHelper;
+
 import okhttp3.FormBody;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
@@ -89,15 +99,73 @@ public class DataService {
 			}	
 	}
     
-    public static void main(String[] args) throws IOException, ParserConfigurationException {
-    	
-		    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.replace("0", "o"));
-			Date ddDate =new Date();
-			System.out.println(ddDate.toString());
+    public static void main(String[] args) {
+		 String fileName2String ="";
+	        try {
+//			 List<String> files = new ArrayList<String>();
+//		        File file = new File("/home/zskk/CFIND_XML");
+//		        File[] tempList = file.listFiles();
+//		        for (int m = 0; m < tempList.length; m++) {
+//		            if (tempList[m].isFile()) {
+//		                files.add(tempList[m].toString());
+//		                //文件名，不包含路径
+//		                String fileName = tempList[m].getName();
+//		               fileName2String = fileName2String+fileName+"**";
+		               File fin_floder = new File("/Users/liutao/Desktop/tt71.xml");
+		       		// 创建从文件读取数据的FileInputStream流
+		       		FileInputStream fin;
+		       		
+		       			fin = new FileInputStream(fin_floder);
+		       			InputStreamReader isr = null;
+		       			isr = new InputStreamReader(fin);
+		       			BufferedReader raf = null;
+		       			raf = new BufferedReader(isr);
+		       			String xmlContent = null;
+		       			xmlContent = raf.readLine();
+		       			xmlContent = xmlContent.replace("<?xml version=\"1.0\" encoding=\"UTF-8\"?>", "");
+		       			xmlContent = "<zskk>" + xmlContent + "</zskk>";
+		       			XmlHelper xmlHelper = XmlHelper.of(xmlContent);
+		       			fileName2String = xmlContent;
+		       			// NativeDicomModel节点列表
+		       			NodeList nativeDicomModelList = xmlHelper.getNodeList("/zskk/NativeDicomModel");
+		       			for (int i = 0; i < nativeDicomModelList.getLength(); i++) {
+		       				String qString = "";
+		       				String studyuidString = "";
+		       				String modalitiesString = "";
+		       				// DicomAttribute节点列表
+		       				NodeList dicomAttributeList = xmlHelper.getNodeList(nativeDicomModelList.item(i), "DicomAttribute");
+		       				for (int j = 0; j < dicomAttributeList.getLength(); j++) {
+		       					// DicomAttribute节点属性列表
+		       					NamedNodeMap attributeMap = dicomAttributeList.item(j).getAttributes();
+		       					if (attributeMap != null && attributeMap.getLength() > 0) {
+		       						for (int k = 0; k < attributeMap.getLength(); k++) {
+		       							if (attributeMap.item(k).getNodeName().equals("tag")) {
+		       								// 获取studyuid
+		       								if (attributeMap.item(k).getNodeValue().equals("0020000D")) {
+		       									studyuidString = xmlHelper.getString(dicomAttributeList.item(j), "Value");
+		       									continue;
+		       								}
+		       								// 获取检查类型
+		       								if (attributeMap.item(k).getNodeValue().equals("00080061")) {
+		       									modalitiesString = xmlHelper.getString(dicomAttributeList.item(j), "Value");
+		       								}
+		       							}
+		       						}
+		       					}
+		       				}
+//		       				Record studyidfind = Db.use("local").findFirst("select * from study where studyuid = ?",studyuidString);
+//		       				if (studyidfind == null) {
+//		       					Record studyinfo = new Record().set("studyuid", studyuidString).set("modalities", modalitiesString)
+//		       							.set("status", 1).set("createAt", parseStringToDateTime()).set("updateAt", parseStringToDateTime());
+//		       					Db.use("local").save("study", studyinfo);
+		       					
+//		       				}
+		       			}
+		       		} catch (Exception e) {
+		       			// TODO Auto-generated catch block
+		       			e.printStackTrace();
+
+		       		}
 
 	}
 

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

@@ -33,6 +33,7 @@ public class UpdateTask implements ITask {
 			String xmlContent = null;
 			xmlContent = raf.readLine();
 			xmlContent = xmlContent.replace("<?xml version=\"1.0\" encoding=\"UTF-8\"?>", "");
+			xmlContent = xmlContent.replace("&#27", "");
 			xmlContent = "<zskk>" + xmlContent + "</zskk>";
 			XmlHelper xmlHelper = XmlHelper.of(xmlContent);
 			// NativeDicomModel节点列表