Merge remote-tracking branch 'origin/dev/dev' into dev/dev

# Conflicts:
#	src/main/java/com/ai/da/python/PythonService.java

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

@@ -38,7 +38,7 @@ public class ProjectController {
     @PostMapping("/saveOrUpdate")
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "新增或编辑", notes = "传入project")
-    public Response<Long> saveOrUpdateProject(@Valid @RequestBody ProjectDTO projectDTO) {
+    public Response<SaveOrUpdateProjectVO> saveOrUpdateProject(@Valid @RequestBody ProjectDTO projectDTO) {
         return Response.success(workspaceService.saveOrUpdateProject(projectDTO));
     }
 
@@ -87,7 +87,7 @@ public class ProjectController {
     @PostMapping("/getMannequinDetail")
     @ApiOperationSupport(order = 7)
     @ApiOperation(value = "获取模特详情", notes = "传入mannequinId")
-    public Response<LibraryModelPoint> getMannequinDetail(@Valid @RequestBody MannequinDTO mannequinDTO) {
+    public Response<QueryLibraryPageVO> getMannequinDetail(@Valid @RequestBody MannequinDTO mannequinDTO) {
         return Response.success(userLikeGroupService.getMannequinDetail(mannequinDTO));
     }
 }

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

@@ -28,6 +28,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
+import java.io.IOException;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -192,8 +193,8 @@ public class SavedCollectionController {
 
     @ApiOperation(value = "toProductImageElementUpload")
     @PostMapping("/toProductImageElementUpload")
-    public Response<ToProductElementVO> toProductImageElementUpload(@RequestParam("file") MultipartFile file, @RequestParam(value = "userlikeGroupId") Long userLikeGroupId) {
-        return Response.success(userLikeGroupService.toProductImageElementUpload(file, userLikeGroupId));
+    public Response<ToProductElementVO> toProductImageElementUpload(@RequestParam("file") MultipartFile file, @RequestParam(value = "projectId") Long projectId) {
+        return Response.success(userLikeGroupService.toProductImageElementUpload(file, projectId));
     }
 
     @ApiOperation(value = "productImageLike")
@@ -257,4 +258,22 @@ public class SavedCollectionController {
     public Response<Boolean> productImageUpload(@Valid @RequestBody ProductImageInitializeDTO productImageInitializeDTO) {
         return Response.success(userLikeGroupService.productImageInitialize(productImageInitializeDTO));
     }
+
+    @ApiOperation(value = "brandDNASaveOrUpdate")
+    @PostMapping("/brandDNASaveOrUpdate")
+    public Response<Boolean> brandDNASaveOrUpdate(@Valid @RequestBody BrandDNADTO brandDNADTO) {
+        return Response.success(userLikeGroupService.brandDNASaveOrUpdate(brandDNADTO));
+    }
+
+    @ApiOperation(value = "brandLogoUpload")
+    @PostMapping("/brandLogoUpload")
+    public Response<String> brandDNASaveOrUpdate(@RequestParam("file") MultipartFile file) {
+        return Response.success(userLikeGroupService.brandLogoUpload(file));
+    }
+
+    @ApiOperation(value = "brandDNAUpload")
+    @PostMapping("/brandDNAUpload")
+    public Response<String> brandDNAUpload(@RequestParam("file") MultipartFile file, @RequestParam("brandId") Long brandId) throws IOException {
+        return Response.success(userLikeGroupService.brandDNAUpload(file, brandId));
+    }
 }