From e6f990b7663045e197924cbc87e65abd924a2296 Mon Sep 17 00:00:00 2001
From: shahaibo <1023316923@qq.com>
Date: Mon, 31 Mar 2025 15:02:44 +0800
Subject: [PATCH] =?UTF-8?q?TASK:=E6=A8=A1=E5=9D=97=E5=8C=96=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ai/da/controller/ProjectController.java   |   7 ++
 .../ai/da/service/UserLikeGroupService.java   |   2 +
 .../impl/UserLikeGroupServiceImpl.java        | 108 +++++++++++++-----
 3 files changed, 87 insertions(+), 30 deletions(-)

diff --git a/src/main/java/com/ai/da/controller/ProjectController.java b/src/main/java/com/ai/da/controller/ProjectController.java
index 5d64aa8d..23924622 100644
--- a/src/main/java/com/ai/da/controller/ProjectController.java
+++ b/src/main/java/com/ai/da/controller/ProjectController.java
@@ -124,4 +124,11 @@ public class ProjectController {
     public void downloadZip(@RequestParam(value = "threeDSimpleId") Long threeDSimpleId, @RequestParam(value = "sizeType") String sizeType, @RequestParam(value = "size") String size, HttpServletResponse response) throws MinioException, IOException {
         userLikeGroupService.downloadZip(threeDSimpleId, sizeType, size, response);
     }
+
+    @PostMapping("/delete")
+    @ApiOperationSupport(order = 12)
+    @ApiOperation(value = "删除", notes = "传入project")
+    public Response<Boolean> delete(@RequestParam("projectId") Long projectId) {
+        return Response.success(userLikeGroupService.delete(projectId));
+    }
 }
diff --git a/src/main/java/com/ai/da/service/UserLikeGroupService.java b/src/main/java/com/ai/da/service/UserLikeGroupService.java
index 7dbdecd7..9048d7ca 100644
--- a/src/main/java/com/ai/da/service/UserLikeGroupService.java
+++ b/src/main/java/com/ai/da/service/UserLikeGroupService.java
@@ -103,4 +103,6 @@ public interface UserLikeGroupService extends IService<UserLikeGroup> {
     void getThreeDGlb(Long threeDSimpleId, HttpServletResponse response) throws MinioException, IOException;
 
     void downloadZip(Long threeDSimpleId, String sizeType, String size, HttpServletResponse response) throws MinioException, IOException;
+
+    Boolean delete(Long projectId);
 }
diff --git a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
index 86409864..c4f1d22b 100644
--- a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
@@ -678,41 +678,83 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
                 InputStream download = minioUtil.download(exportFiles.get(0).getUrl());
                 String convert = convert(download);
                 JSONObject jsonObject = JSONObject.parseObject(convert);
