diff --git a/arex-schedule-web-api/pom.xml b/arex-schedule-web-api/pom.xml index 376b7118..dc949063 100644 --- a/arex-schedule-web-api/pom.xml +++ b/arex-schedule-web-api/pom.xml @@ -144,7 +144,7 @@ arex-schedule-parent com.arextest - 1.0.42 + 1.0.43 @@ -313,5 +313,5 @@ - 1.0.42 + 1.0.43 \ No newline at end of file diff --git a/arex-schedule-web-api/src/main/java/com/arextest/schedule/service/PlanConsumePrepareService.java b/arex-schedule-web-api/src/main/java/com/arextest/schedule/service/PlanConsumePrepareService.java index b55799c2..7f5f9e0d 100644 --- a/arex-schedule-web-api/src/main/java/com/arextest/schedule/service/PlanConsumePrepareService.java +++ b/arex-schedule-web-api/src/main/java/com/arextest/schedule/service/PlanConsumePrepareService.java @@ -22,6 +22,7 @@ import com.arextest.schedule.progress.ProgressEvent; import com.arextest.schedule.service.noise.ReplayNoiseIdentify; import com.arextest.schedule.utils.ReplayParentBinder; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Set; @@ -251,6 +252,10 @@ public void updateFailedActionAndCase(ReplayPlan replayPlan, CompletableFuture removeRecordsAndScenesTask = CompletableFuture.runAsync( () -> replayReportService.removeRecordsAndScenes(actionIdAndRecordIdsMap), rerunPrepareExecutorService); + CompletableFuture removeErrorMsgTask = CompletableFuture.runAsync( + () -> replayReportService.removeErrorMsg(replayPlan.getId(), + new ArrayList<>(actionIdAndRecordIdsMap.keySet())), + rerunPrepareExecutorService); // XXX: Whether batch update actionCaseItem status is redundant, rerun in doFixedCaseSave has already // implemented this processing CompletableFuture batchUpdateStatusTask = CompletableFuture.runAsync( @@ -260,8 +265,8 @@ public void updateFailedActionAndCase(ReplayPlan replayPlan, () -> replayNoiseIdentify.rerunNoiseAnalysisRecovery(replayPlan.getReplayActionItemList()), rerunPrepareExecutorService); - CompletableFuture.allOf(removeRecordsAndScenesTask, batchUpdateStatusTask, noiseAnalysisRecover) - .join(); + CompletableFuture.allOf(removeRecordsAndScenesTask, batchUpdateStatusTask, noiseAnalysisRecover, + removeErrorMsgTask).join(); } public void doResumeOperationDescriptor(ReplayPlan replayPlan) { diff --git a/arex-schedule-web-api/src/main/java/com/arextest/schedule/service/ReplayReportService.java b/arex-schedule-web-api/src/main/java/com/arextest/schedule/service/ReplayReportService.java index 72b42eb4..5c85b59f 100644 --- a/arex-schedule-web-api/src/main/java/com/arextest/schedule/service/ReplayReportService.java +++ b/arex-schedule-web-api/src/main/java/com/arextest/schedule/service/ReplayReportService.java @@ -15,6 +15,7 @@ import com.arextest.schedule.model.ReplayStatusType; import com.arextest.schedule.model.converter.ReplayCompareResultConverter; import com.arextest.web.model.contract.contracts.ChangeReplayStatusRequestType; +import com.arextest.web.model.contract.contracts.RemoveErrorMsgRequest; import com.arextest.web.model.contract.contracts.RemoveRecordsAndScenesRequest; import com.arextest.web.model.contract.contracts.ReportInitialRequestType; import com.arextest.web.model.contract.contracts.replay.AnalyzeCompareResultsRequestType; @@ -54,6 +55,8 @@ public final class ReplayReportService implements ComparisonWriter { private String updateReportInfoUrl; @Value("${arex.api.remove.records.url}") private String removeRecordsUrl; + @Value("${arex.api.remove.errorMsg.url}") + private String removeErrorMsgUrl; public boolean initReportInfo(ReplayPlan replayPlan) { ReportInitialRequestType requestType = new ReportInitialRequestType(); @@ -252,4 +255,13 @@ public void removeRecordsAndScenes(Map> actionIdAndRecordId GenericResponseType.class); LOGGER.info("removeRecordsAndScenes request:{}, response:{}", requestType, response); } + + public void removeErrorMsg(String planId, List planItemIdList) { + RemoveErrorMsgRequest request = new RemoveErrorMsgRequest(); + request.setPlanId(planId); + request.setPlanItemIdList(planItemIdList); + Response response = httpWepServiceApiClient.jsonPost(removeErrorMsgUrl, request, + GenericResponseType.class); + LOGGER.info("removeErrorMsg request:{}, response:{}", request, response); + } } \ No newline at end of file diff --git a/arex-schedule-web-api/src/main/resources/application.properties b/arex-schedule-web-api/src/main/resources/application.properties index 65d01825..5a113304 100644 --- a/arex-schedule-web-api/src/main/resources/application.properties +++ b/arex-schedule-web-api/src/main/resources/application.properties @@ -15,6 +15,7 @@ arex.api.push.compareResult.url=${arex.api.service.api}/api/report/analyzeCompar arex.api.push.replayStatus.url=${arex.api.service.api}/api/report/pushReplayStatus arex.api.update.report.info.url=${arex.api.service.api}/api/report/updateReportInfo arex.api.remove.records.url=${arex.api.service.api}/api/report/removeRecordsAndScenes +arex.api.remove.errorMsg.url=${arex.api.service.api}/api/report/removeErrorMsg arex.api.config.addExclusion.url=${arex.api.service.api}/api/config/comparison/exclusions/batchModify/INSERT #for schedule arex.api.config.system.url=${arex.api.service.api}/api/system/config/list diff --git a/pom.xml b/pom.xml index 8b85e08e..baa73571 100644 --- a/pom.xml +++ b/pom.xml @@ -289,7 +289,7 @@ ${jacoco.report.path} 2.6.3 - 0.6.0.7 + 0.6.0.9 @@ -299,5 +299,5 @@ https://github.com/arextest/arex-replay-schedule https://github.com/arextest/arex-replay-schedule - 1.0.42 + 1.0.43 \ No newline at end of file