fix: test to fix

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

@@ -5,21 +5,6 @@ server:
 spring:
   datasource:
     type: com.zaxxer.hikari.HikariDataSource
-    hikari:
-      # 最大连接池数量
-      maximum-pool-size: 4
-      # 最小空闲线程数量
-      minimum-idle: 2
-      # 配置获取连接等待超时的时间
-      connectionTimeout: 30000
-      # 校验超时时间
-      validationTimeout: 5000
-      # 空闲连接存活最大时间，默认10分钟
-      idleTimeout: 60000
-      # 此属性控制池中连接的最长生命周期，值0表示无限生命周期，默认30分钟
-      maxLifetime: 60000
-      # 多久检查一次连接的活性
-      keepaliveTime: 30000
 mybatis-flex:
   # sql审计
   audit_enable: true
@@ -42,6 +27,20 @@ mybatis-flex:
       url: jdbc:postgresql://110.41.34.83:5432/taais?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true
       username: postgres
       password: P3x0LG8jzyHRX59l
+      # 最大连接池数量
+      maximum-pool-size: 2
+      # 最小空闲线程数量
+      minimum-idle: 2
+      # 配置获取连接等待超时的时间
+      connectionTimeout: 30000
+      # 校验超时时间
+      validationTimeout: 5000
+      # 空闲连接存活最大时间，默认10分钟
+      idleTimeout: 60000
+      # 此属性控制池中连接的最长生命周期，值0表示无限生命周期，默认30分钟
+      maxLifetime: 60000
+      # 多久检查一次连接的活性
+      keepaliveTime: 30000
 
 #    # 数据源-2
 #    ds2:

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

@@ -1,6 +1,7 @@
 package com.taais.biz.controller;
 
 
+import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -8,6 +9,7 @@ import java.util.Base64;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Stream;
 
 import com.mybatisflex.core.query.QueryWrapper;
 import com.taais.biz.domain.DataAugmentation;
@@ -61,6 +63,15 @@ public class DataAugmentationController extends BaseController {
     }
 
 
