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 add(@MyRequestBody OnlinePageDto onlinePageDto) { + public ResponseResult 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 add(@MyRequestBody OnlinePageDto onlinePageDto) { + public ResponseResult add(@MyRequestBody OnlinePageDto onlinePageDto) { return super.add(onlinePageDto); }