From 9b4433fddf5b401edb0aace8a404ac733b122702 Mon Sep 17 00:00:00 2001
From: 田源 <tianyuan@vci-tech.com>
Date: 星期四, 03 四月 2025 14:35:02 +0800
Subject: [PATCH] 添加非密字段显示
---
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmAttributeServiceImpl.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmAttributeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmAttributeServiceImpl.java
index af80c13..bf62946 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmAttributeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmAttributeServiceImpl.java
@@ -60,7 +60,7 @@
attributesDTOList.stream().forEachOrdered(s -> {
attributeService.checkAttribute(s);
btmTypeAttributeDOList.add(BtmTypeAttributeWrapper.build().copyBtmTypeAttributeDTO2Entity(s,btmTypeOid, creator, now));
- attributeIdList.add(s.getId().toLowerCase().trim());
+ attributeIdList.add(s.getId().trim());
});
//妫�鏌ュ睘鎬ф槸鍚﹂兘瀛樺湪
boolean exists = attributeService.checkAttributeExists(attributeIdList);
@@ -107,7 +107,7 @@
attributesDTOList.stream().forEachOrdered(s -> {
attributeService.checkAttribute(s);
btmTypeAttributeDOList.add(BtmTypeAttributeWrapper.build().copyBtmTypeAttributeDTO2Entity(s,btmTypeOid, creator, now));
- attributeIdList.add(s.getId().toLowerCase().trim());
+ attributeIdList.add(s.getId().trim());
});
//妫�鏌ュ睘鎬ф槸鍚﹂兘瀛樺湪
boolean exists = attributeService.checkAttributeExists(attributeIdList);
@@ -116,9 +116,6 @@
}
baseMapper.batchUpdate(btmTypeAttributeDOList);
return BtmTypeAttributeWrapper.build().listEntityVO(btmTypeAttributeDOList);
-// btmTypeAttributeDOList.stream().forEachOrdered(s -> {
-// btmTypeAttributeDOMapper.insert(s);
-// });
}
return null;
}
@@ -177,7 +174,7 @@
/**
* 鑾峰彇榛樿瀛楁
- *
+ * 榛樿瀛楁鍧囦笉鍙负绌�
* @param btmType 涓氬姟绫诲瀷
* @return 鎵ц缁撴灉
*/
@@ -186,16 +183,15 @@
List<BtmTypeAttributeVO> list = new ArrayList<>();
// 涓氬姟绫诲瀷鐨勫熀鏈瓧娈�
BtmTypeFieldConstant.BASIC_FIELD_MAP.forEach((id,name) -> {
+ id = id.toLowerCase(Locale.ROOT);
BtmTypeAttributeVO vo = new BtmTypeAttributeVO();
vo.setId(id);
vo.setName(name);
vo.setPkBtmType(btmType.getOid());
- if (StringUtils.equals(id,"oid")){
+ if ("oid".equals(id)){
vo.setNullableFlag(false);
- }else {
- vo.setNullableFlag(true);
}
- if (Arrays.asList("createtime","lastmodifytime","owner").contains(id)){
+ if (Arrays.asList("createtime","lastmodifytime","ts").contains(id)){
vo.setAttrDataType(VciFieldTypeEnum.VTDateTime.name());
vo.setAttributeLength(6);
}else {
@@ -213,8 +209,10 @@
vo.setName(name);
vo.setPkBtmType(btmType.getOid());
vo.setAttrDataType(VciFieldTypeEnum.VTString.name());
+ // 鐗堟湰瑙勫垯瀛楁涓嶈兘涓虹┖
+// vo.setNullableFlag(false);
vo.setAttributeLength(150);
- if (Arrays.asList("lastr","firstr","lastv","firstv","revisionseq","versionseq","revisionvalue","versionvalue").contains(id)){
+ if (Arrays.asList("revisionseq","versionseq").contains(id)){
vo.setAttributeLength(5);
vo.setAttrDataType(VciFieldTypeEnum.VTInteger.name());
}
@@ -233,6 +231,7 @@
vo.setId(id);
vo.setName(name);
vo.setPkBtmType(btmType.getOid());
+// vo.setNullableFlag(false);
vo.setAttributeLength(50);
vo.setAttrDataType(VciFieldTypeEnum.VTString.name());
list.add(vo);
@@ -246,6 +245,7 @@
vo.setId(id);
vo.setName(name);
vo.setPkBtmType(btmType.getOid());
+// vo.setNullableFlag(false);
vo.setAttributeLength(5);
vo.setAttrDataType(VciFieldTypeEnum.VTInteger.name());
list.add(vo);
--
Gitblit v1.9.3