Compare commits

..

No commits in common. '7dcb3bb5c9d8bafd182f277ffa5e1089f0f75702' and '15dd345744c56e880ab9b01e45e73da2ff0d1a04' have entirely different histories.

  1. 16
      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

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

@ -75,10 +75,6 @@ public class OnlinePageController { @@ -75,10 +75,6 @@ public class OnlinePageController {
@Autowired
private IOnlFormFieldService onlFormFieldService;
//new=新建元数据,exist=现有元数据
private static final String META_SOURCE_NEW = "new";
private static final String META_SOURCE_EXIST = "exist";
/**
* 新增在线表单页面数据
*
@ -89,14 +85,14 @@ public class OnlinePageController { @@ -89,14 +85,14 @@ public class OnlinePageController {
@OperationLog(type = SysOperationLogType.ADD)
@Transactional(rollbackFor = Exception.class)
@PostMapping("/add")
public ResponseResult<OnlinePage> add(@MyRequestBody OnlinePageDto onlinePageDto) {
public ResponseResult<Long> add(@MyRequestBody OnlinePageDto onlinePageDto) {
String errorMessage = MyCommonUtil.getModelValidationError(onlinePageDto);
if (errorMessage != null) {
return ResponseResult.error(ErrorCodeEnum.DATA_VALIDATED_FAILED, errorMessage);
}
// Validate based on metaSource
String metaSource = onlinePageDto.getMetaSource();
if (META_SOURCE_NEW.equals(metaSource)) {
if ("new".equals(metaSource)) {
// New metadata flow: metaType and pageCode are required
if (StrUtil.isEmpty(onlinePageDto.getMetaType())) {
errorMessage = "数据验证失败,新建元数据时表类型(metaType)不能为空!";
@ -119,16 +115,17 @@ public class OnlinePageController { @@ -119,16 +115,17 @@ public class OnlinePageController {
return ResponseResult.error(ErrorCodeEnum.DUPLICATED_UNIQUE_KEY, errorMessage);
}
Long masterTableId;
OnlFormHead onlFormHead;
if (META_SOURCE_NEW.equals(metaSource)) {
if ("new".equals(metaSource)) {
// === New branch: create fresh metadata ===
String metaType = onlinePageDto.getMetaType();
String tableName = onlinePageDto.getPageCode();
String tableTxt = onlinePageDto.getPageName();
onlFormHead = iOnlFormHeadService.createMetaAndSync(tableName, tableTxt, metaType, null);
Long masterTableId = onlFormHead.getId();
masterTableId = onlFormHead.getId();
onlinePage.setMasterTableId(String.valueOf(masterTableId));
onlinePage.setMasterTableName(onlFormHead.getTableName());
@ -141,6 +138,7 @@ public class OnlinePageController { @@ -141,6 +138,7 @@ public class OnlinePageController {
// === Existing branch: use existing metadata ===
String formMetadata = onlinePageDto.getMasterTableId();
onlFormHead = iOnlFormHeadService.getById(formMetadata);
masterTableId = Long.valueOf(formMetadata);
}
try {
@ -181,7 +179,7 @@ public class OnlinePageController { @@ -181,7 +179,7 @@ public class OnlinePageController {
*/
addOnlineDatasourceRelation(onlFormHead, onlineDatasource, errorMessage, onlineDblink);
return ResponseResult.success(onlinePage);
return ResponseResult.success(onlinePage.getPageId());
}

3
common/common-tenant-online/src/main/java/apelet/common/tenant/online/controller/TenantOnlinePageController.java

@ -8,7 +8,6 @@ import apelet.common.online.controller.OnlinePageController; @@ -8,7 +8,6 @@ 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;
@ -44,7 +43,7 @@ public class TenantOnlinePageController extends OnlinePageController { @@ -44,7 +43,7 @@ public class TenantOnlinePageController extends OnlinePageController {
@OperationLog(type = SysOperationLogType.ADD)
@PostMapping("/add")
@Override
public ResponseResult<OnlinePage> add(@MyRequestBody OnlinePageDto onlinePageDto) {
public ResponseResult<Long> add(@MyRequestBody OnlinePageDto onlinePageDto) {
return super.add(onlinePageDto);
}

Loading…
Cancel
Save