TASK:AiDA模块化
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user