同步平台业务模块能力

qiming-backend/app-platform-modules/app-platform-compose/app-platform-compose-domain/src/main/java/com/xspaceagi/compose/domain/model/CustomDorisDataRequest.java

@@ -10,9 +10,9 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 
 /**
- * 查询doris表数据
+ * 查询表数据
  */
-@Schema(description = "查询doris表数据")
+@Schema(description = "查询表数据")
 @Getter
 @Setter
 @NoArgsConstructor

qiming-backend/app-platform-modules/app-platform-compose/app-platform-compose-sdk/src/main/java/com/xspaceagi/compose/sdk/vo/define/CreateTableDefineVo.java

@@ -1,19 +1,18 @@
 package com.xspaceagi.compose.sdk.vo.define;
 
-import java.util.List;
-
 import com.fasterxml.jackson.annotation.JsonPropertyDescription;
-
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
+
+import java.util.List;
 
 @Schema(description = "表结构定义,新增数据表")
 @Getter
 @Setter
 @Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class CreateTableDefineVo {
 
 //    /**

qiming-backend/app-platform-modules/app-platform-compose/app-platform-compose-sdk/src/main/java/com/xspaceagi/compose/sdk/vo/define/TableDefineVo.java

@@ -1,19 +1,18 @@
 package com.xspaceagi.compose.sdk.vo.define;
 
+import com.fasterxml.jackson.annotation.JsonPropertyDescription;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+
 import java.time.LocalDateTime;
 import java.util.List;
 
-import com.fasterxml.jackson.annotation.JsonPropertyDescription;
-
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.Setter;
-
 @Schema(description = "表结构定义")
 @Getter
 @Setter
 @Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class TableDefineVo {
 
     /**

qiming-backend/app-platform-modules/app-platform-compose/app-platform-compose-sdk/src/main/java/com/xspaceagi/compose/sdk/vo/define/TableFieldDefineVo.java

@@ -3,14 +3,14 @@ package com.xspaceagi.compose.sdk.vo.define;
 import com.fasterxml.jackson.annotation.JsonPropertyDescription;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 
 @Schema(description = "表字段定义")
 @Getter
 @Setter
 @Builder
+@AllArgsConstructor
+@NoArgsConstructor
 public class TableFieldDefineVo {
 
     /**

qiming-backend/app-platform-modules/app-platform-compose/app-platform-compose-ui/src/main/java/com/xspaceagi/compose/ui/controller/ComposeDbTableConfigController.java

@@ -6,6 +6,8 @@ import com.xspaceagi.compose.domain.model.CustomTableDefinitionModel;
 import com.xspaceagi.compose.domain.repository.ICustomTableDefinitionRepository;
 import com.xspaceagi.compose.ui.base.BaseController;
 import com.xspaceagi.compose.ui.dto.*;
+import com.xspaceagi.sandbox.SandboxUtils;
+import com.xspaceagi.system.application.service.SpaceApplicationService;
 import com.xspaceagi.system.application.util.DefaultIconUrlUtil;
 import com.xspaceagi.system.domain.log.LogPrint;
 import com.xspaceagi.system.infra.service.QueryVoListDelegateService;
@@ -26,6 +28,7 @@ import com.xspaceagi.system.spec.page.SuperPage;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.*;
 
@@ -43,24 +46,32 @@ public class ComposeDbTableConfigController extends BaseController {
     @Resource
     private QueryVoListDelegateService queryVoListDelegateService;
 
-
     @Resource
     private IUserDataPermissionRpcService userDataPermissionRpcService;
 
     @Resource
     private SpacePermissionService spacePermissionService;
 
+    @Resource
+    private SpaceApplicationService spaceApplicationService;
+
     @RequireResource(ResourceEnum.COMPONENT_LIB_CREATE)
     @OperationLogReporter(actionType = ActionType.ADD, action = "新增表定义", objectName = "表定义配置", systemCode = SystemEnum.DB_TABLE)
     @LogPrint(step = "表定义配置-新增表定义")
     @Operation(summary = "新增表定义")
     @PostMapping("/add")
-    public ReqResult<Long> addTableDefinition(@RequestBody CustomTableAddRequest request) {
+    public ReqResult<Long> addTableDefinition(@RequestBody CustomTableAddRequest addRequest, HttpServletRequest request) {
+        if (SandboxUtils.isSandboxRequest(request)) {
+            if (addRequest.getSpaceId() == null) {
+                Long personalSpaceId = spaceApplicationService.getPersonalSpaceId(RequestContext.get().getUserId());
+                addRequest.setSpaceId(personalSpaceId);
+            }
+        }
         UserContext userContext = this.getUser();
         UserDataPermissionDto userDataPermission = userDataPermissionRpcService.getUserDataPermission(userContext.getUserId());
         Long ct = customTableDefinitionApplicationService.countUserTotalTable(userContext.getUserId());
         userDataPermission.checkMaxDataTableCount(ct.intValue());
-        var model = CustomTableAddRequest.convert2Model(request);
+        var model = CustomTableAddRequest.convert2Model(addRequest);
 
         var data = customTableDefinitionApplicationService
                 .addInfo(model, userContext);
@@ -114,7 +125,16 @@ public class ComposeDbTableConfigController extends BaseController {
     @Operation(summary = "查询表定义列表")
     @RequestMapping(path = "/list", method = RequestMethod.POST)
     public ReqResult<IPage<CustomTableDefinitionModel>> list(
-            @RequestBody PageQueryVo<CustomTableQueryRequest> pageQueryVo) {
+            @RequestBody PageQueryVo<CustomTableQueryRequest> pageQueryVo, HttpServletRequest request) {
+        if (SandboxUtils.isSandboxRequest(request)) {
+            if (pageQueryVo.getQueryFilter() == null) {
+                pageQueryVo.setQueryFilter(new CustomTableQueryRequest());
+            }
+            if (pageQueryVo.getQueryFilter().getSpaceId() == null) {
+                Long personalSpaceId = spaceApplicationService.getPersonalSpaceId(RequestContext.get().getUserId());
+                pageQueryVo.getQueryFilter().setSpaceId(personalSpaceId);
+            }
+        }
         Assert.notNull(pageQueryVo, "pageQueryVo is null");
         Assert.notNull(pageQueryVo.getQueryFilter(), "queryFilter is null");
         Assert.notNull(pageQueryVo.getQueryFilter().getSpaceId(), "spaceId is null");