From 56c8bc18def3992259da50948119259f571d04ee Mon Sep 17 00:00:00 2001
From: zhijie <1003392067@qq.com>
Date: 星期二, 08 六月 2021 23:25:39 +0800
Subject: [PATCH] MAQ简易版泰文支持,SAQ简易版支持
---
src/main/java/com/ots/project/tool/report/MAQ/base/BaseCondition.java | 17 +++++++++++++++++
1 files changed, 17 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..c8e53e8 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
@@ -4,6 +4,7 @@
import com.ots.project.tool.CacheServiceFactory;
import lombok.extern.slf4j.Slf4j;
import java.util.Arrays;
+import java.util.List;
import java.util.Map;
import java.util.Objects;
@Slf4j
@@ -12,8 +13,17 @@
public abstract String getName();
public abstract TLibraryCode calculate(Map<String, String> map, LangTypeEnum langType);
+ public List<TLibraryCode> calculateList(Map<String, String> map, LangTypeEnum langType){
+ return null;
+ }
public abstract Map<String, String> getMAQwaterDropsImages();
+
+ /**
+ * 鏍规嵁鍙傛暟鑾峰彇鍛戒腑鐨勬寚鏍�
+ * @param calculateMap
+ * @return
+ */
protected String selectTrueObject(Map<Boolean, String> calculateMap) {
for (Map.Entry<Boolean, String> entry : calculateMap.entrySet()) {
Boolean mapKey = entry.getKey();
@@ -56,6 +66,13 @@
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);
--
Gitblit v1.9.1