From 38c060a610e8c27dfc54e064f4fb4fd22b6b4d56 Mon Sep 17 00:00:00 2001 From: linzhijie <19970921lzj> Date: 星期一, 12 四月 2021 15:53:52 +0800 Subject: [PATCH] 最新代码 --- src/main/java/com/ots/project/tool/report/MAQ/base/BaseCondition.java | 21 --------------------- 1 files changed, 0 insertions(+), 21 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 34cd069..5176400 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,14 +34,6 @@ } 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; @@ -49,9 +41,6 @@ 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)) { @@ -63,21 +52,11 @@ 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