TASK:workspace、design模块代码;

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

@@ -28,7 +28,7 @@ public class DesignController {
 
     @ApiOperation(value = "设计 Conllection")
     @PostMapping("/designCollection")
-    public Response<JSONObject> designCollection(@Valid @RequestBody DesignCollectionDTO designDTO) {
+    public Response<DesignCollectionVO> designCollection(@Valid @RequestBody DesignCollectionDTO designDTO) {
         return Response.success(designService.designCollection(designDTO));
     }
 

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

@@ -4,6 +4,7 @@ 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.common.utils.MinioUtil;
 import com.ai.da.mapper.entity.Account;
 import com.ai.da.mapper.entity.UserLikeGroup;
 import com.ai.da.mapper.entity.Workspace;
@@ -30,10 +31,12 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.Date;
 import java.util.List;
@@ -56,6 +59,21 @@ public class WorkspaceController {
 	@Resource
 	private WorkspaceService workspaceService;
 
+	@Resource
+	private MinioUtil minIoUtil;
+	@Value("${minio.endpoint}")
+	private static String address;
+	@Value("${minio.bucketName}")
+	private static String bucketName;
+
+	@PostMapping("/upload")
+	public Object upload(MultipartFile file) {
+
+		List<String> upload = minIoUtil.upload(new MultipartFile[]{file});
+
+		return address+"/"+bucketName+"/"+upload.get(0);
+	}
+
 	/**
 	 * 详情
 	 */
@@ -63,19 +81,19 @@ public class WorkspaceController {
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "详情", notes = "传入workspace")
 	public Response<Workspace> detail(@ApiParam(value = "主键集合", required = true) @RequestParam Long id) {
-		Workspace detail = workspaceService.getById(id);
+		Workspace detail = workspaceService.getByIdNew(id);
 		return Response.success(detail);
 	}
 
 	/**
 	 * 分页
 	 */
-	@GetMapping("/list")
+	@PostMapping("/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));
+	public Response<WorkspaceVO> list(@Valid @RequestBody WorkspaceDTO query) {
+		WorkspaceVO response = workspaceService.getPage(query);
+		return Response.success(response);
 	}
 
 	/**