-                JSONArray objectJSONArrayLevel1 = jsonObject.getJSONArray("objects");
-                for (int i = 0; i < objectJSONArrayLevel1.size(); i++) {
-                    JSONObject jsonObjectLevel1 = objectJSONArrayLevel1.getJSONObject(i);
-                    String type = jsonObjectLevel1.getString("type");
-                    if (type.equals("image")) {
-                        String minioUrl = jsonObjectLevel1.getString("minioUrl");
-                        jsonObjectLevel1.put("src", minioUtil.getPreSignedUrl(minioUrl, 24 * 60));
-                    }
-                    if (type.equals("group")) {
-                        JSONArray objectJSONArrayLevel2 = jsonObjectLevel1.getJSONArray("objects");
-                        for (int j = 0; j < objectJSONArrayLevel2.size(); j++) {
-                            JSONObject jsonObjectLevel2 = objectJSONArrayLevel2.getJSONObject(j);
-                            String typeGroup = jsonObjectLevel2.getString("type");
-                            if (typeGroup.equals("image")) {
-                                String minioUrl = jsonObjectLevel2.getString("minioUrl");
-                                jsonObjectLevel2.put("src", minioUtil.getPreSignedUrl(minioUrl, 24 * 60));
-                            }
-                            objectJSONArrayLevel2.set(j, jsonObjectLevel2);
-                        }
-                        jsonObjectLevel1.put("objects", objectJSONArrayLevel2);
-                    }
-                    if (type.equals("rect")) {
-                        JSONObject custom = jsonObjectLevel1.getJSONObject("custom");
-                        if (custom.getString("type").equals("init")) {
+
+                JSONObject canvas = jsonObject.getJSONObject("canvas");
+                if (Objects.nonNull(canvas)) {
+                    JSONArray objectJSONArrayLevel1 = canvas.getJSONArray("objects");
+                    for (int i = 0; i < objectJSONArrayLevel1.size(); i++) {
+                        JSONObject jsonObjectLevel1 = objectJSONArrayLevel1.getJSONObject(i);
+                        String type = jsonObjectLevel1.getString("type");
+                        if (type.equals("image")) {
                             String minioUrl = jsonObjectLevel1.getString("minioUrl");
-                            if (!StringUtils.isEmpty(minioUrl)) {
-                                JSONObject fill = jsonObjectLevel1.getJSONObject("fill");
-                                fill.put("source", minioUtil.getPreSignedUrl(minioUrl, 24 * 60));
-                                jsonObjectLevel1.put("fill", fill);
+                            jsonObjectLevel1.put("src", minioUtil.getPreSignedUrl(minioUrl, 24 * 60));
+                        }
+                        if (type.equals("group")) {
+                            JSONArray objectJSONArrayLevel2 = jsonObjectLevel1.getJSONArray("objects");
+                            for (int j = 0; j < objectJSONArrayLevel2.size(); j++) {
+                                JSONObject jsonObjectLevel2 = objectJSONArrayLevel2.getJSONObject(j);
+                                String typeGroup = jsonObjectLevel2.getString("type");
+                                if (typeGroup.equals("image")) {
+                                    String minioUrl = jsonObjectLevel2.getString("minioUrl");
+                                    jsonObjectLevel2.put("src", minioUtil.getPreSignedUrl(minioUrl, 24 * 60));
+                                }
+                                objectJSONArrayLevel2.set(j, jsonObjectLevel2);
+                            }
+                            jsonObjectLevel1.put("objects", objectJSONArrayLevel2);
+                        }
+                        if (type.equals("rect")) {
+                            JSONObject custom = jsonObjectLevel1.getJSONObject("custom");
+                            if (custom.getString("type").equals("init")) {
+                                String minioUrl = jsonObjectLevel1.getString("minioUrl");
+                                if (!StringUtils.isEmpty(minioUrl)) {
+                                    JSONObject fill = jsonObjectLevel1.getJSONObject("fill");
+                                    fill.put("source", minioUtil.getPreSignedUrl(minioUrl, 24 * 60));
+                                    jsonObjectLevel1.put("fill", fill);
+                                }
                             }
                         }
+                        objectJSONArrayLevel1.set(i, jsonObjectLevel1);
                     }
-                    objectJSONArrayLevel1.set(i, jsonObjectLevel1);
+                    canvas.put("objects", objectJSONArrayLevel1);
+                    jsonObject.put("canvas", canvas);
+                }else {
+                    JSONArray objectJSONArrayLevel1 = jsonObject.getJSONArray("objects");
+                    for (int i = 0; i < objectJSONArrayLevel1.size(); i++) {
+                        JSONObject jsonObjectLevel1 = objectJSONArrayLevel1.getJSONObject(i);
+                        String type = jsonObjectLevel1.getString("type");
+                        if (type.equals("image")) {
+                            String minioUrl = jsonObjectLevel1.getString("minioUrl");
+                            jsonObjectLevel1.put("src", minioUtil.getPreSignedUrl(minioUrl, 24 * 60));
+                        }
+                        if (type.equals("group")) {
+                            JSONArray objectJSONArrayLevel2 = jsonObjectLevel1.getJSONArray("objects");
+                            for (int j = 0; j < objectJSONArrayLevel2.size(); j++) {
+                                JSONObject jsonObjectLevel2 = objectJSONArrayLevel2.getJSONObject(j);
+                                String typeGroup = jsonObjectLevel2.getString("type");
+                                if (typeGroup.equals("image")) {
+                                    String minioUrl = jsonObjectLevel2.getString("minioUrl");
+                                    jsonObjectLevel2.put("src", minioUtil.getPreSignedUrl(minioUrl, 24 * 60));
+                                }
+                                objectJSONArrayLevel2.set(j, jsonObjectLevel2);
+                            }
+                            jsonObjectLevel1.put("objects", objectJSONArrayLevel2);
+                        }
+                        if (type.equals("rect")) {
+                            JSONObject custom = jsonObjectLevel1.getJSONObject("custom");
+                            if (custom.getString("type").equals("init")) {
+                                String minioUrl = jsonObjectLevel1.getString("minioUrl");
+                                if (!StringUtils.isEmpty(minioUrl)) {
+                                    JSONObject fill = jsonObjectLevel1.getJSONObject("fill");
+                                    fill.put("source", minioUtil.getPreSignedUrl(minioUrl, 24 * 60));
+                                    jsonObjectLevel1.put("fill", fill);
+                                }
+                            }
+                        }
+                        objectJSONArrayLevel1.set(i, jsonObjectLevel1);
+                    }
+                    jsonObject.put("objects", objectJSONArrayLevel1);
                 }
-                jsonObject.put("objects", objectJSONArrayLevel1);
+
                 System.out.println(jsonObject);
                 return jsonObject;
             }catch (Exception e){
@@ -2176,4 +2218,10 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
             throw new RuntimeException("Failed to download ZIP file", e);
         }
     }
+
+    @Override
+    public Boolean delete(Long projectId) {
+        projectMapper.deleteById(projectId);
+        return Boolean.TRUE;
+    }
 }