刘韬 %!s(int64=3) %!d(string=hai) anos
pai
achega
8d346fdf9e

+ 1 - 1
DataFusion/src/com/zskk/config/ZskkConfig.java

@@ -121,7 +121,7 @@ public class ZskkConfig extends JFinalConfig {
 		
 		//同步报告
 		Cron4jPlugin reData = new Cron4jPlugin();
-		reData.addTask("*/25 * * * *", new ReCMoveTask());
+		reData.addTask("*/20 * * * *", new ReCMoveTask());
 		me.add(reData);
 	}
 

+ 16 - 0
DataFusion/src/com/zskk/task/CMoveTask.java

@@ -42,10 +42,12 @@ public class CMoveTask implements ITask {
 				if (execCmd.contains("Connection refused")) {
 					//状态2:错误
 					studyidfind.set("status", 2);
+					studyidfind.set("updateAt", parseStringToDateTime());
 					Db.use("local").update("study", studyidfind);
 				}else {
 					//状态2:完成
 					studyidfind.set("status", 3);
+					studyidfind.set("updateAt", parseStringToDateTime());
 					Db.use("local").update("study", studyidfind);
 				}
 				
@@ -75,5 +77,19 @@ public class CMoveTask implements ITask {
 		return daString;
 
 	}
+	
+	/**
+	 * 日期字符串格式转换年月日时分秒
+	 * 
+	 * @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;
+
+	}
 
 }

+ 17 - 1
DataFusion/src/com/zskk/task/ReCMoveTask.java

@@ -42,10 +42,12 @@ public class ReCMoveTask implements ITask {
 			if (execCmd.contains("Connection refused")) {
 				// 状态2:错误
 				studyidfind.set("status", 2);
+				studyidfind.set("updateAt", parseStringToDateTime());
 				Db.use("local").update("study", studyidfind);
 			} else {
 				// 状态5:重新下载完成
 				studyidfind.set("status", 5);
+				studyidfind.set("updateAt", parseStringToDateTime());
 				Db.use("local").update("study", studyidfind);
 			}
 
@@ -70,7 +72,7 @@ public class ReCMoveTask implements ITask {
 	private String parseStringToDateFrom() {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		Date date = new Date();
-		long dInteger = date.getTime() - 7200000;
+		long dInteger = date.getTime() - 3600000;
 		String daString = sdf.format(new Date(dInteger));
 		return daString;
 
@@ -90,5 +92,19 @@ public class ReCMoveTask implements ITask {
 		return daString;
 
 	}
+	
+	/**
+	 * 日期字符串格式转换年月日时分秒
+	 * 
+	 * @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;
+
+	}
 
 }