commit

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

@@ -1,10 +1,7 @@
 package com.zskk.task;
 
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.commons.net.ftp.FTPClient;
-
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -21,10 +18,16 @@ public class DownloadTask implements ITask {
 	public void run() {
 		// TODO Auto-generated method stub
 		DataService dService = ServiceFactory.getService(DataService.class);
-		Record recordfind = Db.use("local").findFirst("select * from study order by createAt asc");
+		Record recordfind = Db.use("local").findFirst("select * from study where status=1 or status=2 order by createAt asc");
 		JSONArray array = dService.getImage(recordfind.getStr("accessionNumber"));
+		if (array==null) {
+			recordfind.set("status", 2);
+			Db.use("local").update("study",recordfind);
+			return;
+		}
 		recordfind.set("status", 4);
 		recordfind.set("imageNum", array.size());
+		recordfind.set("updateAt", getDateStr());
 		Db.use("local").update("study",recordfind);
 		for (Object object : array) {
 			JSONObject jsonObject = JSON.parseObject(object.toString());
@@ -32,6 +35,7 @@ public class DownloadTask implements ITask {
 			dService.downloadFtpFile(jsonObject.getString("Path"), strings[1]);
 		}
 		recordfind.set("status", 3);
+		recordfind.set("updateAt", getDateStr());
 		Db.use("local").update("study",recordfind);
 	}
 
@@ -41,4 +45,16 @@ public class DownloadTask implements ITask {
 
 	}
 
+	/**
+	 * 日期字符串格式转换
+	 * @param dateStr
+	 * @return
+	 */
+	private String getDateStr() {
+		SimpleDateFormat sdf= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+	    Date date = new Date();
+	    String timeString = null;
+		timeString = sdf.format(date);
+        return timeString;
+	}
 }

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

@@ -1,20 +1,11 @@
 package com.zskk.task;
 
-import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.activerecord.Record;
 import com.jfinal.plugin.cron4j.ITask;
-import com.zskk.service.DataService;
-import com.zskk.service.ServiceFactory;
-import com.zskk.service.ThreadPoolService;
 
 public class InfoTask implements ITask {
 
@@ -22,6 +13,9 @@ public class InfoTask implements ITask {
 	public void run() {
 		// TODO Auto-generated method stub
 		List<Record> records = Db.use("connected").find("select * from examinfo where STUDYTIME>?",parseStringToDate());
+		if (records==null) {
+			return;
+		}
 		for (Record record : records) {
 			Record recordfind = Db.use("local").findFirst("select * from study where accessionNumber=?",record.getStr("ACCESSIONNUMBER"));
 			if (recordfind!=null) {