hankunkun 7 сар өмнө
parent
commit
dadfc2169a

+ 18 - 15
src/main/java/ieven/server/webapp/service/datastatic/DataStaticAnalysisTotal.java

@@ -60,24 +60,26 @@ public class DataStaticAnalysisTotal extends Ops implements Runnable {
         List<DataMap> needToSave = new ArrayList<>(1000);
         Map<String, DataMap> idToData = new HashMap<>();
         Map<String, Set<String>> idToNames = new HashMap<>();
-        boolean cftflag = true;
-        boolean wldflag = true;
-        boolean wldjzyflag = true;
+
+        Set<String>jyztzh=new HashSet<>();
         if (StringUtils.isNotBlank(cft)) {
             MongoCursor<Document> cursor = getCursor(cft, mongoTemplate);
             Document origin;
             while (cursor.hasNext()) {
-                cftflag = false;
                 origin = cursor.next();
                 DataMap dataMap = new DataMap();
+                String zh=PublicStatic.removeStr(origin.getString("账号"));
                 dataMap.put("fileId", newFileId);
-                dataMap.put("交易主体账号", PublicStatic.removeStr(origin.getString("账号")));
+                dataMap.put("交易主体账号", zh);
                 dataMap.put("交易主体户名", PublicStatic.removeStr(origin.getString("注册姓名")));
                 dataMap.put("证件号码", PublicStatic.removeStr(origin.getString("注册身份证号")));
                 dataMap.put("绑定银行卡号", PublicStatic.removeStr(origin.getString("银行账号")));
                 dataMap.put("开户银行名称", PublicStatic.removeStr(origin.getString("开户行信息")));
                 dataMap.put("绑定手机号", PublicStatic.removeStr(origin.getString("绑定手机")));
                 dataMap.put("注册时间", PublicStatic.removeStr(origin.getString("注册时间")));
+                if(StringUtils.isNotBlank(zh)){
+                    jyztzh.add(zh);
+                }
                 needToSave.add(dataMap);
                 if (needToSave.size() >= 1000) {
                     saveLines(needToSave, mongoTemplate);
@@ -126,17 +128,19 @@ public class DataStaticAnalysisTotal extends Ops implements Runnable {
             Document origin;
             while (cursor.hasNext()) {
                 origin = cursor.next();
-                wldflag = false;
                 DataMap dataMap = new DataMap();
                 dataMap.put("fileId", newFileId);
-                dataMap.put("交易主体账号", PublicStatic.removeStr(origin.getString("用户ID")));
+                String zh=PublicStatic.removeStr(origin.getString("用户ID"));
+                dataMap.put("交易主体账号", zh);
                 dataMap.put("交易主体户名", PublicStatic.removeStr(origin.getString("账户名称")));
                 dataMap.put("证件号码", PublicStatic.removeStr(origin.getString("证件号")));
                 dataMap.put("绑定银行卡号", PublicStatic.removeStr(origin.getString("绑定卡号")));
                 dataMap.put("开户银行名称", PublicStatic.removeStr(origin.getString("银行简称")));
                 dataMap.put("绑定手机号", PublicStatic.removeStr(origin.getString("绑定手机")));
                 dataMap.put("注册时间", PublicStatic.removeStr(origin.getString("注册时间")));
-
+                if(StringUtils.isNotBlank(zh)){
+                    jyztzh.add(zh);
+                }
                 needToSave.add(dataMap);
                 if (needToSave.size() >= 500) {
                     saveLines(needToSave, mongoTemplate);
@@ -186,10 +190,10 @@ public class DataStaticAnalysisTotal extends Ops implements Runnable {
             Document origin;
             while (cursor.hasNext()) {
                 origin = cursor.next();
-                wldjzyflag = false;
                 DataMap dataMap = new DataMap();
                 dataMap.put("fileId", newFileId);
-                dataMap.put("交易主体账号", PublicStatic.removeStr(origin.getString("用户ID")));
+                String zh=PublicStatic.removeStr(origin.getString("用户ID"));
+                dataMap.put("交易主体账号", zh);
                 dataMap.put("交易主体户名", PublicStatic.removeStr(origin.getString("账户名称")));
                 dataMap.put("证件号码", PublicStatic.removeStr(origin.getString("证件号码")));
                 dataMap.put("绑定银行卡号", PublicStatic.removeStr(origin.getString("绑定卡号")));
@@ -197,6 +201,9 @@ public class DataStaticAnalysisTotal extends Ops implements Runnable {
                 dataMap.put("绑定手机号", PublicStatic.removeStr(origin.getString("绑定手机号")));
                 dataMap.put("注册时间", PublicStatic.removeStr(origin.getString("注册时间")));
 
+                if(StringUtils.isNotBlank(zh)){
+                    jyztzh.add(zh);
+                }
                 needToSave.add(dataMap);
                 if (needToSave.size() >= 500) {
                     saveLines(needToSave, mongoTemplate);
@@ -331,11 +338,7 @@ public class DataStaticAnalysisTotal extends Ops implements Runnable {
                 BeanUtil.copyProperties(dataMap, dataMap1);
                 dataMap1.put("fileId", newFileId1);
                 needToSave.add(dataMap1);
-                if (type.equals("财付通") && cftflag) {
-                    needToSave.add(dataMap);
-                } else if (type.equals("五联单") && wldflag) {
-                    needToSave.add(dataMap);
-                } else if (type.equals("经侦云") && wldjzyflag) {
+                if ((type.equals("财付通")||type.equals("五联单")||type.equals("经侦云"))&&!jyztzh.contains(id)) {
                     needToSave.add(dataMap);
                 } else if(type.equals("反诈")){
                     needToSave.add(dataMap);