From f4051135527852fedb2f480ca9e938bf7320f12f Mon Sep 17 00:00:00 2001
From: chenchuchuan <13554600537@163.com>
Date: Tue, 7 Jul 2026 15:55:04 +0800
Subject: [PATCH] =?UTF-8?q?fix(controller):=20=E4=BF=AE=E6=AD=A3=E5=9C=A8?=
 =?UTF-8?q?=E7=BA=BF=E9=A1=B5=E9=9D=A2=E6=8E=A7=E5=88=B6=E5=99=A8=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改OnlinePageController的add方法返回类型从Long改为OnlinePage
- 移除不必要的masterTableId变量声明
- 修复TenantOnlinePageController继承类的返回类型一致性
- 添加OnlinePage模型导入到TenantOnlinePageController
- 统一两个控制器的返回值结构为完整的OnlinePage对象
---
 .../apelet/common/online/controller/OnlinePageController.java     | 8 +++-----
 .../tenant/online/controller/TenantOnlinePageController.java      | 3 ++-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/common/common-online/src/main/java/apelet/common/online/controller/OnlinePageController.java b/common/common-online/src/main/java/apelet/common/online/controller/OnlinePageController.java
index 0fd5efa..ea304d8 100644
--- a/common/common-online/src/main/java/apelet/common/online/controller/OnlinePageController.java
+++ b/common/common-online/src/main/java/apelet/common/online/controller/OnlinePageController.java
@@ -85,7 +85,7 @@ public class OnlinePageController {
     @OperationLog(type = SysOperationLogType.ADD)
     @Transactional(rollbackFor = Exception.class)
     @PostMapping("/add")
-    public ResponseResult<Long> add(@MyRequestBody OnlinePageDto onlinePageDto) {
+    public ResponseResult<OnlinePage> add(@MyRequestBody OnlinePageDto onlinePageDto) {
         String errorMessage = MyCommonUtil.getModelValidationError(onlinePageDto);
         if (errorMessage != null) {
             return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@@ -115,7 +115,6 @@ public class OnlinePageController {
             return ResponseResult.error(ErrorCodeEnum.DUPLICATED_UNIQUE_KEY, errorMessage);
         }
 
-        Long masterTableId;
         OnlFormHead onlFormHead;
 
         if ("new".equals(metaSource)) {
@@ -125,7 +124,7 @@ public class OnlinePageController {
             String tableTxt = onlinePageDto.getPageName();
 
             onlFormHead = iOnlFormHeadService.createMetaAndSync(tableName, tableTxt, metaType, null);
-            masterTableId = onlFormHead.getId();
+            Long masterTableId = onlFormHead.getId();
             onlinePage.setMasterTableId(String.valueOf(masterTableId));
             onlinePage.setMasterTableName(onlFormHead.getTableName());
 
@@ -138,7 +137,6 @@ public class OnlinePageController {
             // === Existing branch: use existing metadata ===
             String formMetadata = onlinePageDto.getMasterTableId();
             onlFormHead = iOnlFormHeadService.getById(formMetadata);
-            masterTableId = Long.valueOf(formMetadata);
         }
 
         try {
@@ -179,7 +177,7 @@ public class OnlinePageController {
          */
         addOnlineDatasourceRelation(onlFormHead, onlineDatasource, errorMessage, onlineDblink);
 
-        return ResponseResult.success(onlinePage.getPageId());
+        return ResponseResult.success(onlinePage);
     }
 
 
diff --git a/common/common-tenant-online/src/main/java/apelet/common/tenant/online/controller/TenantOnlinePageController.java b/common/common-tenant-online/src/main/java/apelet/common/tenant/online/controller/TenantOnlinePageController.java
index dfce3fb..d6021f7 100644
--- a/common/common-tenant-online/src/main/java/apelet/common/tenant/online/controller/TenantOnlinePageController.java
+++ b/common/common-tenant-online/src/main/java/apelet/common/tenant/online/controller/TenantOnlinePageController.java
@@ -8,6 +8,7 @@ import apelet.common.online.controller.OnlinePageController;
 import apelet.common.online.dto.OnlineDatasourceDto;
 import apelet.common.online.dto.OnlinePageDatasourceDto;
 import apelet.common.online.dto.OnlinePageDto;
+import apelet.common.online.model.OnlinePage;
 import apelet.common.online.vo.OnlineDatasourceVo;
 import apelet.common.online.vo.OnlinePageDatasourceVo;
 import apelet.common.online.vo.OnlinePageVo;
@@ -43,7 +44,7 @@ public class TenantOnlinePageController extends OnlinePageController {
     @OperationLog(type = SysOperationLogType.ADD)
     @PostMapping("/add")
     @Override
-    public ResponseResult<Long> add(@MyRequestBody OnlinePageDto onlinePageDto) {
+    public ResponseResult<OnlinePage> add(@MyRequestBody OnlinePageDto onlinePageDto) {
         return super.add(onlinePageDto);
     }