commit

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

@@ -18,11 +18,12 @@ public class CMoveTask implements ITask {
 	@Override
 	public void run() {
 		// TODO Auto-generated method stub
+		//0wait1match2break
 		int flag = 0;
 		DataService dService = ServiceFactory.getService(DataService.class);
         JSONArray jsonArray = dService.getExamList(50);	
         Record studyidfind = null;
-        while (flag == 0) {
+        while (flag != 2) {
         	studyidfind = Db.use("local").findFirst("select * from study where status =1 or status =2 order by createAt desc");
     		if (studyidfind == null) {
     			return;
@@ -31,36 +32,31 @@ public class CMoveTask implements ITask {
         	for (Object object : jsonArray) {
         		JSONObject jsonObject = JSON.parseObject(object.toString());
         		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;
+					flag = 1;
 				}
             }
-        	if (studyidfind != null) {
-				flag = 1;
+        	if (flag == 1) {
+        		studyidfind.set("status", 5);
+    			studyidfind.set("updateAt", parseStringToDateTime());
+        		Db.use("local").update("study", studyidfind);			
+        	}else {
+        		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);
+				flag = 2;
 			}
 	    }
         
-        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);
-		}
-        
-        
 	}
 
 	@Override