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

---
 .../com/ai/da/controller/ProjectController.java   |  2 +-
 .../com/ai/da/model/vo/SaveOrUpdateProjectVO.java | 14 ++++++++++++++
 .../java/com/ai/da/service/WorkspaceService.java  |  3 ++-
 .../ai/da/service/impl/WorkspaceServiceImpl.java  | 15 ++++++++++++---
 4 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 src/main/java/com/ai/da/model/vo/SaveOrUpdateProjectVO.java

diff --git a/src/main/java/com/ai/da/controller/ProjectController.java b/src/main/java/com/ai/da/controller/ProjectController.java
index 63e49032..4f37082d 100644
--- a/src/main/java/com/ai/da/controller/ProjectController.java
+++ b/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));
     }
 
diff --git a/src/main/java/com/ai/da/model/vo/SaveOrUpdateProjectVO.java b/src/main/java/com/ai/da/model/vo/SaveOrUpdateProjectVO.java
new file mode 100644
index 00000000..fab23d13
--- /dev/null
+++ b/src/main/java/com/ai/da/model/vo/SaveOrUpdateProjectVO.java
@@ -0,0 +1,14 @@
+package com.ai.da.model.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class SaveOrUpdateProjectVO {
+    private Long id;
+    private WorkspaceVO workspaceVO;
+
+}
diff --git a/src/main/java/com/ai/da/service/WorkspaceService.java b/src/main/java/com/ai/da/service/WorkspaceService.java
index dd56859e..4058dac9 100644
--- a/src/main/java/com/ai/da/service/WorkspaceService.java
+++ b/src/main/java/com/ai/da/service/WorkspaceService.java
@@ -8,6 +8,7 @@ import com.ai.da.model.dto.WorkspaceDTO;
 import com.ai.da.model.dto.WorkspaceSaveDTO;
 import com.ai.da.model.enums.BizJson;
 import com.ai.da.model.vo.ModelsVO;
+import com.ai.da.model.vo.SaveOrUpdateProjectVO;
 import com.ai.da.model.vo.StyleVO;
 import com.ai.da.model.vo.WorkspaceVO;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -59,7 +60,7 @@ public interface WorkspaceService extends IService<Workspace> {
     List<StyleVO> styleList();
 
     @Transactional
-    Long saveOrUpdateProject(ProjectDTO projectDTO);
+    SaveOrUpdateProjectVO saveOrUpdateProject(ProjectDTO projectDTO);
 
     Long getByProjectId(Long projectId);
 }
diff --git a/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java b/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java
index b3a25eb6..d690b09f 100644
--- a/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java
@@ -76,6 +76,8 @@ public class WorkspaceServiceImpl extends ServiceImpl<WorkspaceMapper, Workspace
 
     @Resource
     private SysFileService sysFileService;
+    @Resource
+    private WorkspaceService workspaceService;
 
 
     @Override
@@ -647,7 +649,8 @@ public class WorkspaceServiceImpl extends ServiceImpl<WorkspaceMapper, Workspace
 
     @Override
     @Transactional
-    public Long saveOrUpdateProject(ProjectDTO projectDTO) {
+    public SaveOrUpdateProjectVO saveOrUpdateProject(ProjectDTO projectDTO) {
+        SaveOrUpdateProjectVO vo = new SaveOrUpdateProjectVO();
         AuthPrincipalVo userInfo = UserContext.getUserHolder();
         if (projectDTO.getId() != null) {
             Long projectId = projectDTO.getId();
@@ -695,7 +698,10 @@ public class WorkspaceServiceImpl extends ServiceImpl<WorkspaceMapper, Workspace
                     workspaceRelStyleMapper.deleteBatchIds(workspaceRelStyles);
                 }
             }
-            return projectId;
+            WorkspaceVO byIdForProject = workspaceService.getByIdForProject(projectId);
+            vo.setId(projectId);
+            vo.setWorkspaceVO(byIdForProject);
+            return vo;
         }else {
             Project project = CopyUtil.copyObject(projectDTO, Project.class);
             project.setAccountId(userInfo.getId());
@@ -731,7 +737,10 @@ public class WorkspaceServiceImpl extends ServiceImpl<WorkspaceMapper, Workspace
                 rel.setStyleId(projectDTO.getStyleId());
                 workspaceRelStyleMapper.insert(rel);
             }
-            return project.getId();
+            WorkspaceVO byIdForProject = workspaceService.getByIdForProject(project.getId());
+            vo.setId(project.getId());
+            vo.setWorkspaceVO(byIdForProject);
+            return vo;
         }
     }