调整对手分析为null情况

src/main/java/ieven/server/webapp/service/alipay/AntiSecurityTrade3.java

@@ -331,7 +331,7 @@ public class AntiSecurityTrade3 extends Ops implements Runnable {
                 dataMap.put("交易对手银行卡号", originDoc.getString("收款方银行卡号"));
                 dataMap.put("交易对手户名", originDoc.getString("收款方的商户名称"));
                 dataMap.put("交易主体的出入账标识", "出账");
-                String jyztzh = String.valueOf(originDoc.getString("查询账号"));
+                String jyztzh = String.valueOf(originDoc.getString("收款方支付帐号"));
                 String jyztzhhm = String.valueOf(originDoc.getString("收款方的商户名称"));
                 if (StringUtils.isNotBlank(jyztzh) && !"null".equals(jyztzh) && StringUtils.isNotBlank(jyztzhhm) && !"null".equals(jyztzhhm)) {
                     dataMapUser.put(jyztzh, jyztzhhm);

src/main/java/ieven/server/webapp/service/alipay/AntiSecurityTradeEndAnalysis.java

@@ -126,12 +126,13 @@ public class AntiSecurityTradeEndAnalysis extends Ops implements Runnable {
           oCount++;
           dataMap.put("总笔数", oCount);
           String mainId = (String) origin.get("交易主体账号");
+          String mainName = (String) origin.get("交易主体户名");
           if (idToMainIds.containsKey(alipayId)) {
             Set<String> mainIds = idToMainIds.get(alipayId);
             mainIds.add(mainId);
           } else {
             Set<String> mainIds = new HashSet<>();
-            mainIds.add(mainId+(StringUtils.isBlank(alipayUsername)?"":"("+alipayUsername+")"));
+            mainIds.add(mainId+(StringUtils.isBlank(mainName)||"null".equals(mainName)?"":"("+mainName+")"));
             idToMainIds.put(alipayId, mainIds);
           }
         } catch (Exception exception) {

src/main/java/ieven/server/webapp/service/alipay/EndAnalysis.java

@@ -135,7 +135,7 @@ public class EndAnalysis extends Ops implements Runnable {
             mainIds.add(mainId);
           } else {
             Set<String> mainIds = new HashSet<>();
-            mainIds.add(mainId+(StringUtils.isBlank(mainName)?"":"("+mainName+")"));
+            mainIds.add(mainId+(StringUtils.isBlank(mainName)||"null".equals(mainName)?"":"("+mainName+")"));
             idToMainIds.put(alipayId, mainIds);
           }
         } catch (Exception exception) {

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

@@ -78,11 +78,11 @@ public class TenpayTrades extends Ops implements Runnable {
                     }
                     dataMap.put("交易主体银行卡号", origin.getString("银行卡号"));
                     dataMap.put("交易主体银行名称", "");
-                    dataMap.put("交易主体户名", accountToName.getOrDefault(origin.getString("发送方"), ""));
+                    dataMap.put("交易主体户名", StringUtils.isBlank(accountToName.getOrDefault(origin.getString("发送方"), ""))||"null".equals(accountToName.getOrDefault(origin.getString("发送方"), ""))?"":accountToName.getOrDefault(origin.getString("发送方"), ""));
                     dataMap.put("交易对手账号", origin.getString("接收方"));
                     dataMap.put("交易对手银行卡号", origin.getString("对手银行卡号"));
                     dataMap.put("交易对手银行名称", "");
-                    dataMap.put("交易对手户名", accountToName.getOrDefault(StringUtils.trimToEmpty(origin.getString("接收方")), ""));
+                    dataMap.put("交易对手户名", StringUtils.isBlank(accountToName.getOrDefault(origin.getString("接收方"), ""))||"null".equals(accountToName.getOrDefault(origin.getString("接收方"), ""))?"":accountToName.getOrDefault(origin.getString("接收方"), ""));
                 }
                 if ("入".equals(flag)) {
                     dataMap.put("交易主体账号", StringUtils.trimToEmpty(origin.getString("接收方")));
@@ -91,11 +91,11 @@ public class TenpayTrades extends Ops implements Runnable {
                     }
                     dataMap.put("交易主体银行卡号", origin.getString("对手银行卡号"));
                     dataMap.put("交易主体银行名称", "");
-                    dataMap.put("交易主体户名", accountToName.getOrDefault(StringUtils.trimToEmpty(origin.getString("接收方")), ""));
+                    dataMap.put("交易主体户名", StringUtils.isBlank(accountToName.getOrDefault(origin.getString("接收方"), ""))||"null".equals(accountToName.getOrDefault(origin.getString("接收方"), ""))?"":accountToName.getOrDefault(origin.getString("接收方"), ""));
                     dataMap.put("交易对手账号", StringUtils.trimToEmpty(origin.getString("发送方")));
                     dataMap.put("交易对手银行卡号", origin.getString("银行卡号"));
                     dataMap.put("交易对手银行名称", "");
-                    dataMap.put("交易对手户名", accountToName.getOrDefault(StringUtils.trimToEmpty(origin.getString("发送方")), ""));
+                    dataMap.put("交易对手户名", StringUtils.isBlank(accountToName.getOrDefault(origin.getString("发送方"), ""))||"null".equals(accountToName.getOrDefault(origin.getString("发送方"), ""))?"":accountToName.getOrDefault(origin.getString("发送方"), ""));
                 }
                 dataMap.put("借贷类型", flag);
                 dataMap.put("交易类型", origin.getString("交易类型"));
@@ -137,7 +137,7 @@ public class TenpayTrades extends Ops implements Runnable {
                                             .and("generated")
                                             .is(Boolean.TRUE))), DataMap.class);
                             if(CollectionUtils.isNotEmpty(dataMaps)){
-                                dataMap.put("交易主体户名", String.valueOf(dataMaps.get(0).get("注册姓名")));
+                                dataMap.put("交易主体户名", dataMaps.get(0).get("注册姓名"));
                             }
                         }
                     }
