From 1fa18d4c61c6facb52fe09168dcbf6b46de4aafe Mon Sep 17 00:00:00 2001 From: ludc Date: 星期三, 28 八月 2024 15:20:23 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/OsScanAnnotationTool.java | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/OsScanAnnotationTool.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/OsScanAnnotationTool.java index 446f3b2..64041e6 100644 --- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/OsScanAnnotationTool.java +++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/util/OsScanAnnotationTool.java @@ -1,5 +1,6 @@ package com.vci.web.util; +import com.vci.dto.*; import com.vci.starter.web.annotation.*; import com.vci.starter.web.enumpck.BaseEnum; import com.vci.starter.web.enumpck.BaseEnumInt; @@ -7,10 +8,8 @@ import com.vci.starter.web.exception.VciBaseException; import com.vci.starter.web.util.ApplicationContextProvider; import com.vci.starter.web.util.VciBaseUtil; -import com.vci.starter.web.wrapper.VciQueryWrapperForDO; -import com.vci.web.bo.BtmOrLinkProcessAttributeInfo; -import com.vci.web.constant.FieldConstant; -import com.vci.web.dto.*; +import com.vci.bo.BtmOrLinkProcessAttributeInfo; +import com.vci.constant.FieldConstant; import com.vci.web.service.WebBtmIOServiceI; import org.apache.commons.lang3.StringUtils; import org.reflections.Reflections; @@ -214,7 +213,7 @@ Map<String, OsLifeCycleDTO> lifeCycleDTOMap = new HashMap<String, OsLifeCycleDTO>(); Map<String, OsEnumDTO> enumDTOMap = new HashMap<String, OsEnumDTO>(); Map<String, OsAttributeDTO> attributeDTOMap = new HashMap<String, OsAttributeDTO>(); - Map<String,OsBtmTypeDTO> btmTypeDTOMap = new HashMap<String,OsBtmTypeDTO>(); + Map<String, OsBtmTypeDTO> btmTypeDTOMap = new HashMap<String,OsBtmTypeDTO>(); Map<String,OsLinkTypeDTO> linkTypeDTOMap = new HashMap<String,OsLinkTypeDTO>(); List<Class<?>> lifeCycleClassList = new ArrayList<Class<?>>(); @@ -466,7 +465,7 @@ Collections.addAll(fields,btmTypeClass.getDeclaredFields()); List<OsBtmTypeLinkAttributesDTO> btmTypeLinkAttributesDTOList = new ArrayList<OsBtmTypeLinkAttributesDTO>(); scanAttributes(fields,attributeDTOMap,btmTypeLinkAttributesDTOList,processAttributeInfo); - btmTypeDTO.setAttributesDTOList(btmTypeLinkAttributesDTOList); + btmTypeDTO.setApNameArray(btmTypeLinkAttributesDTOList.stream().map(OsBtmTypeLinkAttributesDTO::getId).collect(Collectors.joining(","))); btmTypeDTOMap.put(btmTypeDTO.getId().toLowerCase().trim(),btmTypeDTO); } -- Gitblit v1.9.3