wangliang 3 жил өмнө
parent
commit
3a554e2533

+ 9 - 9
teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/templete/strategy/CalculateTaskTemplate.java

@@ -109,7 +109,7 @@ public abstract class CalculateTaskTemplate {
         TBSyncTask tbSyncTask = calculateParams.getTbSyncTask();
         TBSyncTask tbSyncTask = calculateParams.getTbSyncTask();
         tbSyncTask.setStatus(TaskStatusEnum.FINISH);
         tbSyncTask.setStatus(TaskStatusEnum.FINISH);
         tbSyncTask.setResult(TaskResultEnum.ERROR);
         tbSyncTask.setResult(TaskResultEnum.ERROR);
-        tbSyncTaskService.updateById(tbSyncTask);
+        updateProgress(calculateParams);
     }
     }
 
 
     /**
     /**
@@ -124,15 +124,15 @@ public abstract class CalculateTaskTemplate {
         TBSyncTask tbSyncTask = calculateParams.getTbSyncTask();
         TBSyncTask tbSyncTask = calculateParams.getTbSyncTask();
 
 
         Long time = System.currentTimeMillis();
         Long time = System.currentTimeMillis();
-        JSONObject dataObjectJson = new JSONObject();
-        dataObjectJson.put("examId", tbSyncTask.getThirdRelateId());
-        dataObjectJson.put("courseCode", calculateParams.getCourseCode());
-        dataObjectJson.put("progress", tbSyncTask.getProgress());
-        dataObjectJson.put("status", tbSyncTask.getStatus());
-        dataObjectJson.put("time", time);
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("examId", tbSyncTask.getThirdRelateId());
+        jsonObject.put("courseCode", calculateParams.getCourseCode());
+        jsonObject.put("progress", tbSyncTask.getProgress());
+        jsonObject.put("status", tbSyncTask.getStatus());
+        jsonObject.put("time", time);
 
 
-        String sign = URLEncoder.encode(Base64Util.encode(ShaUtils.sha1(dictionaryConfig.printOpenDomain().getCallbackPwd() + dataObjectJson.toJSONString())), SystemConstant.CHARSET_NAME);
-        String callbackResult = HttpUtil.postJson(dictionaryConfig.printOpenDomain().getHostUrl() + dictionaryConfig.printOpenDomain().getCallbackUrlApi(), dataObjectJson.toJSONString(), sign, time);
+        String sign = URLEncoder.encode(Base64Util.encode(ShaUtils.sha1(dictionaryConfig.printOpenDomain().getCallbackPwd() + jsonObject.toJSONString())), SystemConstant.CHARSET_NAME);
+        String callbackResult = HttpUtil.postJson(dictionaryConfig.printOpenDomain().getHostUrl() + dictionaryConfig.printOpenDomain().getCallbackUrlApi(), jsonObject.toJSONString(), sign, time);
         if (Objects.nonNull(callbackResult)) {
         if (Objects.nonNull(callbackResult)) {
             log.info("callbackResult:{}", JacksonUtil.parseJson(callbackResult));
             log.info("callbackResult:{}", JacksonUtil.parseJson(callbackResult));
         }
         }