主体网络关系图显示问题

src/main/java/ieven/server/webapp/domain/tenpay/TenpayHeaders.java

@@ -62,10 +62,10 @@ public class TenpayHeaders {
         mappedHeaders.put(6, Arrays.asList(
                 "用户ID", "交易单号", "借贷类型", "交易类型", "交易金额(分)", "账户余额(分)", "交易时间", "银行类型", "交易说明", "商户名称", "发送方", "发送金额(分)", "接收方", "接收时间", "接收金额(分)", "银行卡号", "对手银行卡号", "网银联单号1", "网银联单号2"));
         mappedHeaders.put(7, Arrays.asList(
-                "用户ID", "交易单号", "大单号", "用户侧账号名称", "借贷类型", "交易业务类型", "交易用途类型", "交易时间", "交易金额(分)", "账户余额(分)", "用户银行卡号", "用户侧银行名称", "用户侧网银联单号", "网联/银联", "第三方账户名称", "对手方ID", "对手侧账户名称", "对手方银行卡号", "对手侧银行名称", "对手侧网银联单号", "网联/银联", "第三方账户名称", "对手方接收时间", "对手方接收金额(分)", "备注1"
+                "用户ID", "交易单号", "大单号", "用户侧账号名称", "借贷类型", "交易业务类型", "交易用途类型", "交易时间", "交易金额(分)", "账户余额(分)", "用户银行卡号", "用户侧银行名称", "用户侧网银联单号", "网联/银联", "第三方账户名称", "对手方ID", "对手侧账户名称", "对手方银行卡号", "对手侧银行名称", "对手侧网银联单号",  "第三方账户名称", "对手方接收时间", "对手方接收金额(分)", "备注1"
         ));
         mappedHeaders.put(8, Arrays.asList(
-                "用户ID", "交易单号", "大单号", "用户侧账号名称", "借贷类型", "交易业务类型", "交易用途类型", "交易时间", "交易金额(分)", "账户余额(分)", "用户银行卡号", "用户侧银行名称", "用户侧网银联单号", "网联/银联", "第三方账户名称", "对手方ID", "对手侧账户名称", "对手方银行卡号", "对手侧银行名称", "对手侧网银联单号", "网联/银联", "第三方账户名称", "对手方接收时间", "对手方接收金额(分)", "备注1","备注2"
+                "用户ID", "交易单号", "大单号", "用户侧账号名称", "借贷类型", "交易业务类型", "交易用途类型", "交易时间", "交易金额(分)", "账户余额(分)", "用户银行卡号", "用户侧银行名称", "用户侧网银联单号", "网联/银联", "第三方账户名称", "对手方ID", "对手侧账户名称", "对手方银行卡号", "对手侧银行名称", "对手侧网银联单号",  "第三方账户名称", "对手方接收时间", "对手方接收金额(分)", "备注1","备注2"
         ));
         mappedNames.put(1, "财付通-订单明细1");
         mappedNames.put(2, "财付通-订单明细2");

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

@@ -152,13 +152,13 @@ public class DataStaticService extends Ops {
             query.addCriteria(Criteria.where("交易对手户名").in(Objects.requireNonNull(SplitCharacterEnum.splitByCharacter(staticModelInput.getJyzthmds()))));
         }
 
-        if (StringUtils.isNotBlank(staticModelInput.getJysjStart())&&StringUtils.isBlank(staticModelInput.getJysjEnd())) {
+        if (StringUtils.isNotBlank(staticModelInput.getJysjStart()) && StringUtils.isBlank(staticModelInput.getJysjEnd())) {
             query.addCriteria(Criteria.where("交易时间").gte(staticModelInput.getJysjStart()));
         }
-        if (StringUtils.isNotBlank(staticModelInput.getJysjEnd())&&StringUtils.isBlank(staticModelInput.getJysjStart())) {
+        if (StringUtils.isNotBlank(staticModelInput.getJysjEnd()) && StringUtils.isBlank(staticModelInput.getJysjStart())) {
             query.addCriteria(Criteria.where("交易时间").lte(staticModelInput.getJysjEnd()));
         }
-        if (StringUtils.isNotBlank(staticModelInput.getJysjEnd())&&StringUtils.isNotBlank(staticModelInput.getJysjStart())) {
+        if (StringUtils.isNotBlank(staticModelInput.getJysjEnd()) && StringUtils.isNotBlank(staticModelInput.getJysjStart())) {
             query.addCriteria(Criteria.where("交易时间").gte(staticModelInput.getJysjStart()).lte(staticModelInput.getJysjEnd()));
         }
 
@@ -220,7 +220,7 @@ public class DataStaticService extends Ops {
             if (jdlx.equals("借")) {
                 List<DataMap> dataMaps1 = personzhmcMap.get(jythm);
                 List<DataMap> dataMaps2 = personMap.get(jydszh);
-                if(CollectionUtils.isNotEmpty(dataMaps1)&&CollectionUtils.isNotEmpty(dataMaps2)){
+                if (CollectionUtils.isNotEmpty(dataMaps1) && CollectionUtils.isNotEmpty(dataMaps2)) {
                     String one = String.valueOf(dataMaps1.get(0).get("_id"));
                     party1.put("id", one);
                     party1.put("name", dataMaps1.get(0).get("账户名称"));
@@ -231,17 +231,16 @@ public class DataStaticService extends Ops {
                     userAllId = one + "-" + two;
                 }
 
-            }
-            else if (jdlx.equals("贷")) {
+            } else if (jdlx.equals("贷")) {
                 List<DataMap> dataMaps1 = personzhmcMap.get(jythm);
                 List<DataMap> dataMaps2 = personMap.get(jydszh);
-                if(CollectionUtils.isNotEmpty(dataMaps1)&&CollectionUtils.isNotEmpty(dataMaps2)){
+                if (CollectionUtils.isNotEmpty(dataMaps1) && CollectionUtils.isNotEmpty(dataMaps2)) {
                     String two = String.valueOf(dataMaps1.get(0).get("_id"));
-                    party2.put("id", dataMaps1.get(0).get("_id"));
+                    party2.put("id", String.valueOf(dataMaps1.get(0).get("_id")));
                     party2.put("name", dataMaps1.get(0).get("账户名称"));
 
                     String one = String.valueOf(dataMaps2.get(0).get("_id"));
-                    party1.put("id", dataMaps2.get(0).get("_id"));
+                    party1.put("id", String.valueOf(dataMaps2.get(0).get("_id")));
                     party1.put("name", dataMaps2.get(0).get("账号"));
                     userAllId = one + "-" + two;
                 }
@@ -259,12 +258,12 @@ public class DataStaticService extends Ops {
                                 .is(jydszh))), DataMap.class);
                 for (DataMap dataMap1 : dataDetailList) {
                     String jyje = String.valueOf(dataMap1.get("交易金额"));
-                    sum.add(new BigDecimal(jyje));
+                    sum = sum.add(new BigDecimal(jyje));
                 }
-                relationData.put("modelId",modelId);
-                relationData.put("fileId",dateFileId);
-                relationData.put("jythm",jythm);
-                relationData.put("jydszh",jydszh);
+                relationData.put("modelId", modelId);
+                relationData.put("fileId", dateFileId);
+                relationData.put("jythm", jythm);
+                relationData.put("jydszh", jydszh);
                 relationData.put("jeTotal", sum);
                 relationData.put("sum", dataDetailList.size());
                 total.put("party1", party1);
@@ -282,16 +281,16 @@ public class DataStaticService extends Ops {
             Map<String, Object> party2 = (Map) stringObjectMap.get("party2");
             String name1 = String.valueOf(party1.get("name"));
             String name2 = String.valueOf(party2.get("name"));
-            String value1=name2+"-"+name1;
-            stringObjectMap.put("type",1);
+            String value1 = name2 + "-" + name1;
+            stringObjectMap.put("type", 1);
             for (Map<String, Object> objectMap : relationshipGraphList) {
                 Map<String, Object> party11 = (Map) objectMap.get("party1");
                 Map<String, Object> party21 = (Map) objectMap.get("party2");
                 String name11 = String.valueOf(party11.get("name"));
                 String name21 = String.valueOf(party21.get("name"));
-                String value11=name11+"-"+name21;
-                if(value1.equals(value11)){
-                    stringObjectMap.put("type",2);
+                String value11 = name11 + "-" + name21;
+                if (value1.equals(value11)) {
+                    stringObjectMap.put("type", 2);
                     continue;
                 }
             }
@@ -302,7 +301,7 @@ public class DataStaticService extends Ops {
         dataMap.put("partyData", partyDataList);
         dataMap.put("relationshipGraph", relationshipGraphListnew);
         Mapped mapped = Mapped.OK();
-        if(partyDataList.size()>300){
+        if (partyDataList.size() > 300) {
             return Mapped.ERROR("节点超过300个,请重新查询");
         }
 

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

@@ -43,16 +43,10 @@ public class TenpayOrders0422 extends Ops implements Runnable {
         log.info("财付通-订单明细开始");
 
         List<String> headers = TenpayHeaders.getHeaders(7);
-        for (Fields originField : originFields) {
-            for (String key : originField.getFields().keySet()) {
-                String value = originField.getFields().get(key);
-                if (value.contains("备注2")) {
-                    headers = TenpayHeaders.getHeaders(8);
-                    break;
-                }
-            }
-        }
+        List<String> headers8 = TenpayHeaders.getHeaders(8);
+
         List<Fields> matched = matchHeaders(originFields, headers);
+        matched.addAll(matchHeaders(originFields, headers8));
         // 以下为处理另一种格式的财付通数据
         if (CollectionUtils.isNotEmpty(matched)) {
             String newFileId = createLogicAndDeleteOld("财付通-订单明细1", modelId, TenpayHeaders.getHeaders(8), mongoTemplate, fileService);

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

@@ -196,10 +196,7 @@ public class TenpayTrades extends Ops implements Runnable {
                     continue;
                 }
                 dataMap.put("交易主体户名", origin.getString("用户侧账号名称"));
-                dataMap.put("交易主体账号", origin.getString("用户侧账号名称"));
-                if (StringUtils.isBlank(origin.getString("用户侧账号名称"))) {
-                    dataMap.put("交易主体账号", userId);
-                }
+                dataMap.put("交易主体账号", userId);
                 dataMap.put("交易主体银行卡号", origin.getString("用户银行卡号"));
                 dataMap.put("交易主体银行名称", origin.getString("用户侧银行名称"));
                 dataMap.put("交易对手户名", origin.getString("对手侧账户名称"));
@@ -208,11 +205,7 @@ public class TenpayTrades extends Ops implements Runnable {
                 dataMap.put("交易单号", lognumber.replace("[", "").replace("]", ""));
                 dataMap.put("借贷类型", origin.getString("借贷类型"));
 
-                dataMap.put("交易对手账号", origin.getString("对手侧账户名称"));
-                if (StringUtils.isBlank(origin.getString("对手侧账户名称"))) {
-                    dataMap.put("交易对手账号", dsUserId);
-                }
-
+                dataMap.put("交易对手账号",dsUserId);
                 dataMap.put("交易时间", origin.getString("交易时间"));
                 String string5 = origin.getString("交易金额(分)");
                 if (!NumberUtil.isNumber(string5)) {