Explorar o código

[FIX] 执行目标识别算法任务补充状态集变更

Suuuuuukang hai 9 meses
pai
achega
54a9990d95

+ 11 - 1
taais-modules/taais-biz/src/main/java/com/taais/biz/controller/PublicController.java

@@ -1,10 +1,13 @@
 package com.taais.biz.controller;
 
 import com.taais.biz.constant.BizConstant;
+import com.taais.biz.domain.TargetIdentificationSubtaskDetails;
+import com.taais.biz.domain.bo.TargetIdentificationSubtaskDetailsBo;
 import com.taais.biz.domain.dto.TaskResultDTO;
 import com.taais.biz.service.IAlgorithmBizProcessService;
 import com.taais.biz.service.IAlgorithmDataProcessService;
 import com.taais.biz.service.IAlgorithmTaskService;
+import com.taais.biz.service.impl.TargetIdentificationSubtaskDetailsServiceImpl;
 import com.taais.common.core.core.domain.CommonResult;
 import com.taais.common.log.annotation.Log;
 import com.taais.common.log.enums.BusinessType;
@@ -32,6 +35,9 @@ public class PublicController extends BaseController {
     @Resource
     IAlgorithmBizProcessService bizProcessService;
 
+    @Resource
+    TargetIdentificationSubtaskDetailsServiceImpl detailsService;
+
     @Resource
     private IAlgorithmTaskService algorithmTaskService;
 
@@ -48,7 +54,11 @@ public class PublicController extends BaseController {
         }
         String bizType = resultDTO.getBizType();
         if(BizConstant.TYPE_DATA_BIZ_PROCESS.equals(bizType)){
-            errorMsg = bizProcessService.taskResult(resultDTO);
+            //errorMsg = bizProcessService.taskResult(resultDTO);
+            TargetIdentificationSubtaskDetailsBo detailsBo = detailsService.getById(resultDTO.getBizId());
+            detailsBo.setStatus(resultDTO.getStatus() != 200 ? BizConstant.TASK_STATUS_FAILED :
+                resultDTO.getMsg().contains("finish") ? BizConstant.TASK_STATUS_SUCCEED : BizConstant.TASK_STATUS_PROCESSING);
+            detailsService.update(detailsBo);
         } else if (BizConstant.TYPE_DATA_PROCESS.equals(bizType)) {
             errorMsg = dataProcessService.taskResult(resultDTO);
         } else {

+ 6 - 0
taais-modules/taais-biz/src/main/java/com/taais/biz/controller/TargetIdentificationSubtaskDetailsController.java

@@ -3,6 +3,8 @@ package com.taais.biz.controller;
 import java.util.List;
 import java.util.Map;
 
+import com.taais.biz.constant.BizConstant;
+import com.taais.biz.domain.TargetIdentificationSubtaskDetails;
 import com.taais.biz.service.impl.TargetIdentificationSubtaskServiceImpl;
 import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
@@ -116,6 +118,10 @@ public class TargetIdentificationSubtaskDetailsController extends BaseController
     public CommonResult<Void> add(@RequestBody Map<String, String> params) {
         try {
             Long taskId = Long.parseLong(params.get("taskId"));
+            TargetIdentificationSubtaskDetails details = targetIdentificationSubtaskDetailsService.getById(taskId);
+            details.setStatus(BizConstant.TASK_STATUS_PENDING);
+            targetIdentificationSubtaskDetailsService.updateById(details);
+
             subtaskService.executeOneTask(taskId);
             return CommonResult.success();
         } catch (Exception e) {

+ 2 - 3
taais-modules/taais-biz/src/main/java/com/taais/biz/service/impl/TargetIdentificationSubtaskServiceImpl.java

@@ -171,8 +171,7 @@ public class TargetIdentificationSubtaskServiceImpl extends BaseServiceImpl<Targ
 
     public void executeOneTask(Long taskId) {
         TargetIdentificationSubtaskDetailsBo details = detailsService.getById(taskId);
-        details.setStatus(BizConstant.TASK_STATUS_PENDING);
-        detailsService.update(details);
+
         log.info("details: {}", details);
         doProcessSubTaskDetail(details);
     }
@@ -244,7 +243,7 @@ public class TargetIdentificationSubtaskServiceImpl extends BaseServiceImpl<Targ
             log.info("version is : {}", detail.getVersion());
             try {
                 httpResult = response.block();
-                detail.setStatus(BizConstant.TASK_STATUS_PROCESSING);
+                detail.setStatus(BizConstant.TASK_STATUS_SUCCEED);
             } catch (Exception e) {
                 log.error("http request error: {}", e.getMessage());
                 detail.setStatus(BizConstant.TASK_STATUS_FAILED);