增加反诈治安新的格式

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

@@ -84,6 +84,7 @@ public class DataStaticAnalysisDs extends Ops implements Runnable {
                         dataMap.put("共同交易主体数", 0);
                         dataMap.put("共同交易主体账号汇总", "");
                         dataMap.put("来源", "财付通");
+                        dataMap.put("共同交易主体户名汇总", 0);
                         idToData.put(alipayId, dataMap);
                     }
                     String alipayUsername = origin.getString("交易对手户名");
@@ -163,11 +164,14 @@ public class DataStaticAnalysisDs extends Ops implements Runnable {
                     if (CollectionUtils.isNotEmpty(mainIds)) {
                         value.put("共同交易主体数", mainIds.size());
                         String str="";
+                        Set<String>jyzthm = new HashSet<>();
                         for (String mainId : mainIds) {
                             Set<String> strings = hm.get(mainId);
+                            jyzthm.addAll(strings);
                             str+=CollectionUtils.isEmpty(strings)?mainId+";":mainId+"("+StringUtils.join(strings, ",")+");";
                         }
                         value.put("共同交易主体账号汇总", str);
+                        value.put("共同交易主体户名汇总", jyzthm.size());
                     }
                     DataMap dataMap = entry.getValue();
                     BigDecimal money1 = (BigDecimal) dataMap.get("交易总额");
@@ -214,6 +218,7 @@ public class DataStaticAnalysisDs extends Ops implements Runnable {
                         dataMap.put("交易主体支出笔数", 0);
                         dataMap.put("总笔数", 0);
                         dataMap.put("共同交易主体数", 0);
+                        dataMap.put("共同交易主体户名汇总", 0);
                         dataMap.put("来源", "反诈");
 
                         idToData.put(alipayId, dataMap);
@@ -268,6 +273,7 @@ public class DataStaticAnalysisDs extends Ops implements Runnable {
                             hm.put(alipayId, mainIds);
                         }
                     }
+
                     if (idToMainIds.containsKey(alipayId)) {
                         Set<String> mainIds = idToMainIds.get(alipayId);
                         mainIds.add(mainId);
@@ -290,14 +296,18 @@ public class DataStaticAnalysisDs extends Ops implements Runnable {
                         value.put("交易对手户名", StringUtils.join(names, ";"));
                     }
                     Set<String> mainIds = idToMainIds.get(key);
+
                     if (CollectionUtils.isNotEmpty(mainIds)) {
                         value.put("共同交易主体数", mainIds.size());
                         String str="";
+                        Set<String>jyzthm = new HashSet<>();
                         for (String mainId : mainIds) {
                             Set<String> strings = hm.get(mainId);
+                            jyzthm.addAll(strings);
                             str+=CollectionUtils.isEmpty(strings)?mainId+";":mainId+"("+StringUtils.join(strings, ",")+");";
                         }
                         value.put("共同交易主体账号汇总", str);
+                        value.put("共同交易主体户名汇总", jyzthm.size());
                     }
                     DataMap dataMap = entry.getValue();
                     BigDecimal money1 = (BigDecimal) dataMap.get("交易总额");
@@ -346,6 +356,7 @@ public class DataStaticAnalysisDs extends Ops implements Runnable {
                         dataMap.put("总笔数", 0);
                         dataMap.put("共同交易主体数", 0);
                         dataMap.put("共同交易主体账号汇总", "");
+                        dataMap.put("共同交易主体户名汇总", 0);
                         dataMap.put("来源", "五联单");
                         idToData.put(alipayId, dataMap);
                     }
@@ -423,12 +434,16 @@ public class DataStaticAnalysisDs extends Ops implements Runnable {
                     if (CollectionUtils.isNotEmpty(mainIds)) {
                         value.put("共同交易主体数", mainIds.size());
                         String str="";
+                        Set<String>jyzthm = new HashSet<>();
                         for (String mainId : mainIds) {
                             Set<String> strings = hm.get(mainId);
+                            jyzthm.addAll(strings);
                             str+=CollectionUtils.isEmpty(strings)?mainId+";":mainId+"("+StringUtils.join(strings, ",")+");";
                         }
                         value.put("共同交易主体账号汇总", str);
+                        value.put("共同交易主体户名汇总", jyzthm.size());
                     }
+
                     DataMap dataMap = entry.getValue();
                     BigDecimal money1 = (BigDecimal) dataMap.get("交易总额");
                     dataMap.put("交易总额", money1.doubleValue());

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

@@ -172,14 +172,18 @@ public class DataStaticService extends Ops {
             query.addCriteria(Criteria.where("交易时间").gte(staticModelInput.getJysjStart()).lte(staticModelInput.getJysjEnd()));
         }
         List<String> strings1 = SplitCharacterEnum.splitByCharacter(staticModelInput.getJyztzhds());
+
+        if(null==staticModelInput.getStartNum()){
+            staticModelInput.setStartNum(2);
+        }
         if (null != staticModelInput.getStartNum() || null != staticModelInput.getEndNum()) {
             Query queryDs = new Query();
             if (null != staticModelInput.getStartNum()) {
-                query.addCriteria(Criteria.where("共同交易主体数").gte(staticModelInput.getStartNum()));
+                query.addCriteria(Criteria.where("共同交易主体户名汇总").gte(staticModelInput.getStartNum()));
             } else if (null != staticModelInput.getEndNum()) {
-                query.addCriteria(Criteria.where("共同交易主体数").lte(staticModelInput.getStartNum()));
+                query.addCriteria(Criteria.where("共同交易主体户名汇总").lte(staticModelInput.getStartNum()));
             } else if (null != staticModelInput.getStartNum() && null != staticModelInput.getEndNum()) {
-                query.addCriteria(Criteria.where("共同交易主体数").gte(staticModelInput.getStartNum()).lte(staticModelInput.getStartNum()));
+                query.addCriteria(Criteria.where("共同交易主体户名汇总").gte(staticModelInput.getStartNum()).lte(staticModelInput.getStartNum()));
             }
             query.addCriteria(Criteria.where("fileId").is(dateFileIdDs));
             List<DataMap> dataDsList = this.mongoTemplate.find(queryDs, DataMap.class);
@@ -193,6 +197,7 @@ public class DataStaticService extends Ops {
 
             }
         }
+
         if (CollectionUtils.isNotEmpty(strings1)) {
             query.addCriteria(Criteria.where("交易对手账号").in(Objects.requireNonNull(strings1)));
         }
@@ -207,7 +212,7 @@ public class DataStaticService extends Ops {
 
         Map<String, List<DataMap>> dsMap = new HashMap<>();
 
-        Map<String, Set<String>> zh = new HashMap<>();
+     /*   Map<String, Set<String>> zh = new HashMap<>();
         for (DataMap map : dataMapDetail) {
             String jydszh = String.valueOf(map.get("交易对手账号"));
             String jyzthm = String.valueOf(map.get("交易主体户名"));
@@ -236,12 +241,12 @@ public class DataStaticService extends Ops {
                 List<DataMap> dataMaps1 = dsMap.get(entry.getKey());
                 newList.addAll(dataMaps1);
             }
-        }
+        }*/
 
         List<String> userList = new ArrayList<>();
         List<String> usermcList = new ArrayList<>();
         List<String> userAllList = new ArrayList<>();
-        for (DataMap map : newList) {
+        for (DataMap map : dataMapDetail) {
             String jythm = String.valueOf(map.get("交易主体户名"));
             String jydszh = String.valueOf(map.get("交易对手账号"));
             if (StringUtils.isBlank(jythm) || "null".equals(jythm)) {