commit

DataFusion/res/config.properties

@@ -6,13 +6,10 @@ jdbcUrl_connected  = jdbc:sqlserver://10.10.1.241:1433;DatabaseName=medreport
 user_connected 	   = gjyfrh
 password_connected = gjyfrh123
 #DATA-Parms
-institution_id     = 25500005
+institution_id     = 22100006
 
 #DB-connected partners
 jdbcUrl_local  = jdbc:mysql://127.0.0.1:3306/pacsonline?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&serverTimezone=Asia/Shanghai
 #jdbcUrl_connected  = jdbc:oracle:thin:@192.168.100.4:1521:pacs
 user_local	   = zskk
-password_local = Zskk_2023
-#SMB
-smb_user           = pacs
-smb_password       = pacs
+password_local = Zskk_2024

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

@@ -81,23 +81,23 @@ public class ZskkConfig extends JFinalConfig {
 		me.add(druidPluginLocal);
 
 		// 配置ActiveRecord插件
-//		ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
-//		arpConnected.setDialect(new OracleDialect());
-//		me.add(arpConnected);
-//		
-//		ActiveRecordPlugin arpLocal = new ActiveRecordPlugin("local", druidPluginLocal);
-//		arpLocal.setDialect(new MysqlDialect());
-//		me.add(arpLocal);
+		ActiveRecordPlugin arpConnected = new ActiveRecordPlugin("connected", druidPluginConnected);
+		arpConnected.setDialect(new OracleDialect());
+		me.add(arpConnected);
+		
+		ActiveRecordPlugin arpLocal = new ActiveRecordPlugin("local", druidPluginLocal);
+		arpLocal.setDialect(new MysqlDialect());
+		me.add(arpLocal);
 		
 		//同步报告
 //		Cron4jPlugin cpData = new Cron4jPlugin();
 //		cpData.addTask("*/4 * * * *", new DataTask());
 //		me.add(cpData);
 ////		
-////		//将cfind请求检查录入待检查库
-//		Cron4jPlugin inData = new Cron4jPlugin();
-//		inData.addTask("*/6 * * * *", new UpdateTask());
-//		me.add(inData);
+		//将cfind请求检查录入待检查库
+		Cron4jPlugin inData = new Cron4jPlugin();
+		inData.addTask("*/3 * * * *", new UpdateTask());
+		me.add(inData);
 //		
 //		//执行cfind请求
 //		Cron4jPlugin cgData = new Cron4jPlugin();

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

@@ -21,10 +21,10 @@ public class UpdateTask implements ITask {
 	@Override
 	public void run() {
 		// TODO Auto-generated method stub
-		List<Record> records = Db.use("connected").find("SELECT * FROM (SELECT ACCESSIONNUMBER,STUDYTIME FROM studyinfo group BY STUDYTIME,ACCESSIONNUMBER order by STUDYTIME desc)WHERE ROWNUM <= 10");
+		List<Record> records = Db.use("connected").find("select top 10 * from examinfo order by ReqDate desc");
 		for (Record record : records) {
-			String studyuidString = record.getStr("ACCESSIONNUMBER");
-			String modalitiesString = "";
+			String studyuidString = record.getStr("AccessionNumber");
+			String modalitiesString = record.getStr("Modality");
 
 			Record studyidfind = Db.use("local").findFirst("select * from study where studyuid = ?",
 					studyuidString);
@@ -34,62 +34,6 @@ public class UpdateTask implements ITask {
 				Db.use("local").save("study", studyinfo);
 			}
 		}
-//		String dateString = parseStringToDate();
-//		String fileString = dateString.replace("0", "o");
-//		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>";
-//			xmlContent = xmlContent.replace("&#0", "");
-//			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("00080050")) {
-//									studyuidString = xmlHelper.getString(dicomAttributeList.item(j), "Value");
-//									continue;
-//								}
-//								// 获取检查类型00080060or00080061
-//								if (attributeMap.item(k).getNodeValue().equals("00080060")) {
-//									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 (IOException e) {
-//			// TODO Auto-generated catch block
-//			e.printStackTrace();
-//		}
 	}
 
 	@Override