commit

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

@@ -104,7 +104,7 @@ public class ZskkConfig extends JFinalConfig {
 		
 		//CMOVE定时任务
 		Cron4jPlugin mvData = new Cron4jPlugin();
-		mvData.addTask("*/2 * * * *", new CMoveTask());
+		mvData.addTask("*/1 * * * *", new CMoveTask());
 		me.add(mvData);
 		
 		//更新报告匹配

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

@@ -1,10 +1,18 @@
 package com.zskk.control;
 
+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.List;
 import java.util.Map;
+
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.NodeList;
+
 import com.jfinal.core.Controller;
 import com.jfinal.kit.PropKit;
 import com.jfinal.plugin.activerecord.ActiveRecordPlugin;
@@ -12,6 +20,9 @@ import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Record;
 import com.jfinal.plugin.activerecord.dialect.SqlServerDialect;
 import com.jfinal.plugin.druid.DruidPlugin;
+import com.zskk.tools.ExecUtil;
+import com.zskk.tools.XmlHelper;
+
 import okhttp3.FormBody;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
@@ -54,6 +65,86 @@ public class ViewController extends Controller {
 		}
 	}
 	
+	public void sdcfind() {
+		
+			String dateString = this.getPara("date");
+			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;
+			}
+			File fin_floder = new File("/home/zskk/CFIND_XML/STUDYUID_" + fileString + "1.xml");
+			// 创建从文件读取数据的FileInputStream流
+			FileInputStream fin;
+			try {
+				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);
+				// 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);
+					}
+				}
+				renderNull();
+			} catch (IOException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		
+		
+	}
+		
+		/**
+		 * 日期字符串格式转换年月日时分秒
+		 * 
+		 * @param dateStr
+		 * @return
+		 */
+		private String parseStringToDateTime() {
+			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			Date date = new Date();
+			String daString = sdf.format(date);
+			return daString;
+
+		}
+	
 	public static DruidPlugin createConnectedDruidPlugin() {
 
 		return new DruidPlugin(PropKit.get("jdbcUrl_connected"), PropKit.get("user_connected"),PropKit.get("password_connected").trim());