@@ -163,7 +163,7 @@ public class TenpayTrades extends Ops implements Runnable {
                                             .and("generated")
                                             .is(Boolean.TRUE))), DataMap.class);
                             if(CollectionUtils.isNotEmpty(dataMaps)){
-                                dataMap.put("交易主体户名", String.valueOf(dataMaps.get(0).get("注册姓名")));
+                                dataMap.put("交易主体户名", dataMaps.get(0).get("注册姓名"));
                             }
                         }
                     }

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

@@ -135,7 +135,7 @@ public class TenpayTradesEndAnalysis extends Ops implements Runnable {
           mainIds.add(mainId);
         } else {
           Set<String> mainIds = new HashSet<>();
-          mainIds.add(mainId+(StringUtils.isBlank(mainName)?"":"("+mainName+")"));
+          mainIds.add(mainId+(StringUtils.isBlank(mainName)||"null".equals(mainName)?"":"("+mainName+")"));
           idToMainIds.put(alipayId, mainIds);
         }
       } catch (Exception exception) {

src/main/resources/application.properties

@@ -2,6 +2,8 @@ server.servlet.context-path=/
 spring.application.name=webapp
 #spring.data.mongodb.uri=mongodb://admin:123456@localhost:27017/ieven
 spring.data.mongodb.uri=mongodb://localhost:27017/user_model
+logging.level.root=error
+logging.level.org.springframework.data.mongodb.core.MongoTemplate=error
 #spring.data.mongodb.database=idata
 #spring.data.mongodb.host=localhost
 #spring.data.mongodb.port=27017
@@ -13,8 +15,8 @@ spring.servlet.multipart.max-request-size=1024MB
 logging.level.org.springframework.data.mongodb.core=DEBUG
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.time-zone=GMT+8
-spring.data.fileUploadPath=E:\\tempFiles\\createModel
-spring.data.fileExportPath=E:\\tempFiles\\createModel\\excel
+spring.data.fileUploadPath=D:\\tempFiles\\createModel
+spring.data.fileExportPath=D:\\tempFiles\\createModel\\excel
 headers.anti-cheat-origin=\u5E8F\u53F7,\u652F\u4ED8\u8BA2\u5355\u53F7,\u4EA4\u6613\u7C7B\u578B,\u652F\u4ED8\u7C7B\u578B,\u4EA4\u6613\u4E3B\u4F53\u7684\u51FA\u5165\u8D26\u6807\u8BC6,\u4EA4\u6613\u65F6\u95F4,\u5E01\u79CD,\u4EA4\u6613\u91D1\u989D,\u4EA4\u6613\u6D41\u6C34\u53F7,\u4EA4\u6613\u4F59\u989D,\
   \u6536\u6B3E\u65B9\u94F6\u884C\u5361\u6240\u5C5E\u94F6\u884C\u673A\u6784\u7F16\u7801,\u6536\u6B3E\u65B9\u94F6\u884C\u5361\u6240\u5C5E\u94F6\u884C\u540D\u79F0,\u6536\u6B3E\u65B9\u94F6\u884C\u5361\u6240\u5C5E\u94F6\u884C\u5361\u53F7,\u6536\u6B3E\u65B9\u7684\u652F\u4ED8\u5E10\u53F7,\u6D88\u8D39pos\u673A\u7F16\u53F7,\u6536\u6B3E\u65B9\u7684\u5546\u6237\u53F7,\
   \u6536\u6B3E\u65B9\u7684\u5546\u6237\u540D\u79F0,\u4ED8\u6B3E\u65B9\u94F6\u884C\u5361\u6240\u5C5E\u94F6\u884C\u673A\u6784\u7F16\u7801,\u4ED8\u6B3E\u65B9\u94F6\u884C\u5361\u6240\u5C5E\u94F6\u884C\u540D\u79F0,\u4ED8\u6B3E\u65B9\u94F6\u884C\u5361\u6240\u5C5E\u94F6\u884C\u5361\u53F7,\u4ED8\u6B3E\u65B9\u7684\u652F\u4ED8\u5E10\u53F7,\u4EA4\u6613\u8BBE\u5907\u7C7B\u578B,\