From f879ddd80a2bd267a0a575ef03f76d3ec2ae1504 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期四, 04 一月 2024 11:42:22 +0800 Subject: [PATCH] bug列表269:集成日志查询bug修改。 270:关键属性校验,去掉多线程之后请求响应非常慢(之前报错线程阻塞的bug改成单线程导致非常慢,现在又改回ForJoinPool方式限制线程生成数量实现多线程并行,提升执行效率)。 --- Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java | 27 +++++++++++++++++++++++---- 1 files changed, 23 insertions(+), 4 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java index 0924909..c2aaae4 100644 --- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java +++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java @@ -14,6 +14,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.extern.slf4j.Slf4j; +import org.jetbrains.annotations.NotNull; import org.springblade.core.tenant.annotation.NonDS; import org.springblade.core.tool.api.R; import org.springframework.beans.factory.annotation.Autowired; @@ -56,8 +57,10 @@ * 闆嗗洟鍒嗙被鐢宠鍗曟湇鍔� */ private final IDockingPreClassifyService dockingPreClassifyService; - - + /*** + * 灞炴�ф槧灏勬湇鍔� + */ + private final IDockingPreAttrMappingService dockingPreAttrMappingService; /** * 闆嗗洟鍙栧�艰寖鍥寸敵璇峰崟鏈嶅姟 */ @@ -81,6 +84,22 @@ return R.fail("闆嗗洟鐮佺敵璇峰け璐ワ細"+e.getMessage()); } } + + /*** + * 鏌ヨ闆嗗洟灞炴�ф槧灏� + * @param codeClassifyOid:缂栫爜鍒嗙被oid + * @return + */ + @Override + public R<List<DockingPreAttrMappingVO>> list_mapping(String codeClassifyOid) { + List<DockingPreAttrMapping> dockingPreAttrMappings= dockingPreAttrMappingService.selectByWrapper(Wrappers.<DockingPreAttrMapping>query().lambda().eq(DockingPreAttrMapping::getTargetClassifyId,codeClassifyOid)); + List<DockingPreAttrMappingVO> dockingPreAttrMappingVOList=new ArrayList<>(); + if(!CollectionUtils.isEmpty(dockingPreAttrMappings)){ + dockingPreAttrMappingVOList=dockingPreAttrMappingService.dockingPreAttrMappingDO2VOS(dockingPreAttrMappings,true); + } + return R.data(dockingPreAttrMappingVOList); + } + /*** * 鐢宠闆嗗洟缂栫爜鏁版嵁缁存姢 * @return @@ -271,7 +290,7 @@ * @param jclassObject * @throws Throwable */ - private void getVilewMode(DockingClassifyVO jclassObject, List<DockingClassifyViewVO> list) + private void getVilewMode(@NotNull DockingClassifyVO jclassObject, List<DockingClassifyViewVO> list) throws Throwable { String nodeLinkName = jclassObject.getNodeLinkName(); try { @@ -286,7 +305,7 @@ for (DockingClassifyViewVO viewInfo : list) { String viewName =StringUtils.isBlank(viewInfo.getViewName())?"":viewInfo.getViewName(); - String impactList = StringUtils.isBlank(viewInfo.getImpactList())?"":viewInfo.getImpactList(); + String impactList = viewInfo.getImpactList() == null ? "" : viewInfo.getImpactList().get(0).get(0); log.info("VilewMode:-------------->瑙嗗浘鍚嶇О:"+viewName); log.info("VilewMode:-------------->褰卞搷缂栫爜椤�:"+impactList); log.info("VilewMode:--------------> 闆嗗洟鍒嗙被涓婚敭:"+jclassId); -- Gitblit v1.9.3