BUGFIX: detail中的default模式报错

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

@@ -149,7 +149,7 @@ public class GenerateController {
 
     @Operation(summary = "获取pose transfer的所有pose")
     @GetMapping("/getAllPose")
-    public Response<List<Map<String, Object>>> getAllPose(){
+    public Response<List<Map<String, String>>> getAllPose(){
         return Response.success(generateService.getAllPose());
     }
 

src/main/java/com/ai/da/python/PythonService.java

@@ -2851,10 +2851,17 @@ public class PythonService {
                 gradientString = JSONObject.toJSONString(designSingleItem.getGradient());
             }
 
+            PrintToPython printToPython;
+            if (designSingleIncludeLayersDTO.getDesignType().equals("default")){
+                printToPython = resolveDesignSinglePrint(designSingleItem.getPrintObject().getPrints(),
+                        designSingleItem.getPartialDesign().getPartialDesignMinioPath());
+            } else {
+                printToPython = null;
+            }
             /*PrintToPython printToPython = resolveDesignSinglePrint(designSingleItem.getPrintObject().getPrints(),
-                    designSingleItem.getPartialDesign().getPartialDesignMinioPath());
+                    designSingleItem.getPartialDesign().getPartialDesignMinioPath());*/
-            resolveDesignElement(designSingleItem.getTrims(), printToPython);
+//            resolveDesignElement(designSingleItem.getTrims(), printToPython);
-            log.info("组装参数【服装：{}的maskUrl: {}】",designSingleItem.getType(), designSingleItem.getMaskUrl());*/
+            log.info("组装参数【服装：{}的maskUrl: {}】",designSingleItem.getType(), designSingleItem.getMaskUrl());
 
             String partialDesign = designSingleItem.getPartialDesign().getPartialDesignMinioPath();
             String mergeImagePath = !StringUtil.isNullOrEmpty(partialDesign)
@@ -2863,7 +2870,7 @@ public class PythonService {
                     designSingleItem.getType(),
                     designSingleItem.getPath(),
                     designSingleItem.getColor(),
-                    null,
+                    printToPython,
                     // businessId designItemDetailId （python端确认没有作用,但是数据库需要存，作用：未知）
 //                    designSingleItem.getId(),
                     businessId,
@@ -2897,9 +2904,9 @@ public class PythonService {
 
     private PrintToPython resolveDesignSinglePrint(List<DesignSinglePrint> printObject, String partialDesign) {
         PrintToPython printToPython = new PrintToPython();
-        DesignPythonItemPrint printSingle = new DesignPythonItemPrint();
+//        DesignPythonItemPrint printSingle = new DesignPythonItemPrint();
         DesignPythonItemPrint printOverall = new DesignPythonItemPrint();
-        printToPython.setSingle(printSingle);
+//        printToPython.setSingle(printSingle);
         printToPython.setOverall(printOverall);
         printToPython.setPartial(StringUtil.isNullOrEmpty(partialDesign) ? null : partialDesign);
         if (Objects.isNull(printObject) || printObject.isEmpty()){
@@ -2946,14 +2953,14 @@ public class PythonService {
             }
 //            log.info("本次print打点locations###{}###fileVO{}", p.getLocation(), JSON.toJSONString(fileVO));
         });
-        locationS.removeAll(Collections.singleton(null));
+        /*locationS.removeAll(Collections.singleton(null));
         scaleS.removeAll(Collections.singleton(null));
         angleS.removeAll(Collections.singleton(null));
         pathsS.removeAll(Collections.singleton(null));
         printSingle.setLocation(locationS);
         printSingle.setPrint_scale_list(scaleS);
         printSingle.setPrint_angle_list(angleS);
-        printSingle.setPrint_path_list(pathsS);
+        printSingle.setPrint_path_list(pathsS);*/
 
         locationO.removeAll(Collections.singleton(null));
         scaleO.removeAll(Collections.singleton(null));

src/main/java/com/ai/da/service/GenerateService.java

@@ -73,7 +73,7 @@ public interface GenerateService extends IService<Generate> {
 
     SketchReconstructionVO getSketchReconstruction(Long projectId);
 
-    List<Map<String, Object>> getAllPose();
+    List<Map<String, String>> getAllPose();
 
     void processPoseTransformResultBatch(String taskId, String gifUrl, String videoUrl, String imageUrl, String progress);
 

src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java

@@ -3090,19 +3090,14 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
         return vo;
     }
 
-    public List<Map<String, Object>> getAllPose() {
+    public List<Map<String, String>> getAllPose() {
         List<Map<String, String>> propertyList = PoseEnum.getPropertyList();
-        List<Map<String, Object>> resp = new ArrayList<>();
         propertyList.forEach(item -> {
-            HashMap<String, Object> temp = new HashMap<>();
-
 //            item.put("gif", minioUtil.getPreSignedUrl(item.get("gif"), CommonConstant.MINIO_IMAGE_EXPIRE_TIME));
-            temp.put("id", Integer.parseInt(item.get("id")));
+            item.put("video", minioUtil.getPreSignedUrl(item.get("video"), CommonConstant.MINIO_IMAGE_EXPIRE_TIME));
-            temp.put("video", minioUtil.getPreSignedUrl(item.get("video"), CommonConstant.MINIO_IMAGE_EXPIRE_TIME));
+            item.put("firstFrame", minioUtil.getPreSignedUrl(item.get("firstFrame"), CommonConstant.MINIO_IMAGE_EXPIRE_TIME));
-            temp.put("firstFrame", minioUtil.getPreSignedUrl(item.get("firstFrame"), CommonConstant.MINIO_IMAGE_EXPIRE_TIME));
-            resp.add(temp);
         });
-        return resp;
+        return propertyList;
     }
 
     @Override