feat(1): 第三方数据需要处理的特例

src/main/java/ieven/server/webapp/service/datastatic/DataStaticAnalysisDs.java

@@ -6,6 +6,7 @@ import ieven.server.webapp.domain.data.DataMap;
 import ieven.server.webapp.domain.file.FileService;
 import ieven.server.webapp.service.Ops;
 import ieven.server.webapp.util.Common;
+import ieven.server.webapp.util.excel.PublicStatic;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -63,7 +64,7 @@ public class DataStaticAnalysisDs extends Ops implements Runnable {
                 try {
 
                     origin = cursor.next();
-                    String alipayId = origin.getString("交易对手账号");
+                    String alipayId = PublicStatic.formatTransactionPartyName(origin.getString("交易对手账号"));
                     DataMap dataMap;
                     if (alipayIds.contains(alipayId)) {
                         dataMap = idToData.get(alipayId);
@@ -200,7 +201,7 @@ public class DataStaticAnalysisDs extends Ops implements Runnable {
                 try {
 
                     origin = cursor.next();
-                    String alipayId = origin.getString("交易对手账号");
+                    String alipayId = PublicStatic.formatTransactionPartyName(origin.getString("交易对手账号"));
                     DataMap dataMap;
                     if (alipayIds.contains(alipayId)) {
                         dataMap = idToData.get(alipayId);

src/main/java/ieven/server/webapp/service/tenpay/TenpayTrades.java

@@ -172,6 +172,18 @@ public class TenpayTrades extends Ops implements Runnable {
                         }*/
                     }
                 }
+
+                // 交易对手账号处理
+                if (PublicStatic.checkStr(String.valueOf(dataMap.get("交易对手账号")))) {
+                    Object accountObj = dataMap.get("交易对手账号");
+                    if (accountObj != null) {
+                        String account = accountObj.toString();
+                        if (PublicStatic.checkStr(account)) {
+                            String formattedAccount = PublicStatic.formatTransactionPartyName(account);
+                            dataMap.put("交易对手账号", formattedAccount);
+                        }
+                    }
+                }
                 needToSave.add(dataMap);
                 if (needToSave.size() >= 1000) {
                     saveLines(new ArrayList<>(needToSave), mongoTemplate);
@@ -282,6 +294,17 @@ public class TenpayTrades extends Ops implements Runnable {
                         }*/
                     }
                 }
+                // 交易对手账号处理
+                if (PublicStatic.checkStr(String.valueOf(dataMap.get("交易对手账号")))) {
+                    Object accountObj = dataMap.get("交易对手账号");
+                    if (accountObj != null) {
+                        String account = accountObj.toString();
+                        if (PublicStatic.checkStr(account)) {
+                            String formattedAccount = PublicStatic.formatTransactionPartyName(account);
+                            dataMap.put("交易对手账号", formattedAccount);
+                        }
+                    }
+                }
                 needToSave.add(dataMap);
                 if (needToSave.size() >= 1000) {
                     saveLines(new ArrayList<>(needToSave), mongoTemplate);
@@ -377,6 +400,17 @@ public class TenpayTrades extends Ops implements Runnable {
                         }
                     }
                 }
+                // 交易对手账号处理
+                if (PublicStatic.checkStr(String.valueOf(dataMap.get("交易对手账号")))) {
+                    Object accountObj = dataMap.get("交易对手账号");
+                    if (accountObj != null) {
+                        String account = accountObj.toString();
+                        if (PublicStatic.checkStr(account)) {
+                            String formattedAccount = PublicStatic.formatTransactionPartyName(account);
+                            dataMap.put("交易对手账号", formattedAccount);
+                        }
+                    }
+                }
                 needToSave.add(dataMap);
                 if (needToSave.size() >= 1000) {
                     saveLines(new ArrayList<>(needToSave), mongoTemplate);

src/main/java/ieven/server/webapp/service/tenpay/TenpayTradesEndAnalysis.java

@@ -68,7 +68,7 @@ public class TenpayTradesEndAnalysis extends Ops implements Runnable {
             try {
 
                 origin = cursor.next();
-                String alipayId = origin.getString("交易对手账号");
+                String alipayId = PublicStatic.formatTransactionPartyName(origin.getString("交易对手账号"));
                 DataMap dataMap;
                 if (alipayIds.contains(alipayId)) {
                     dataMap = idToData.get(alipayId);

src/main/java/ieven/server/webapp/util/excel/PublicStatic.java

@@ -354,8 +354,12 @@ public class PublicStatic {
                 return matcher.group(groups[i]);
             }
         }
+        result = result.replace("-", "－");
+        result = result.replace("/", "／");
+        result = result.replace("(", "（");
+        result = result.replace(")", "）");
         // 统一处理特殊字符替换
-        return result.replaceAll("[-_()（）]", "");
+        return result.replaceAll("（", "").replaceAll("）", "").replaceAll("－", "").replaceAll("[-_()（）]", "");
     }
 
     /**