修改执行伴随任务的线程

src/main/java/com/founder/interservice/tracktraveltogether/service/impl/TogetherScheduledService.java

@@ -52,8 +52,8 @@ public class TogetherScheduledService {
      */
     @Scheduled(initialDelay = 180000,fixedDelay = 180000) //项目启动后延迟三分钟秒执行，每次执行完后三分钟后再次执行
     public void queryTaskResult(){
-        System.out.println("=============伴随定时任务开始执行================");
-        System.out.println("线程名称：=======" + Thread.currentThread().getName());
+        System.out.println("=============TogetherTask  Start Running================");
+        System.out.println("Thread Name：=======" + Thread.currentThread().getName());
         try{
             //1 下去查询任务表中status = "QUEUEING","STARTING","RUNNING"的任务
             List<TrackTogetherTask> taskList = taskRepository.findAll(new Specification<TrackTogetherTask>() {
@@ -69,25 +69,17 @@ public class TogetherScheduledService {
             if(taskList != null && !taskList.isEmpty()){
                 for (TrackTogetherTask task:taskList) {
                     String status_url = TOGETHER_STATUS_URL + "&taskId="+task.getTaskId();
-                    String statusStr = HttpUtil.doGet(status_url);
+                    String statusStr = HttpUtil.getWaData(status_url);
                     //String statusStr = "{\"progress\":0.8,\"state\":\"TIMEOUT\"}";
                     System.out.println("statusStr ======================== " + statusStr);
-                    while(statusStr == null || statusStr.isEmpty() || !statusStr.startsWith("{")){
-                        statusStr = HttpUtil.doGet(status_url);
-                        Thread.sleep(1000);
-                        System.out.println("statusStr ======================== " + statusStr);
-                    }
                     JSONObject jsonObject = JSONObject.parseObject(statusStr);
                     String progress = jsonObject.getString("progress");
                     String state = jsonObject.getString("state");
                     if("1".equals(progress)  && "FINISHED".equals(state)){
                         String info_url = TOGETHER_INFO_URL + "&taskId=" + task.getTaskId();
-                        String taskInfoResult = HttpUtil.doGet(info_url);
+                        String taskInfoResult = HttpUtil.getWaData(info_url);
                         //String taskInfoResult = "{\"items\":[{\"count\":75,\"objectType\":4394,\"objectTypeName\":\"电话号码\",\"objectValue\":\"460013088311061\"},{\"count\":70,\"objectType\":4394,\"objectTypeName\":\"电话号码\",\"objectValue\":\"460029233464484\"},{\"count\":65,\"objectType\":4394,\"objectTypeName\":\"电话号码\",\"objectValue\":\"460013022609934\"},{\"count\":63,\"objectType\":4394,\"objectTypeName\":\"电话号码\",\"objectValue\":\"460013312607010\"},{\"count\":57,\"objectType\":4394,\"objectTypeName\":\"电话号码\",\"objectValue\":\"460018669002987\"},{\"count\":53,\"objectType\":4394,\"objectTypeName\":\"电话号码\",\"objectValue\":\"460008397079525\"},{\"count\":53,\"objectType\":4394,\"objectTypeName\":\"电话号码\",\"objectValue\":\"460020523597601\"},{\"count\":53,\"objectType\":4394,\"objectTypeName\":\"电话号码\",\"objectValue\":\"460003164872839\"}],\"taskId\":\"98f6bcd4621d373cade4e832627b4f6-540-xzxt-api-3-1536231954767\"}";
-                        while(StringUtil.ckeckEmpty(taskInfoResult) || !taskInfoResult.startsWith("{")){
-                            taskInfoResult = HttpUtil.doGet(info_url);
-                            Thread.sleep(1000);
-                        }
+                        taskInfoResult = HttpUtil.getWaData(info_url);
                         getAndSaveInfo(taskInfoResult,task);
                     }
                     if(!state.equals(task.getState())){