commit

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

@@ -8,6 +8,7 @@ import java.io.InputStreamReader;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import javax.xml.parsers.ParserConfigurationException;
 
@@ -18,6 +19,8 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.jfinal.kit.PropKit;
+import com.jfinal.plugin.activerecord.Db;
+import com.jfinal.plugin.activerecord.Record;
 import com.zskk.tools.XmlHelper;
 
 import okhttp3.FormBody;
@@ -100,73 +103,10 @@ public class DataService {
 	}
     
     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();
-
-		       		}
-
+    	List<Record> count = null;
+		//同时下载的队列
+		Integer flag = count.size();
+		System.out.print(flag);
 	}
 
 }

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

@@ -20,12 +20,14 @@ public class CMoveTask implements ITask {
 		Integer max = 5;
 		List<Record> count = Db.use("local").find("select * from study where status =4");
 		//同时下载的队列
-		Integer flag = count.size();
+		Integer flag = 0;
+		if (count != null) {
+			flag = count.size();
+		}
 		if (flag >= max) {
 			return;
 		}
 		List<Record> studyidfinds = Db.use("local").find("select * from study where status =1 or status =2 order by createAt asc limit 6");
-		
 		if (studyidfinds == null) {
 			return;
 		}
@@ -50,7 +52,6 @@ public class CMoveTask implements ITask {
 			//状态4：下载中
 			studyidfind.set("status", 4);
 			Db.use("local").update("study", studyidfind);
-			
 			ThreadPoolService tService = ServiceFactory.getService(ThreadPoolService.class);
 			tService.execute(() -> {
 				String execCmd = ExecUtil.execCmd("/zskk_system/other/cmove.sh " + studyidfind.getStr("studyuid"));
@@ -63,11 +64,8 @@ public class CMoveTask implements ITask {
 					studyidfind.set("status", 3);
 					Db.use("local").update("study", studyidfind);
 				}
-				
 			});	
-			
 		}
-		
 	}
 
 	@Override