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

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

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

@@ -5,6 +5,7 @@ import com.ai.da.model.dto.*;
 import com.ai.da.model.vo.DesignCollectionVO;
 import com.ai.da.model.vo.DesignLikeVO;
 import com.ai.da.service.DesignService;
+import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -26,7 +27,7 @@ public class DesignController {
 
     @ApiOperation(value = "设计 Conllection")
     @PostMapping("/designCollection")
-    public Response<DesignCollectionVO> designCollection(@Valid @RequestBody DesignCollectionDTO designDTO) {
+    public Response<JSONObject> designCollection(@Valid @RequestBody DesignCollectionDTO designDTO) {
         return Response.success(designService.designCollection(designDTO));
     }
 

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

@@ -37,4 +37,5 @@ public class ThirdPartyController {
     public Response<Boolean> editUser( @RequestBody AccountEditDTO accountEditDTO) {
         return Response.success(accountService.editUser(accountEditDTO));
     }
+
 }

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

@@ -0,0 +1,111 @@
+package com.ai.da.controller;
+
+import com.ai.da.common.context.UserContext;
+import com.ai.da.common.response.PageBaseResponse;
+import com.ai.da.common.response.Response;
+import com.ai.da.common.utils.CopyUtil;
+import com.ai.da.mapper.entity.Account;
+import com.ai.da.mapper.entity.UserLikeGroup;
+import com.ai.da.mapper.entity.Workspace;
+import com.ai.da.model.dto.QueryHistoryPageDTO;
+import com.ai.da.model.dto.WorkspaceDTO;
+import com.ai.da.model.enums.BizJson;
+import com.ai.da.model.vo.AuthPrincipalVo;
+import com.ai.da.model.vo.UserLikeGroupVO;
+import com.ai.da.model.vo.UserLikeVO;
+import com.ai.da.model.vo.WorkspaceVO;
+import com.ai.da.service.WorkspaceService;
+import com.baomidou.mybatisplus.core.conditions.query.Query;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.base.Function;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+
+import org.springframework.util.Assert;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+/**
+ *  控制器
+ *
+ * @author SHAHAIBO
+ * @since 2023-08-01
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/api/workspace")
+@Api(value = "", tags = "接口")
+public class WorkspaceController {
+
+	@Resource
+	private WorkspaceService workspaceService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入workspace")
+	public Response<Workspace> detail(@ApiParam(value = "主键集合", required = true) @RequestParam Long id) {
+		Workspace detail = workspaceService.getById(id);
+		return Response.success(detail);
+	}
+
+	/**
+	 * 分页
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入workspace")
+	public Response<PageBaseResponse<Workspace>> list(@Valid @RequestBody WorkspaceDTO query) {
+		IPage<Workspace> convert = workspaceService.getPage(query);
+		return Response.success(PageBaseResponse.success(convert));
+	}
+
+	/**
+	 * 新增或编辑
+	 */
+	@PostMapping("/saveOrUpdate")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "新增或编辑", notes = "传入workspace")
+	public Response saveOrUpdate(@Valid @RequestBody Workspace workspace) {
+		return Response.success(workspaceService.saveOrUpdate(workspace));
+	}
+
+	
+	/**
+	 * 删除 
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "删除", notes = "传入id")
+	public Response remove(@ApiParam(value = "主键集合", required = true) @RequestParam Long id) {
+		return Response.success(workspaceService.removeById(id));
+	}
+
+	@GetMapping("/enumValues")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "获取枚举类值")
+	public Response<List<BizJson>> enumValues(@RequestParam("enumName") String enumName) {
+		List<BizJson> bizJsonList = workspaceService.getEnumValues(enumName);
+		return Response.success(bizJsonList);
+	}
+
+	
+}