allen преди 11 месеца
родител
ревизия
ef95ad5e24

+ 5 - 0
taais-modules/taais-biz/src/main/java/com/taais/biz/controller/AlgorithmBizProcessController.java

@@ -16,6 +16,8 @@ import com.taais.common.web.core.BaseController;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -33,6 +35,8 @@ import java.util.List;
 @RestController
 @RequestMapping("/task/bizProcess")
 public class AlgorithmBizProcessController extends BaseController {
+
+    private static final Logger log = LoggerFactory.getLogger(AlgorithmBizProcessController.class);
     @Resource
     private IAlgorithmBizProcessService algorithmBizProcessService;
 
@@ -129,6 +133,7 @@ public class AlgorithmBizProcessController extends BaseController {
             testResult = algorithmBizProcessService.getTestResult(subtaskId);
         } catch (IOException e) {
             // 日志
+            log.error("getTestResult 异常",e);
             return CommonResult.fail("系统异常,请联系管理员");
         }
         return CommonResult.success(testResult);

+ 2 - 0
taais-modules/taais-biz/src/main/java/com/taais/biz/domain/dto/AlgorithmConfigParamDto.java

@@ -6,6 +6,8 @@ import lombok.Data;
 public class AlgorithmConfigParamDto {
     // 参数名称
     private String name;
+    // 算法超参名称
+    private String agName;
     // 参数值
     private String value;
     // 验证

+ 2 - 1
taais-modules/taais-biz/src/main/java/com/taais/biz/service/impl/AlgorithmBizProcessServiceImpl.java

@@ -13,6 +13,7 @@ import com.taais.biz.domain.dto.TaskResultDTO;
 import com.taais.biz.domain.dto.task.TestResultDto;
 import com.taais.biz.domain.dto.task.TranResultDto;
 import com.taais.biz.service.IAlgorithmConfigService;
+import com.taais.common.core.config.TaaisConfig;
 import com.taais.common.core.utils.DateUtils;
 import com.taais.common.core.utils.MapstructUtils;
 import com.taais.common.core.utils.file.FileUtils;
@@ -203,7 +204,7 @@ public class AlgorithmBizProcessServiceImpl extends BaseServiceImpl<AlgorithmBiz
         if (!CollectionUtils.isEmpty(bizProcessVoList)) {
             resultDto.getAgNameList().add(BizConstant.ORIGINAL_IMAGE);
             AlgorithmBizProcessVo bizProcessVo = bizProcessVoList.get(0);
-            fileNames = FileUtils.getAllFileNamesAndExtensions(bizProcessVo.getPreprocessPath());
+            fileNames = FileUtils.getAllFileNamesAndExtensions(TaaisConfig.getProfile() + bizProcessVo.getPreprocessPath());
             String resultPath = bizProcessVo.getResultPath();
             if (!CollectionUtils.isEmpty(fileNames)) {
                 for (String name : fileNames) {

+ 1 - 1
taais-modules/taais-biz/src/main/java/com/taais/biz/service/impl/AlgorithmSubtaskServiceImpl.java

@@ -230,7 +230,7 @@ public class AlgorithmSubtaskServiceImpl extends BaseServiceImpl<AlgorithmSubtas
                     otherParams.put("modelPath", model.getModelAddress());
                 }
                 for (AlgorithmConfigParamDto algorithmConfigParamDto : paramDtoList) {
-                    otherParams.put(algorithmConfigParamDto.getName(), StringUtils.isNotEmpty(algorithmConfigParamDto.getValue()) ? algorithmConfigParamDto.getValue() : algorithmConfigParamDto.getDefaultValue());
+                    otherParams.put(algorithmConfigParamDto.getAgName(), StringUtils.isNotEmpty(algorithmConfigParamDto.getValue()) ? algorithmConfigParamDto.getValue() : algorithmConfigParamDto.getDefaultValue());
                 }
                 algorithmRequestDto.setOtherParams(otherParams);
             }