Kaynağa Gözat

feat: 可拓展修改

28968 7 ay önce
ebeveyn
işleme
ef62a0b664

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

@@ -123,7 +123,8 @@ public class DataAugmentationController extends BaseController {
 
             String taskType = dataAugmentation.getTaskType();
             //图像拼接算法、目标毁伤评估有多张输入图片,则imagePath是个目录
-            if ("侦察图像拼接算法_sift".equals(taskType) || "侦察图像拼接算法_coordinate".equals(taskType) || "目标毁伤评估".equals(taskType)) {
+            if (Files.isDirectory(imagePath)) {
+//            if ("侦察图像拼接算法_sift".equals(taskType) || "侦察图像拼接算法_coordinate".equals(taskType) || "目标毁伤评估".equals(taskType)) {
                 String lastDirectoryName = imagePath.getFileName().toString();
                 inputPath = imagePath;
                 outputPath = outputPath.resolve(lastDirectoryName);  //得到算法输出的结果目录
@@ -158,8 +159,8 @@ public class DataAugmentationController extends BaseController {
                         outputFileList.sort(Comparator.comparingInt(DataAugmentationController::extractNumber));
                     }
                 } else {
-                    System.out.println("图像拼接算法任务:" + dataAugmentation.getId() + "未创建结果目录!");
-                    origin.add("图像拼接算法任务:" + dataAugmentation.getId() + "未创建结果目录!");
+                    System.out.println(taskType + "任务:" + dataAugmentation.getId() + "未创建结果目录!");
+                    origin.add(taskType + "任务:" + dataAugmentation.getId() + "未创建结果目录!");
                     images.put("error", origin);
                     return ResponseEntity.status(500).body(images);
                 }
@@ -284,11 +285,7 @@ public class DataAugmentationController extends BaseController {
     @RepeatSubmit()
     @PostMapping
     public CommonResult<Void> add(@Validated @RequestBody DataAugmentationBo dataAugmentationBo) {
-//        QueryWrapper queryWrapper = new QueryWrapper();
-//        queryWrapper.eq("file_name", dataAugmentationBo.getUploadPath());
-//        List<SysOss> list = ossService.list(queryWrapper);
-//        SysOss oneByEntityId = list.get(0);
-//        dataAugmentationBo.setInputOssId(oneByEntityId.getOssId());
+
         boolean inserted = dataAugmentationService.insert(dataAugmentationBo);
         if (!inserted) {
             return CommonResult.fail("新增数据增强记录失败!");