逻辑优化

src/main/java/com/whdc/component/AutoCallTaskScheduled.java

@@ -131,7 +131,7 @@ public class AutoCallTaskScheduled {
                         //fetch status
                         int pendingDuration = 60 * 1000 * 2;
                         int loopGap = 1000;
-                        boolean success = false;
+                        boolean resultFetched = false;
                         while (pendingDuration > 0) {
                             try {
                                 Thread.sleep(loopGap);
@@ -141,18 +141,26 @@ public class AutoCallTaskScheduled {
                             }
                             pendingDuration -= loopGap;
 
-                            success = autoCallTaskService.step4QueryAICCTaskResult(person);
-                            if (success) break;
+                            resultFetched = autoCallTaskService.step4QueryAICCTaskResult(person);
+                            if (resultFetched) break;
                         }
+
                         AutoCallPerson _person = autoCallTaskService.getPersonMapper().selectById(person.getId());
                         person = _person;
-                        if (!success) {
+
+                        if (resultFetched) {
+                            //获取到任务详情且有话术标签为已知晓，中断循环
+                            if (AutoCallPerson.TAG_DONE.equals(person.getTag())) break;
+                        } else {
+                            //获取任务详情超时
                             if (person.getUploadedTimes() == 2) {
+                                //已经呼叫两次了，中断循环
                                 autoCallTaskService.markPersonDetailQueryTimeout(person);
+                                break;
                             }
                         }
+
                         //重呼等15秒
-                        if (AutoCallPerson.TAG_DONE.equals(person.getTag())) break;
                         try {
                             Thread.sleep(15*1000);
                         } catch (InterruptedException ignore) {
@@ -160,10 +168,11 @@ public class AutoCallTaskScheduled {
                             break;
                         }
                     }
-                    if (!AutoCallPerson.TAG_DONE.equals(person.getTag())) {
-                        autoCallTaskService.cancelPerson(person);
-                    } else {
+                    if (AutoCallPerson.TAG_DONE.equals(person.getTag())) {
+                        //有话术标签为已知晓，中断后续呼叫
                         break;
+                    } else {
+                        autoCallTaskService.cancelPerson(person);
                     }
                 }
             } catch (Exception e) {