From 96a00cfded3cc74785a4e6967257dfdf3d74d274 Mon Sep 17 00:00:00 2001 From: yuxc <yuxc@vci-tech.com> Date: 星期一, 05 八月 2024 18:19:27 +0800 Subject: [PATCH] 修改返回值 --- Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLinkTypeServiceImpl.java | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLinkTypeServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLinkTypeServiceImpl.java index 0395363..2c23e3f 100644 --- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLinkTypeServiceImpl.java +++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsLinkTypeServiceImpl.java @@ -51,6 +51,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; +import java.util.function.Function; import java.util.stream.Collectors; /** @@ -703,9 +704,14 @@ @Override public List<OsLinkTypeAttributeVO> getAllAttributeByLink(String name) throws PLException, ParseException { AttributeDef[] attributes = platformClientUtil.getLinkTypeService().getAttributes(name); - AttributeDef[] sysAttributeDefs = platformClientUtil.getLinkTypeService().getSysAttributeDefs(); + Map<String, AttributeDef> collect = Arrays.stream(platformClientUtil.getLinkTypeService().getSysAttributeDefs()) + .collect(Collectors.toMap(str -> str.name, str -> str)); + List<OsLinkTypeAttributeVO> links = new ArrayList<>(); - for (AttributeDef sysAttributeDef : sysAttributeDefs) { + String[] sysAttibutes = { "OID", "Creator", "CreateTime", "LastModifier", "LASTMODIFYTIME", "F_OID", + "F_REVISIONOID", "F_NAMEOID", "F_BtwName", "T_OID", "T_REVISIONOID", "T_NAMEOID", "T_BtwName", "TS" }; + for (String sysname : sysAttibutes) { + AttributeDef sysAttributeDef = collect.get(sysname.toLowerCase()); OsLinkTypeAttributeVO vo = new OsLinkTypeAttributeVO(); vo.setOid(sysAttributeDef.oid); vo.setAttrDataType(sysAttributeDef.vtDataType); @@ -715,7 +721,7 @@ vo.setDefaultValue(sysAttributeDef.defValue); vo.setDescription(sysAttributeDef.description); vo.setRange(sysAttributeDef.rage); - vo.setId(sysAttributeDef.name); + vo.setId(sysname); vo.setName(sysAttributeDef.label); vo.setLastModifier(sysAttributeDef.modifier); vo.setLastModifyTime(new Date(sysAttributeDef.modifyTime)); -- Gitblit v1.9.3