调整五联单数据

src/main/java/ieven/server/webapp/api/AlipayController.java

@@ -384,19 +384,47 @@ public class AlipayController {
             if (dataMap == null) {
                 return null;
             }
-
-            dszfbyhid = (String) dataMap.get("交易主体账号");
-            if (!clickHeader.equals("交易总额") && !clickHeader.equals("总笔数")) {
-                if (!clickHeader.equals("收入金额") && !clickHeader.equals("收入笔数")) {
-                    if (clickHeader.equals("支出金额") || clickHeader.equals("支出笔数")) {
-                        criteria.and("交易主体账号").is(dszfbyhid).and("借贷类型").is("出");
+            if(String.valueOf(dataMap.get("来源")).equals("财付通")){
+                dszfbyhid = (String) dataMap.get("交易主体账号");
+                if (!clickHeader.equals("交易总额") && !clickHeader.equals("总笔数")) {
+                    if (!clickHeader.equals("收入金额") && !clickHeader.equals("收入笔数")) {
+                        if (clickHeader.equals("支出金额") || clickHeader.equals("支出笔数")) {
+                            criteria.and("交易主体账号").is(dszfbyhid).and("借贷类型").is("出");
+                        }
+                    } else {
+                        criteria.and("交易主体账号").is(dszfbyhid).and("借贷类型").is("入");
                     }
                 } else {
-                    criteria.and("交易主体账号").is(dszfbyhid).and("借贷类型").is("入");
+                    criteria.and("交易主体账号").is(dszfbyhid);
+                }
+            }else if(String.valueOf(dataMap.get("来源")).equals("五联单")){
+                dszfbyhid = (String) dataMap.get("交易主体账号");
+                if (!clickHeader.equals("交易总额") && !clickHeader.equals("总笔数")) {
+                    if (!clickHeader.equals("收入金额") && !clickHeader.equals("收入笔数")) {
+                        if (clickHeader.equals("支出金额") || clickHeader.equals("支出笔数")) {
+                            criteria.and("支付宝用户ID").is(dszfbyhid).and("收/支").is("支出");
+                        }
+                    } else {
+                        criteria.and("支付宝用户ID").is(dszfbyhid).and("收/支").is("收入");
+                    }
+                } else {
+                    criteria.and("支付宝用户ID").is(dszfbyhid);
+                }
+            }else if(String.valueOf(dataMap.get("来源")).equals("反诈")){
+                dszfbyhid = (String) dataMap.get("交易主体账号");
+                if (!clickHeader.equals("交易总额") && !clickHeader.equals("总笔数")) {
+                    if (!clickHeader.equals("收入金额") && !clickHeader.equals("收入笔数")) {
+                        if (clickHeader.equals("支出金额") || clickHeader.equals("支出笔数")) {
+                            criteria.and("交易主体账号").is(dszfbyhid).and("交易主体的出入账标识").is("出账");
+                        }
+                    } else {
+                        criteria.and("交易主体账号").is(dszfbyhid).and("交易主体的出入账标识").is("入账");
+                    }
+                } else {
+                    criteria.and("交易主体账号").is(dszfbyhid);
                 }
-            } else {
-                criteria.and("交易主体账号").is(dszfbyhid);
             }
+
         } else if (filename.equals("数据分析-对手透视")) {
             if (lineId == null) {
                 return criteria;
@@ -406,19 +434,47 @@ public class AlipayController {
             if (dataMap == null) {
                 return null;
             }
-
-            dszfbyhid = (String) dataMap.get("交易对手账号");
-            if (!clickHeader.equals("交易总额") && !clickHeader.equals("总笔数")) {
-                if (!clickHeader.equals("交易主体收入金额") && !clickHeader.equals("交易主体收入笔数")) {
-                    if (clickHeader.equals("交易主体支出金额") || clickHeader.equals("交易主体支出笔数")) {
-                        criteria.and("交易对手账号").is(dszfbyhid).and("借贷类型").is("出");
+            if(String.valueOf(dataMap.get("来源")).equals("财付通")){
+                dszfbyhid = (String) dataMap.get("交易对手账号");
+                if (!clickHeader.equals("交易总额") && !clickHeader.equals("总笔数")) {
+                    if (!clickHeader.equals("交易主体收入金额") && !clickHeader.equals("交易主体收入笔数")) {
+                        if (clickHeader.equals("交易主体支出金额") || clickHeader.equals("交易主体支出笔数")) {
+                            criteria.and("交易对手账号").is(dszfbyhid).and("借贷类型").is("出");
+                        }
+                    } else {
+                        criteria.and("交易对手账号").is(dszfbyhid).and("借贷类型").is("入");
                     }
                 } else {
-                    criteria.and("交易对手账号").is(dszfbyhid).and("借贷类型").is("入");
+                    criteria.and("交易对手账号").is(dszfbyhid);
+                }
+            }else if(String.valueOf(dataMap.get("来源")).equals("五联单")){
+                dszfbyhid = (String) dataMap.get("交易对手账号");
+                if (!clickHeader.equals("交易总额") && !clickHeader.equals("总笔数")) {
+                    if (!clickHeader.equals("主用户ID收入金额") && !clickHeader.equals("主用户ID收入笔数")) {
+                        if (clickHeader.equals("主用户ID支出金额") || clickHeader.equals("主用户ID支出笔数")) {
+                            criteria.and("对手支付宝用户ID").is(dszfbyhid).and("收/支").is("支出");
+                        }
+                    } else {
+                        criteria.and("对手支付宝用户ID").is(dszfbyhid).and("收/支").is("收入");
+                    }
+                } else {
+                    criteria.and("对手支付宝用户ID").is(dszfbyhid);
+                }
+            }else if(String.valueOf(dataMap.get("来源")).equals("反诈")){
+                dszfbyhid = (String) dataMap.get("交易对手账号");
+                if (!clickHeader.equals("交易总额") && !clickHeader.equals("总笔数")) {
+                    if (!clickHeader.equals("交易主体收入金额") && !clickHeader.equals("交易主体收入笔数")) {
+                        if (clickHeader.equals("交易主体支出金额") || clickHeader.equals("交易主体支出笔数")) {
+                            criteria.and("交易对手账号").is(dszfbyhid).and("交易主体的出入账标识").is("出账");
+                        }
+                    } else {
+                        criteria.and("交易对手账号").is(dszfbyhid).and("交易主体的出入账标识").is("入账");
+                    }
+                } else {
+                    criteria.and("交易对手账号").is(dszfbyhid);
                 }
-            } else {
-                criteria.and("交易对手账号").is(dszfbyhid);
             }
+
         } else if (filename.equals("五联单-转账分析")) {
             if (lineId == null) {
                 criteria.and("消费名称").is("转账");

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

@@ -81,9 +81,7 @@ public class ALIPAY_GENERATED_TRADE extends Ops implements Runnable {
                     if (CollectionUtils.isEmpty(dataMaps)) {
                         //去用户注册中进行数据补全
                         dataMaps = this.mongoTemplate.find((new Query(
-                                Criteria.where("modelId")
-                                        .is(modelId)
-                                        .and("fileId")
+                                Criteria.where("fileId")
                                         .is(dateFileId2)
                                         .and(AlipayHeaders.ACCOUNT_1)
                                         .is(zfbName))), DataMap.class);

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

@@ -46,7 +46,7 @@ public class DataStaticAnalysis extends Ops implements Runnable {
         String dateFileIdfzza = getFileId("反诈治安-交易明细", modelId, mongoTemplate);
         String dateFileIdwld = getFileId("五联单-账户明细", modelId, mongoTemplate);
 
-        if (StringUtils.isNotBlank(dateFileIdcft) || StringUtils.isNotBlank(dateFileIdfzza)) {
+        if (StringUtils.isNotBlank(dateFileIdcft) || StringUtils.isNotBlank(dateFileIdfzza)||StringUtils.isNotBlank(dateFileIdwld)) {
             newFileId = createLogicAndDeleteOld("数据分析-主体信息汇总明细", modelId, headerProperties.getUserAccountOutput(), mongoTemplate, fileService);
         }
         // 插入记录用户后续查询明细
@@ -215,9 +215,9 @@ public class DataStaticAnalysis extends Ops implements Runnable {
     }
 
     public String getJtType(String type){
-        if(type.equals("借")||type.equals("出")||type.equals("支")||type.equals("出账")){
+        if(type.equals("借")||type.equals("出")||type.equals("支")||type.equals("出账")|type.equals("支出")){
             return "借";
-        }else if(type.equals("贷")||type.equals("入")||type.equals("支")||type.equals("入账")){
+        }else if(type.equals("贷")||type.equals("入")||type.equals("支")||type.equals("入账")||type.equals("收入")){
             return "贷";
         }
         return type;

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

@@ -83,6 +83,7 @@ public class DataStaticAnalysisDs extends Ops implements Runnable {
                         dataMap.put("总笔数", 0);
                         dataMap.put("共同交易主体数", 0);
                         dataMap.put("共同交易主体账号汇总", "");
+                        dataMap.put("来源", "财付通");
                         idToData.put(alipayId, dataMap);
                     }
                     String alipayUsername = origin.getString("交易对手户名");
@@ -176,7 +177,7 @@ public class DataStaticAnalysisDs extends Ops implements Runnable {
                     BigDecimal money3 = (BigDecimal) dataMap.get("交易主体支出金额");
                     dataMap.put("交易主体支出金额", money3.doubleValue());
                 }
-                saveLines(idToData.values(), "交易总额", mongoTemplate);
+                saveLines(idToData.values(), "共同交易主体数", mongoTemplate);
             }
         }
 
@@ -213,7 +214,8 @@ public class DataStaticAnalysisDs extends Ops implements Runnable {
                         dataMap.put("交易主体支出笔数", 0);
                         dataMap.put("总笔数", 0);
                         dataMap.put("共同交易主体数", 0);
-                        dataMap.put("共同交易主体账号汇总", "");
+                        dataMap.put("来源", "反诈");
+
                         idToData.put(alipayId, dataMap);
                     }
                     String alipayUsername = origin.getString("交易对手户名");
@@ -305,7 +307,7 @@ public class DataStaticAnalysisDs extends Ops implements Runnable {
                     BigDecimal money3 = (BigDecimal) dataMap.get("交易主体支出金额");
                     dataMap.put("交易主体支出金额", money3.doubleValue());
                 }
-                saveLines(idToData.values(), "交易总额", mongoTemplate);
+                saveLines(idToData.values(), "共同交易主体数", mongoTemplate);
             }
         }
 
@@ -337,13 +339,14 @@ public class DataStaticAnalysisDs extends Ops implements Runnable {
                         dataMap.put("交易对手账号", alipayId);
                         dataMap.put("交易对手户名", "");
                         dataMap.put("交易总额", new BigDecimal("0.00"));
-                        dataMap.put("主用户ID收入金额", new BigDecimal("0.00"));
-                        dataMap.put("主用户ID支出金额", new BigDecimal("0.00"));
-                        dataMap.put("主用户ID收入笔数", 0);
-                        dataMap.put("主用户ID支出笔数", 0);
+                        dataMap.put("交易主体收入金额", new BigDecimal("0.00"));
+                        dataMap.put("交易主体支出金额", new BigDecimal("0.00"));
+                        dataMap.put("交易主体收入笔数", 0);
+                        dataMap.put("交易主体支出笔数", 0);
                         dataMap.put("总笔数", 0);
-                        dataMap.put("共同主用户ID数", 0);
-                        dataMap.put("共同主用户ID汇总", "");
+                        dataMap.put("共同交易主体数", 0);
+                        dataMap.put("共同交易主体账号汇总", "");
+                        dataMap.put("来源", "五联单");
                         idToData.put(alipayId, dataMap);
                     }
                     String alipayUsername = origin.getString("对手支付宝户名");
@@ -363,19 +366,19 @@ public class DataStaticAnalysisDs extends Ops implements Runnable {
                     String flagValue = origin.getString(flag);
                     String money = (String) origin.get("金额(元)");
                     if ("收入".equals(flagValue)) {
-                        BigDecimal oMoney = (BigDecimal) dataMap.get("主用户ID收入金额");
+                        BigDecimal oMoney = (BigDecimal) dataMap.get("交易主体收入金额");
                         oMoney = oMoney.add(new BigDecimal(money));
-                        dataMap.put("主用户ID收入金额", oMoney);
-                        int oCount = (int) dataMap.get("主用户ID收入笔数");
+                        dataMap.put("交易主体收入金额", oMoney);
+                        int oCount = (int) dataMap.get("交易主体收入笔数");
                         oCount++;
-                        dataMap.put("主用户ID收入笔数", oCount);
+                        dataMap.put("交易主体收入笔数", oCount);
                     } else if ("支出".equals(flagValue)) {
-                        BigDecimal oMoney = (BigDecimal) dataMap.get("主用户ID支出金额");
+                        BigDecimal oMoney = (BigDecimal) dataMap.get("交易主体支出金额");
                         oMoney = oMoney.add(new BigDecimal(money));
-                        dataMap.put("主用户ID支出金额", oMoney);
-                        int oCount = (int) dataMap.get("主用户ID支出笔数");
+                        dataMap.put("交易主体支出金额", oMoney);
+                        int oCount = (int) dataMap.get("交易主体支出笔数");
                         oCount++;
-                        dataMap.put("主用户ID支出笔数", oCount);
+                        dataMap.put("交易主体支出笔数", oCount);
                     }
                     BigDecimal oMoney = (BigDecimal) dataMap.get("交易总额");
                     oMoney = oMoney.add(new BigDecimal(money));
@@ -418,23 +421,23 @@ public class DataStaticAnalysisDs extends Ops implements Runnable {
                         value.put("交易对手户名", StringUtils.join(names, ";"));
                     }
                     if (CollectionUtils.isNotEmpty(mainIds)) {
-                        value.put("共同主用户ID数", mainIds.size());
+                        value.put("共同交易主体数", mainIds.size());
                         String str="";
                         for (String mainId : mainIds) {
                             Set<String> strings = hm.get(mainId);
                             str+=CollectionUtils.isEmpty(strings)?mainId+";":mainId+"("+StringUtils.join(strings, ",")+");";
                         }
-                        value.put("共同主用户ID汇总", str);
+                        value.put("共同交易主体账号汇总", str);
                     }
                     DataMap dataMap = entry.getValue();
                     BigDecimal money1 = (BigDecimal) dataMap.get("交易总额");
                     dataMap.put("交易总额", money1.doubleValue());
-                    BigDecimal money2 = (BigDecimal) dataMap.get("主用户ID收入金额");
-                    dataMap.put("主用户ID收入金额", money2.doubleValue());
-                    BigDecimal money3 = (BigDecimal) dataMap.get("主用户ID支出金额");
-                    dataMap.put("主用户ID支出金额", money3.doubleValue());
+                    BigDecimal money2 = (BigDecimal) dataMap.get("交易主体收入金额");
+                    dataMap.put("交易主体收入金额", money2.doubleValue());
+                    BigDecimal money3 = (BigDecimal) dataMap.get("交易主体支出金额");
+                    dataMap.put("交易主体支出金额", money3.doubleValue());
                 }
-                saveLines(idToData.values(), "交易总额", mongoTemplate);
+                saveLines(idToData.values(), "共同交易主体数", mongoTemplate);
             }
         }
 

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

@@ -82,6 +82,7 @@ public class DataStaticAnalysisMain extends Ops implements Runnable {
                         dataMap.put("收入笔数", 0);
                         dataMap.put("支出笔数", 0);
                         dataMap.put("总笔数", 0);
+                        dataMap.put("来源", "财付通");
                         idToData.put(alipayId, dataMap);
                     }
                     String alipayUsername = origin.getString("交易主体户名");
@@ -174,6 +175,7 @@ public class DataStaticAnalysisMain extends Ops implements Runnable {
                         dataMap.put("收入笔数", 0);
                         dataMap.put("支出笔数", 0);
                         dataMap.put("总笔数", 0);
+                        dataMap.put("来源", "反诈");
                         idToData.put(alipayId, dataMap);
                     }
                     String alipayUsername = origin.getString("交易主体户名");
@@ -265,6 +267,7 @@ public class DataStaticAnalysisMain extends Ops implements Runnable {
                         dataMap.put("收入笔数", 0);
                         dataMap.put("支出笔数", 0);
                         dataMap.put("总笔数", 0);
+                        dataMap.put("来源", "五联单");
                         idToData.put(alipayId, dataMap);
                     }
                     String flag = "收/支";

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

@@ -45,7 +45,7 @@ public class DataStaticAnalysisTotal extends Ops implements Runnable {
         log.info("数据分析-主体信息汇总开始");
         // 直接删除并创建表
         String newFileId = "";
-        String newFileIdAll = "";
+        //String newFileIdAll = "";
         String dateFileId = getFileId("数据分析-主体信息汇总明细", modelId, mongoTemplate);
         String cft = getFileId(TenpayHeaders.getGeneratedName(3), modelId, mongoTemplate);
         String wld = getFileId(AlipayHeaders.getGeneratedName(2), modelId, mongoTemplate);
@@ -56,21 +56,21 @@ public class DataStaticAnalysisTotal extends Ops implements Runnable {
                 newFileId = createLogicAndDeleteOld("数据分析-主体信息汇总", modelId, headerProperties.getStaticUserOutput(), mongoTemplate, fileService);
                 insertFromTo(dateFileId, newFileId, modelId, mongoTemplate);
 
-                //维护一张人员信息基础表,用于模型计算
+              /*  //维护一张人员信息基础表,用于模型计算
                 newFileIdAll = createLogicAndDeleteOld("数据分析-所有主体信息汇总", modelId, headerProperties.getStaticUserAllOutput(), mongoTemplate, fileService);
-                insertFromTo(dateFileId, newFileIdAll, modelId, mongoTemplate);
+                insertFromTo(dateFileId, newFileIdAll, modelId, mongoTemplate);*/
 
                 String newFileIdAll1 = createLogicAndDeleteOld("数据分析-共同关系网络", modelId, headerProperties.getStaticUserAllOutput(), mongoTemplate, fileService);
                 insertFromTo(dateFileId, newFileIdAll1, modelId, mongoTemplate);
             }
             Set<String> alipayIds = new HashSet<>();
-            Set<String> alipayIdsAll = new HashSet<>();
+            //Set<String> alipayIdsAll = new HashSet<>();
             Map<String, DataMap> idToData = new HashMap<>();
             Map<String, Set<String>> idToNames = new HashMap<>();
             Document origin;
             List<DataMap> needToSave = new ArrayList<>(1000);
-            List<DataMap> needToSaveall = new ArrayList<>(1000);
-            Map<String, Object> dataMapUser = new HashMap<>();
+            //List<DataMap> needToSaveall = new ArrayList<>(1000);
+            //Map<String, Object> dataMapUser = new HashMap<>();
             while (cursor.hasNext()) {
                 try {
                     origin = cursor.next();
@@ -106,7 +106,7 @@ public class DataStaticAnalysisTotal extends Ops implements Runnable {
                         }
                         namesSet.add(alipayUsername);
                     }
-                    getDataAll(needToSaveall, origin, alipayIdsAll, newFileIdAll, dataMapUser, idToData, dateFileId2);
+                 /*   getDataAll(needToSaveall, origin, alipayIdsAll, newFileIdAll, dataMapUser, idToData, dateFileId2);
                     if (needToSaveall.size() >= 1000) {
                         List<DataMap> newDataList = new ArrayList<>();
                         for (DataMap map : needToSaveall) {
@@ -130,7 +130,7 @@ public class DataStaticAnalysisTotal extends Ops implements Runnable {
                             saveLines(newDataList, mongoTemplate);
                         }
                         needToSaveall.clear();
-                    }
+                    }*/
 
                 } catch (Exception exception) {
                     log.error(exception.getMessage(), exception);
@@ -156,7 +156,7 @@ public class DataStaticAnalysisTotal extends Ops implements Runnable {
                 }
             }
 
-            if (CollectionUtils.isNotEmpty(needToSaveall)) {
+            /*if (CollectionUtils.isNotEmpty(needToSaveall)) {
                 List<DataMap> newDataList = new ArrayList<>();
                 for (DataMap map : needToSaveall) {
                     String zh = String.valueOf(map.get("账号"));
@@ -178,7 +178,7 @@ public class DataStaticAnalysisTotal extends Ops implements Runnable {
                 if (CollectionUtils.isNotEmpty(newDataList)) {
                     saveLines(newDataList, mongoTemplate);
                 }
-            }
+            }*/
         }
         latch.countDown();
         log.info("数据分析-主体信息汇总开始");
@@ -196,9 +196,7 @@ public class DataStaticAnalysisTotal extends Ops implements Runnable {
             //账户状态", "账号", "注册姓名", "注册时间", "注册身份证号", "绑定手机", "绑定状态", "开户行信息", "银行账号"
             if (StringUtils.isNotBlank(dateFileId2)) {
                 List<DataMap> dataMaps = this.mongoTemplate.find((new Query(
-                        Criteria.where("modelId")
-                                .is(modelId)
-                                .and("fileId")
+                        Criteria.where("fileId")
                                 .is(dateFileId2)
                                 .and("账号")
                                 .is(account)
@@ -215,9 +213,7 @@ public class DataStaticAnalysisTotal extends Ops implements Runnable {
 //       "用户ID", "登录邮箱", "登录手机", "账户名称", "证件类型", "证件号", "可用余额", "注册时间", "绑定手机", "绑定银行卡", "对应的协查数据"));
             if (StringUtils.isNotBlank(dateFileId2)) {
                 List<DataMap> dataMaps = this.mongoTemplate.find((new Query(
-                        Criteria.where("modelId")
-                                .is(modelId)
-                                .and("fileId")
+                        Criteria.where("fileId")
                                 .is(dateFileId2)
                                 .and("用户ID")
                                 .is(account))), DataMap.class);
@@ -276,37 +272,42 @@ public class DataStaticAnalysisTotal extends Ops implements Runnable {
             //账户状态", "账号", "注册姓名", "注册时间", "注册身份证号", "绑定手机", "绑定状态", "开户行信息", "银行账号"
             if (CollectionUtils.isNotEmpty(accountList)) {
                 for (String s : accountList) {
-                    DataMap dataMap = havedUser.get(s);
+                    String s1 = s.split("-")[0];
+                    DataMap dataMap = havedUser.get(s1);
                     if (dataMap != null) {
                         DataMap newDataMap = new DataMap();
                         newDataMap.put("证件号", String.valueOf(dataMap.get("证件号码")));
-                        newDataMap.put("账户名称", String.valueOf(dataMap.get("交易主体户名")));
+                        newDataMap.put("账户名称", PublicStatic.checkStr(String.valueOf(dataMap.get("交易主体户名")))?s.split("-")[1]:String.valueOf(dataMap.get("交易主体户名")));
                         newDataMap.put("账号", String.valueOf(dataMap.get("交易主体账号")));
                         dataMaps.add(newDataMap);
                     } else {
                         if (StringUtils.isNotBlank(dateFileId2)) {
                             List<DataMap> dataMapnew = this.mongoTemplate.find((new Query(
-                                    Criteria.where("modelId")
-                                            .is(modelId)
-                                            .and("fileId")
+                                    Criteria.where("fileId")
                                             .is(dateFileId2)
                                             .and("账号")
-                                            .in(s))), DataMap.class);
+                                            .in(s1))), DataMap.class);
 
                             if (CollectionUtils.isNotEmpty(dataMapnew)) {
                                 for (DataMap map : dataMapnew) {
                                     DataMap newDataMap = new DataMap();
                                     newDataMap.put("证件号", String.valueOf(map.get("注册身份证号")));
-                                    newDataMap.put("账户名称", String.valueOf(map.get("注册姓名")));
+                                    newDataMap.put("账户名称", PublicStatic.checkStr(String.valueOf(map.get("注册姓名")))?s.split("-")[1]:String.valueOf(map.get("注册姓名")));
                                     newDataMap.put("账号", String.valueOf(map.get("账号")));
                                     dataMaps.add(newDataMap);
                                 }
+                            }else {
+                                DataMap newDataMap = new DataMap();
+                                newDataMap.put("证件号", "");
+                                newDataMap.put("账户名称", StringUtils.isBlank(String.valueOf(dataMaphm.get(s))) || "null".equals(String.valueOf(dataMaphm.get(s))) ? "" : String.valueOf(dataMaphm.get(s)));
+                                newDataMap.put("账号", s1);
+                                dataMaps.add(newDataMap);
                             }
                         } else {
                             DataMap newDataMap = new DataMap();
                             newDataMap.put("证件号", "");
                             newDataMap.put("账户名称", StringUtils.isBlank(String.valueOf(dataMaphm.get(s))) || "null".equals(String.valueOf(dataMaphm.get(s))) ? "" : String.valueOf(dataMaphm.get(s)));
-                            newDataMap.put("账号", s.split("-")[0]);
+                            newDataMap.put("账号", s1);
                             dataMaps.add(newDataMap);
                         }
                     }
@@ -345,7 +346,7 @@ public class DataStaticAnalysisTotal extends Ops implements Runnable {
                     newDataMap.put("fileId", newFileIdAll);
                     newDataMap.put("证件号", "");
                     newDataMap.put("账户名称", StringUtils.isBlank(String.valueOf(dataMaphm.get(s))) || "null".equals(String.valueOf(dataMaphm.get(s))) ? "" : String.valueOf(dataMaphm.get(s)));
-                    newDataMap.put("账号", s);
+                    newDataMap.put("账号", s.split("-")[0]);
                     needToSaveall.add(newDataMap);
                     alipayIdsAll.add(s);
                 }
@@ -356,52 +357,55 @@ public class DataStaticAnalysisTotal extends Ops implements Runnable {
             //账户状态", "账号", "注册姓名", "注册时间", "注册身份证号", "绑定手机", "绑定状态", "开户行信息", "银行账号"
             if (CollectionUtils.isNotEmpty(accountList)) {
                 for (String s : accountList) {
-                    DataMap dataMap = havedUser.get(s);
+                    String s1 = s.split("-")[0];
+                    DataMap dataMap = havedUser.get(s1);
                     if (dataMap != null) {
                         DataMap newDataMap = new DataMap();
                         newDataMap.put("证件号", String.valueOf(dataMap.get("证件号码")));
-                        newDataMap.put("账户名称", String.valueOf(dataMap.get("交易主体户名")));
+                        newDataMap.put("账户名称", PublicStatic.checkStr(String.valueOf(dataMap.get("交易主体户名")))? s.split("-")[1]:String.valueOf(dataMap.get("交易主体户名")));
                         newDataMap.put("账号", String.valueOf(dataMap.get("交易主体账号")));
                         dataMaps.add(newDataMap);
                     } else {
                         if (StringUtils.isNotBlank(dateFileId2)) {
                             List<DataMap> dataMapnew = this.mongoTemplate.find((new Query(
-                                    Criteria.where("modelId")
-                                            .is(modelId)
-                                            .and("fileId")
+                                    Criteria.where("fileId")
                                             .is(dateFileId2)
                                             .and("用户ID")
-                                            .in(accountList))), DataMap.class);
+                                            .in(s1))), DataMap.class);
                             if (CollectionUtils.isNotEmpty(dataMapnew)) {
                                 for (DataMap map : dataMapnew) {
                                     DataMap newDataMap = new DataMap();
                                     newDataMap.put("证件号", String.valueOf(map.get("证件号")));
-                                    newDataMap.put("账户名称", String.valueOf(map.get("账户名称")));
+                                    newDataMap.put("账户名称",  PublicStatic.checkStr(String.valueOf(dataMap.get("交易主体户名")))? s.split("-")[1]:String.valueOf(dataMap.get("交易主体户名")));
                                     newDataMap.put("账号", String.valueOf(map.get("用户ID")));
                                     dataMaps.add(newDataMap);
                                 }
+                            }else {
+                                DataMap newDataMap = new DataMap();
+                                newDataMap.put("证件号", "");
+                                newDataMap.put("账户名称", StringUtils.isBlank(String.valueOf(dataMaphm.get(s))) || "null".equals(String.valueOf(dataMaphm.get(s))) ? "" : String.valueOf(dataMaphm.get(s)));
+                                newDataMap.put("账号", s1);
+                                dataMaps.add(newDataMap);
                             }
-
                         } else {
                             DataMap newDataMap = new DataMap();
-                            newDataMap.put("fileId", newFileIdAll);
                             newDataMap.put("证件号", "");
                             newDataMap.put("账户名称", StringUtils.isBlank(String.valueOf(dataMaphm.get(s))) || "null".equals(String.valueOf(dataMaphm.get(s))) ? "" : String.valueOf(dataMaphm.get(s)));
-                            newDataMap.put("账号", s);
+                            newDataMap.put("账号", s1);
                             dataMaps.add(newDataMap);
                         }
                     }
                 }
                 if (CollectionUtils.isNotEmpty(dataMaps)) {
                     for (DataMap dataMap : dataMaps) {
-                        if (!PublicStatic.checkStr(String.valueOf(dataMap.get("用户ID"))) && !alipayIdsAll.contains(String.valueOf(dataMap.get("用户ID")))) {
+                        if (!PublicStatic.checkStr(String.valueOf(dataMap.get("账号"))) && !alipayIdsAll.contains(String.valueOf(dataMap.get("账号")))) {
                             DataMap newDataMap = new DataMap();
                             newDataMap.put("fileId", newFileIdAll);
                             newDataMap.put("证件号", String.valueOf(dataMap.get("证件号")));
                             newDataMap.put("账户名称", String.valueOf(dataMap.get("账户名称")));
                             newDataMap.put("账号", String.valueOf(dataMap.get("账号")));
                             needToSaveall.add(newDataMap);
-                            alipayIdsAll.add(String.valueOf(dataMap.get("用户ID")));
+                            alipayIdsAll.add(String.valueOf(dataMap.get("账号")));
                         }
                     }
                 } else {
@@ -411,7 +415,7 @@ public class DataStaticAnalysisTotal extends Ops implements Runnable {
                             newDataMap.put("fileId", newFileIdAll);
                             newDataMap.put("证件号", "");
                             newDataMap.put("账户名称", StringUtils.isBlank(String.valueOf(dataMaphm.get(s))) || "null".equals(String.valueOf(dataMaphm.get(s))) ? "" : String.valueOf(dataMaphm.get(s)));
-                            newDataMap.put("账号", s);
+                            newDataMap.put("账号", s.split("-")[0]);
                             needToSaveall.add(newDataMap);
                             alipayIdsAll.add(s);
                         }

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

@@ -190,7 +190,6 @@ public class DataStaticService extends Ops {
                 dataMaps1.add(map);
                 dsMap.put(key,dataMaps1);
             }
-
             //存储主体账号
             Set<String> strings = zh.get(key);
             if(CollectionUtils.isEmpty(strings)){
@@ -226,6 +225,7 @@ public class DataStaticService extends Ops {
             }
             String jdlx = String.valueOf(map.get("借贷类型"));
             if (!jdlx.equals("借") && !jdlx.equals("贷")) {
+                log.error("借贷类型有误");
                 continue;
             }
 

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

@@ -133,9 +133,7 @@ public class TenpayTrades extends Ops implements Runnable {
                             List<DataMap> dataMaps = userMap.get(account);
                             if (CollectionUtils.isEmpty(dataMaps)) {
                                 dataMaps = this.mongoTemplate.find((new Query(
-                                        Criteria.where("modelId")
-                                                .is(modelId)
-                                                .and("fileId")
+                                        Criteria.where("fileId")
                                                 .is(dateFileId2)
                                                 .and("账号")
                                                 .is(account))), DataMap.class);
@@ -245,9 +243,7 @@ public class TenpayTrades extends Ops implements Runnable {
                             List<DataMap> dataMaps = userMap.get(account);
                             if (CollectionUtils.isEmpty(dataMaps)) {
                                 dataMaps = this.mongoTemplate.find((new Query(
-                                        Criteria.where("modelId")
-                                                .is(modelId)
-                                                .and("fileId")
+                                        Criteria.where("fileId")
                                                 .is(dateFileId2)
                                                 .and("账号")
                                                 .is(account))), DataMap.class);