From 5176699e01aa3b9f8f4dc18f08793896f4ddd29c Mon Sep 17 00:00:00 2001
From: lihang <lihang@vci-tech.com>
Date: 星期一, 03 七月 2023 14:10:06 +0800
Subject: [PATCH] 修正业务类型默认字段的null的属性；修正DDL的建表语句生成；
---
Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/service/impl/DdlServiceImpl.java | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/service/impl/DdlServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/service/impl/DdlServiceImpl.java
index a8ffb74..6d1f373 100644
--- a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/service/impl/DdlServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/service/impl/DdlServiceImpl.java
@@ -976,26 +976,39 @@
*/
@Override
public R<List<ModifyAttributeInfo>> submit(BtmAndLinkTypeDdlDTO ddlDTO) {
- //try {
+ try {
List<ModifyAttributeInfo> changedList = new ArrayList<>();
if (!CollectionUtils.isEmpty(ddlDTO.getBtmTypeList())) {
List<BtmTypeVO> btmTypeList = ddlDTO.getBtmTypeList();
- //putBtm(btmTypeList.toArray(new BtmTypeVO[0]));
+ putBtm(btmTypeList.toArray(new BtmTypeVO[0]));
changedList.addAll(checkDifferent(btmTypeList, null));
- //removeBtm(btmTypeList.toArray(new BtmTypeVO[0]));
+ removeBtm(btmTypeList.toArray(new BtmTypeVO[0]));
}
if (!CollectionUtils.isEmpty(ddlDTO.getLinkTypeList())) {
List<LinkTypeVO> linkTypeList = ddlDTO.getLinkTypeList();
- //putLink(linkTypeList.toArray(new LinkTypeVO[0]));
+ putLink(linkTypeList.toArray(new LinkTypeVO[0]));
changedList.addAll(checkDifferent(null,linkTypeList));
- //removeLink(linkTypeList.toArray(new LinkTypeVO[0]));
+ removeLink(linkTypeList.toArray(new LinkTypeVO[0]));
}
R<List<ModifyAttributeInfo>> result = R.success("鏁版嵁搴撴搷浣滄垚鍔�");
result.setData(changedList);
return result;
- //} catch (ServiceException e) {
- //throw new RuntimeException(e.getMessage());
-// }
+ } catch (VciBaseException e) {
+ try {
+ // 寤鸿〃澶辫触鏈夊紓甯革紝鎹曡幏鍚庤繑鍥烇紝骞堕噴鏀剧嚎绋嬩腑鐨勫唴瀹�
+ if (!CollectionUtils.isEmpty(ddlDTO.getBtmTypeList())) {
+ removeBtm(ddlDTO.getBtmTypeList().toArray(new BtmTypeVO[0]));
+ }
+ if (!CollectionUtils.isEmpty(ddlDTO.getLinkTypeList())) {
+ removeLink(ddlDTO.getLinkTypeList().toArray(new LinkTypeVO[0]));
+ }
+ return R.fail(e.getMessage());
+ }catch (ServiceException e2){
+ throw new RuntimeException(e2.getMessage());
+ }
+ } catch (ServiceException e) {
+ throw new RuntimeException(e.getMessage());
+ }
}
/**
@@ -1056,7 +1069,7 @@
BtmTypeAttributeVO attributeVO = new BtmTypeAttributeVO();
attributeVO.setId(col.getId().toLowerCase());
attributeVO.setName(col.getName());
- attributeVO.setNullableFlag(col.getNullableFlag());
+ attributeVO.setNullableFlag(StringUtils.equals(col.getNullableFlag(), BooleanEnum.TRUE.getValue()));
attributeVO.setAttributeLength(col.getAttributeLength());
attributeVO.setPrecisionLength(col.getPrecisionLength());
attributeVO.setScaleLength(col.getScaleLength());
--
Gitblit v1.9.3