Browse Source

fix(controller): 修正在线页面控制器返回类型

- 修改OnlinePageController的add方法返回类型从Long改为OnlinePage
- 移除不必要的masterTableId变量声明
- 修复TenantOnlinePageController继承类的返回类型一致性
- 添加OnlinePage模型导入到TenantOnlinePageController
- 统一两个控制器的返回值结构为完整的OnlinePage对象
online-form-direct-creation
chenchuchuan 2 weeks ago
parent
commit
f405113552
  1. 8
      common/common-online/src/main/java/apelet/common/online/controller/OnlinePageController.java
  2. 3
      common/common-tenant-online/src/main/java/apelet/common/tenant/online/controller/TenantOnlinePageController.java

8
common/common-online/src/main/java/apelet/common/online/controller/OnlinePageController.java

@ -85,7 +85,7 @@ public class OnlinePageController {
@OperationLog(type = SysOperationLogType.ADD) @OperationLog(type = SysOperationLogType.ADD)
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@PostMapping("/add") @PostMapping("/add")
public ResponseResult<Long> add(@MyRequestBody OnlinePageDto onlinePageDto) { public ResponseResult<OnlinePage> add(@MyRequestBody OnlinePageDto onlinePageDto) {
String errorMessage = MyCommonUtil.getModelValidationError(onlinePageDto); String errorMessage = MyCommonUtil.getModelValidationError(onlinePageDto);
if (errorMessage != null) { if (errorMessage != null) {
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage); return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
@ -115,7 +115,6 @@ public class OnlinePageController {
return ResponseResult.error(ErrorCodeEnum.DUPLICATED_UNIQUE_KEY, errorMessage); return ResponseResult.error(ErrorCodeEnum.DUPLICATED_UNIQUE_KEY, errorMessage);
} }
Long masterTableId;
OnlFormHead onlFormHead; OnlFormHead onlFormHead;
if ("new".equals(metaSource)) { if ("new".equals(metaSource)) {
@ -125,7 +124,7 @@ public class OnlinePageController {
String tableTxt = onlinePageDto.getPageName(); String tableTxt = onlinePageDto.getPageName();
onlFormHead = iOnlFormHeadService.createMetaAndSync(tableName, tableTxt, metaType, null); onlFormHead = iOnlFormHeadService.createMetaAndSync(tableName, tableTxt, metaType, null);
masterTableId = onlFormHead.getId(); Long masterTableId = onlFormHead.getId();
onlinePage.setMasterTableId(String.valueOf(masterTableId)); onlinePage.setMasterTableId(String.valueOf(masterTableId));
onlinePage.setMasterTableName(onlFormHead.getTableName()); onlinePage.setMasterTableName(onlFormHead.getTableName());
@ -138,7 +137,6 @@ public class OnlinePageController {
// === Existing branch: use existing metadata === // === Existing branch: use existing metadata ===
String formMetadata = onlinePageDto.getMasterTableId(); String formMetadata = onlinePageDto.getMasterTableId();
onlFormHead = iOnlFormHeadService.getById(formMetadata); onlFormHead = iOnlFormHeadService.getById(formMetadata);
masterTableId = Long.valueOf(formMetadata);
} }
try { try {
@ -179,7 +177,7 @@ public class OnlinePageController {
*/ */
addOnlineDatasourceRelation(onlFormHead, onlineDatasource, errorMessage, onlineDblink); addOnlineDatasourceRelation(onlFormHead, onlineDatasource, errorMessage, onlineDblink);
return ResponseResult.success(onlinePage.getPageId()); return ResponseResult.success(onlinePage);
} }

3
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.OnlineDatasourceDto;
import apelet.common.online.dto.OnlinePageDatasourceDto; import apelet.common.online.dto.OnlinePageDatasourceDto;
import apelet.common.online.dto.OnlinePageDto; import apelet.common.online.dto.OnlinePageDto;
import apelet.common.online.model.OnlinePage;
import apelet.common.online.vo.OnlineDatasourceVo; import apelet.common.online.vo.OnlineDatasourceVo;
import apelet.common.online.vo.OnlinePageDatasourceVo; import apelet.common.online.vo.OnlinePageDatasourceVo;
import apelet.common.online.vo.OnlinePageVo; import apelet.common.online.vo.OnlinePageVo;
@ -43,7 +44,7 @@ public class TenantOnlinePageController extends OnlinePageController {
@OperationLog(type = SysOperationLogType.ADD) @OperationLog(type = SysOperationLogType.ADD)
@PostMapping("/add") @PostMapping("/add")
@Override @Override
public ResponseResult<Long> add(@MyRequestBody OnlinePageDto onlinePageDto) { public ResponseResult<OnlinePage> add(@MyRequestBody OnlinePageDto onlinePageDto) {
return super.add(onlinePageDto); return super.add(onlinePageDto);
} }

Loading…
Cancel
Save