commit

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

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

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

@@ -33,6 +33,7 @@ public class CMoveTask implements ITask {
         		if (jsonObject.getString("studyuid").equals(studyidfind.getStr("STUDYUID"))) {
         			//5cmove前以获取
         			studyidfind.set("status", 5);
+        			studyidfind.set("updateAt", parseStringToDateTime());
             		Db.use("local").update("study", studyidfind);
         			studyidfind = null;
 					break;
@@ -45,14 +46,17 @@ public class CMoveTask implements ITask {
         
         if (studyidfind != null) {
         	studyidfind.set("status", 4);
+			studyidfind.set("updateAt", parseStringToDateTime());
     		Db.use("local").update("study", studyidfind);
             String execCmd = ExecUtil.execCmd("/zskk_system/other/cmove.sh " + studyidfind.getStr("studyuid"));
     		if (execCmd.contains("Connection refused") || execCmd.contains("Socket closed")) {
     			studyidfind.set("status", 2);
+    			studyidfind.set("updateAt", parseStringToDateTime());
     			Db.use("local").update("study", studyidfind);
     			return;
     		}
     		studyidfind.set("status", 3);
+			studyidfind.set("updateAt", parseStringToDateTime());
     		Db.use("local").update("study", studyidfind);
 		}
         
@@ -66,16 +70,15 @@ public class CMoveTask implements ITask {
 	}
 	
 	/**
-	 * 日期字符串格式转换
+	 * 日期字符串格式转换年月日时分秒
 	 * 
 	 * @param dateStr
 	 * @return
 	 */
-	private String parseStringToDate() {
+	private String parseStringToDateTime() {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		Date date = new Date();
-		long dInteger = date.getTime() - 600000;
-		String daString = sdf.format(new Date(dInteger));
+		String daString = sdf.format(date);
 		return daString;
 
 	}

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

@@ -30,6 +30,7 @@ public class DBDataTask implements ITask {
         		Record studyidfind = Db.use("local").findFirst("select * from study where studyuid = ?", jsonObject.getString("studyuid"));
     			if (studyidfind != null && studyidfind.getInt("status")==1 || studyidfind.getInt("status")==2) {
     				studyidfind.set("status", 5);
+        			studyidfind.set("updateAt", parseStringToDateTime());
     	    		Db.use("local").update("study", studyidfind);
 				}
     			Record record = Db.use("connected").findFirst("select * from reportinfo where STUDYSTATUS = '诊断完成' and STUDYUID=?", jsonObject.getString("studyuid"));
@@ -121,27 +122,17 @@ public class DBDataTask implements ITask {
 	}
 	
 	/**
-	 * 日期字符串格式转换
+	 * 日期字符串格式转换年月日时分秒
+	 * 
 	 * @param dateStr
 	 * @return
 	 */
-	private String parseStringToDate(String dateStr) {
-		if (dateStr == null) {
-			return "";
-		}
-		SimpleDateFormat sdf= new SimpleDateFormat("yyyyMMddHHmmss");
-	    Date date = null;
-	    String timeString = null;
-		try {
-			date = sdf.parse(dateStr);
-			SimpleDateFormat sdf2= new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+	private String parseStringToDateTime() {
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		Date date = new Date();
+		String daString = sdf.format(date);
+		return daString;
 
-			timeString = sdf2.format(date);
-		} catch (ParseException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-        return timeString;
 	}
 
 }