From ccbe40edcd772214ac3df40be1f582b6acea63f4 Mon Sep 17 00:00:00 2001 From: linzhijie <19970921lzj> Date: 星期一, 12 四月 2021 15:50:09 +0800 Subject: [PATCH] 优化代码 --- src/main/java/com/ots/project/tool/report/MAQ/base/BaseCondition.java | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/ots/project/tool/report/MAQ/base/BaseCondition.java b/src/main/java/com/ots/project/tool/report/MAQ/base/BaseCondition.java index 5176400..34cd069 100644 --- a/src/main/java/com/ots/project/tool/report/MAQ/base/BaseCondition.java +++ b/src/main/java/com/ots/project/tool/report/MAQ/base/BaseCondition.java @@ -34,6 +34,14 @@ } return false; } + + /** + * 鑾峰彇鎶ュ憡瀛楀吀 + * @param map + * @param codeId + * @param langType + * @return + */ public TLibraryCode getMaqReportLibrary(Map<String, String> map, String codeId, LangTypeEnum langType) { if (Objects.isNull(codeId)) { return null; @@ -41,6 +49,9 @@ StringBuilder content = new StringBuilder(); String[] split = codeId.split(","); TLibraryCode result = new TLibraryCode(); + /** + * 鏍规嵁瀛楀吀CODE鑾峰彇瀵瑰簲鐨勫瓧鍏歌鎯� + */ Arrays.stream(split).forEach(item -> { TLibraryCode maqReportLibrary = CacheServiceFactory.getInstance().getMAQReportLibrary(item); if (Objects.isNull(maqReportLibrary)) { @@ -52,11 +63,21 @@ result.setLibraryCode(maqReportLibrary.getLibraryCode()); } }); + //璁剧疆瀵瑰簲璇█鐨勬枃瀛楀唴瀹� result.setLangTypeContext(content.toString(), langType); + //鏇挎崲鎶ュ憡瀛楀吀鍐呭鐨勫彉閲� dynamicParameterSubstitution(map, result, langType); return result; } + + /** + * 鏇挎崲鎶ュ憡瀛楀吀鍐呭鐨勫彉閲� + * @param map + * @param maqReportLibrary + * @param langType + */ public void dynamicParameterSubstitution(Map<String, String> map, TLibraryCode maqReportLibrary, LangTypeEnum langType) { + //鏍规嵁鎶ュ憡瀛楀吀鍐呭 瀹氫綅鍙橀噺鍚嶄綅缃� 鏇挎崲缁撴灉 map.forEach((key, value) -> { String content = maqReportLibrary.getLangTypeContext(langType); String replaceStr = "%" + key + "%"; -- Gitblit v1.9.1