|
@@ -62,14 +62,16 @@ public class TzXmlUtil {
|
|
Map<String, Object> res = getReplace(xml);
|
|
Map<String, Object> res = getReplace(xml);
|
|
String contentReplace = (String)res.get("content");
|
|
String contentReplace = (String)res.get("content");
|
|
Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(contentReplace);
|
|
Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(contentReplace);
|
|
- Map<String, String> map = (Map)res.get("replaceMap");
|
|
|
|
-
|
|
|
|
- for (String key : sourceMap.keySet()) {
|
|
|
|
- String value = sourceMap.get(key);
|
|
|
|
- if (StringUtil.isNotBlank(value)) {
|
|
|
|
- for (String key2 : map.keySet()) {
|
|
|
|
- value = value.replaceAll(key2, map.get(key2));
|
|
|
|
- sourceMap.put(key, value);
|
|
|
|
|
|
+ Boolean replace = (Boolean)res.get("repFlag"); // 获取是否要替换的标识
|
|
|
|
+ if (replace) {
|
|
|
|
+ Map<String, String> map = (Map) res.get("replaceMap");
|
|
|
|
+ for (String key : sourceMap.keySet()) {
|
|
|
|
+ String value = sourceMap.get(key);
|
|
|
|
+ if (StringUtil.isNotBlank(value)) {
|
|
|
|
+ for (String key2 : map.keySet()) {
|
|
|
|
+ value = value.replaceAll(key2, map.get(key2));
|
|
|
|
+ sourceMap.put(key, value);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -87,7 +89,6 @@ public class TzXmlUtil {
|
|
List<String> cutWord = new ArrayList<>();
|
|
List<String> cutWord = new ArrayList<>();
|
|
List<String> res1 = new ArrayList<>(); // 包含/的标签</name>
|
|
List<String> res1 = new ArrayList<>(); // 包含/的标签</name>
|
|
List<String> res2 = new ArrayList<>(); // 不包含/的标签<name>
|
|
List<String> res2 = new ArrayList<>(); // 不包含/的标签<name>
|
|
- List<String> convertEle = new ArrayList<>();
|
|
|
|
Map<String, String> replaceMap = new HashMap<>();
|
|
Map<String, String> replaceMap = new HashMap<>();
|
|
|
|
|
|
String pattern = "<.*?>";
|
|
String pattern = "<.*?>";
|
|
@@ -122,6 +123,12 @@ public class TzXmlUtil {
|
|
}
|
|
}
|
|
res.put("content", content);
|
|
res.put("content", content);
|
|
res.put("replaceMap", replaceMap);
|
|
res.put("replaceMap", replaceMap);
|
|
|
|
+ // 添加是否有替换的标识
|
|
|
|
+ if (replaceMap.size() > 0) {
|
|
|
|
+ res.put("repFlag", true);
|
|
|
|
+ } else {
|
|
|
|
+ res.put("repFlag", false);
|
|
|
|
+ }
|
|
return res;
|
|
return res;
|
|
}
|
|
}
|
|
|
|
|