+    private static Path getImageAtPathIdx(Path inputPath, int idx) throws IOException {
+        try (Stream<Path> paths = Files.list(inputPath)) {
+            return paths.filter(Files::isRegularFile)
+                .sorted()
+                .skip(idx)
+                .findFirst()
+                .orElseThrow(() -> new IllegalArgumentException("Index " + idx + " is out of bounds for the list of files in " + inputPath));
+        }
+    }
 
     @GetMapping("/compare/{task_id}/{idx}")
     public ResponseEntity<Map<String, String>> getCompareImages(@PathVariable("task_id") Long taskId, @PathVariable("idx") int idx) {
@@ -78,12 +89,18 @@ public class DataAugmentationController extends BaseController {
                 inputPath = Paths.get(dataAugmentation.getInputPath());
                 outputPath = Paths.get(dataAugmentation.getOutputPath());
             }
+//            inputPath = Paths.get(dataAugmentation.getInputPath());
+//            outputPath = Paths.get(dataAugmentation.getOutputPath());
             System.out.println("inputPath: " + inputPath.toString());
             System.out.println("outputPath: " + outputPath.toString());
+            Path imagePath = getImageAtPathIdx(inputPath, idx);
+            String fileName = imagePath.getFileName().toString();
+            Path resolve = outputPath.resolve(fileName);
+
 
+            byte[] image1 = Files.readAllBytes(imagePath);
+            byte[] image2 = Files.readAllBytes(resolve);
 
-            byte[] image1 = Files.readAllBytes(inputPath.resolve(String.format("%05d", idx) + ".jpg"));
-            byte[] image2 = Files.readAllBytes(outputPath.resolve(String.format("%05d", idx) + ".jpg"));
 
             // 将图片编码成Base64字符串
             String base64Image1 = Base64.getEncoder().encodeToString(image1);

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

@@ -6,10 +6,7 @@ import com.taais.biz.domain.bo.AlgorithmModelBo;
 import com.taais.biz.domain.bo.TargetIdentificationSubtaskDetailsBo;
 import com.taais.biz.domain.bo.VideoStableStartResultBo;
 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.IVideoStableService;
+import com.taais.biz.service.*;
 import com.taais.biz.service.impl.AlgorithmModelServiceImpl;
 import com.taais.biz.service.impl.TargetIdentificationSubtaskDetailsServiceImpl;
 import com.taais.common.core.core.domain.CommonResult;
@@ -41,6 +38,9 @@ public class PublicController extends BaseController {
     @Resource
     private IVideoStableService videoStableService;
 
+    @Resource
+    private IDataAugmentationService dataAugmentationService;
+
     @Resource
     IAlgorithmDataProcessService dataProcessService;
     @Resource
@@ -125,4 +125,8 @@ public class PublicController extends BaseController {
     public CommonResult getResult(@Valid @RequestBody VideoStableStartResultBo videoStableStartResultBo) {
         return videoStableService.getResult(videoStableStartResultBo);
     }
+    @PostMapping("/dataAugmentation/get_result")
+    public CommonResult Result(@Valid @RequestBody VideoStableStartResultBo dataAugmentationStartResultBo) {
+        return dataAugmentationService.getResult(dataAugmentationStartResultBo);
+    }
 }

taais-modules/taais-biz/src/main/java/com/taais/biz/service/IDataAugmentationService.java

@@ -9,7 +9,11 @@ import com.taais.common.core.core.domain.CommonResult;
 import com.taais.common.core.core.page.PageResult;
 import com.taais.common.orm.core.service.IBaseService;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.List;
+import java.util.stream.Stream;
 
 /**
  * 数据增强Service接口
@@ -73,4 +77,5 @@ public interface IDataAugmentationService extends IBaseService<DataAugmentation>
     Object getCompareNum(Long taskId);
 
     CommonResult stop(Long id);
+
 }

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

@@ -239,15 +239,15 @@ public class DataAugmentationServiceImpl extends BaseServiceImpl<DataAugmentatio
         makeDir(outputPath.toString());
         makeDir(localPath.toString());
         //本地测试代码
-//        String inputPath = "D:\\program\\taais\\duijie\\code\\" + fileName_without_suffix + "_images";
-//        String outputPath = "D:\\program\\taais\\duijie\\code\\" + fileName_without_suffix + "_output";
-//        String logPath = "D:\\program\\taais\\duijie\\code\\" + fileName_without_suffix + "_log";
-        makeDir(inputPath.toString());
-        makeDir(outputPath.toString());
-        makeDir(logPath.toString());
+//        String inputPath = "D:\\program\\taais\\duijie\\code-niguang\\" + fileName_without_suffix + "_images";
+//        String outputPath = "D:\\program\\taais\\duijie\\code-niguang\\" + fileName_without_suffix + "_output";
+//        String logPath = "D:\\program\\taais\\duijie\\code-niguang\\" + fileName_without_suffix + "_log";
+//        makeDir(inputPath.toString());
+//        makeDir(outputPath.toString());
+//        makeDir(logPath.toString());
         int lastUnderscoreIndex = fileName_without_suffix.lastIndexOf('_');
         ZipUtils.unzip(resourcePath, inputPath.toString());
-//        String inputPath = "D:\\program\\taais\\duijie\\code\\" + fileName_without_suffix + "_images\\" + fileName_without_suffix.substring(0, lastUnderscoreIndex);
+//        String inputPathString = "D:\\program\\taais\\duijie\\code-niguang\\" + fileName_without_suffix + "_images\\" + fileName_without_suffix.substring(0, lastUnderscoreIndex);
         String inputPathString = inputPath.toString() + fileName_without_suffix.substring(0, lastUnderscoreIndex);
         dataAugmentation.setLog(logPath.toString());
         dataAugmentation.setInputPath(inputPathString);
@@ -344,7 +344,8 @@ public class DataAugmentationServiceImpl extends BaseServiceImpl<DataAugmentatio
             inputPath = Paths.get(dataAugmentation.getInputPath());
             outputPath = Paths.get(dataAugmentation.getOutputPath());
         }
-
+//        inputPath = Paths.get(dataAugmentation.getInputPath());
+//        outputPath = Paths.get(dataAugmentation.getOutputPath());
         // 创建File对象
         File in_directory = new File(inputPath.toString());
         File out_directory = new File(outputPath.toString());