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 | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 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..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();
@@ -34,14 +44,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 +51,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 +62,18 @@
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