fix bugs

taais-admin/src/main/resources/application-dev.yml

@@ -64,7 +64,7 @@ mybatis-flex:
 spring.data:
   redis:
     # 地址
-    host: 110.41.34.83
+    host: 101.126.133.7
     # 端口，默认为6379
     port: 6379
     # 数据库索引

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

@@ -79,9 +79,6 @@ public class PublicController extends BaseController {
     @Resource
     ObjectMatchServiceImpl objectMatchService;
 
-
-
-    // todo: 2024080906
     @PostMapping("/taskResult")
     public CommonResult<Void> taskResult(@RequestBody TaskResultDTO resultDTO) {
         log.info("taskResult start,params:{}", resultDTO);
@@ -97,7 +94,6 @@ public class PublicController extends BaseController {
             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);
-            detailsBo.setRemarks(JSON.toJSONString(Arrays.asList(resultDTO.getMin(), resultDTO.getMax(), resultDTO.getAverage())));
             detailsBo.setEndTime(new Date());
             detailsBo.setCostSecond((detailsBo.getEndTime().getTime() - detailsBo.getStartTime().getTime()) / 1000);
             detailsService.update(detailsBo);

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

@@ -1,5 +1,6 @@
 package com.taais.biz.service.impl;
 
+import java.io.File;
 import java.lang.reflect.Type;
 import java.util.*;
 
@@ -22,6 +23,7 @@ import com.taais.biz.domain.dto.AlgorithmRequestDto;
 import com.taais.biz.domain.vo.AlgorithmModelVo;
 import com.taais.biz.domain.vo.AlgorithmTaskConfigurationVo;
 import com.taais.biz.domain.vo.TargetIdentificationSubtaskDetailsVo;
+import com.taais.common.core.config.TaaisConfig;
 import com.taais.common.core.constant.Constants;
 import com.taais.common.core.utils.MapstructUtils;
 import com.taais.common.core.utils.StringUtils;
@@ -254,13 +256,39 @@ public class TargetIdentificationSubtaskServiceImpl extends BaseServiceImpl<Targ
             String[] urls = url.split(";;;");
             url = urls[0];
             if (urls.length > 1) {
-                algorithmRequestDto.getOtherParams().put("weight_path", BizConstant.DOCKER_BASE_PATH + MINI_PREFIX + urls[1] + "/result/weights/best.pt");
+                // 兼容pth 等
+                String SUFFIX_NAME = "best.pt";
+                String _path = BizConstant.DOCKER_BASE_PATH + MINI_PREFIX + urls[1] + "/result/weights/";
+                File dir = new File(_path);
+                if (dir.exists()) {
+                    File[] files = dir.listFiles();
+                    for (File file : files) {
+                        if (file.isFile() && file.getName().contains("best")) {
+                            SUFFIX_NAME = file.getName();
+                            break;
+                        }
+                    }
+                }
+                algorithmRequestDto.getOtherParams().put("weight_path", _path+SUFFIX_NAME);
             }
         } else if (taskName.contains("测试")) {
             String[] urls = url.split(";;;");
             url = urls[0];
             if (urls.length > 1) {
-                algorithmRequestDto.getOtherParams().put("weight_path", BizConstant.DOCKER_BASE_PATH + MINI_PREFIX + urls[1] + "/result/weights/best.pt");
+                // 兼容pth 等
+                String SUFFIX_NAME = "best.pt";
+                String _path = BizConstant.DOCKER_BASE_PATH + MINI_PREFIX + urls[1] + "/result/weights/";
+                File dir = new File(_path);
+                if (dir.exists()) {
+                    File[] files = dir.listFiles();
+                    for (File file : files) {
+                        if (file.isFile() && file.getName().contains("best")) {
+                            SUFFIX_NAME = file.getName();
+                            break;
+                        }
+                    }
+                }
+                algorithmRequestDto.getOtherParams().put("weight_path", _path+SUFFIX_NAME);
             }
         } else {
             log.error("taskName error: " + taskName);