Merge branch 'dev/dev_xp' into dev/dev

src/main/java/com/ai/da/controller/ElementController.java

@@ -114,7 +114,8 @@ public class ElementController {
     public Response<List<CollectionElementVO>> selectedImageSeg(
             @RequestPart(value = "file", required = false) MultipartFile[] file,
             @RequestParam(value = "type", required = false) @Pattern(regexp = "sketch|product", message = "类型必须是sketch或product") String type,
-            @RequestParam(value = "id", required = false) Long id) {
+            @RequestParam(value = "id", required = false) Long id,
+            @RequestParam(value = "sourceType", required = false) @Pattern(regexp = "library|upload", message = "id是从library中获取的还是上传的") String sourceType) {
         // 过滤空文件
         List<MultipartFile> nonEmptyFiles = Arrays.stream(file)
                 .filter(item -> !item.isEmpty())
@@ -127,7 +128,7 @@ public class ElementController {
             throw new BusinessException("不能同时提供文件上传和ID");
         }
 
-        return Response.success(collectionElementService.selectedImageSeg(nonEmptyFiles, id, type));
+        return Response.success(collectionElementService.selectedImageSeg(nonEmptyFiles, id, type, sourceType));
     }
 
 }