Эх сурвалжийг харах

调整经侦数据导入问题

hankunkun 10 сар өмнө
parent
commit
0cf6e618b0

+ 8 - 11
src/main/java/ieven/server/webapp/service/alipay/AntiSecurityTrade3.java

@@ -55,27 +55,24 @@ public class AntiSecurityTrade3 extends Ops implements Runnable {
         String dateFileId2 = getFileId("治安数据-订单明细", modelId, mongoTemplate);
         String dateFileId2 = getFileId("治安数据-订单明细", modelId, mongoTemplate);
         String dateFileId3 = getFileId("经侦数据-订单明细", modelId, mongoTemplate);
         String dateFileId3 = getFileId("经侦数据-订单明细", modelId, mongoTemplate);
 
 
-        // 遍历登录日志全表
-        if (StringUtils.isNotBlank(dateFileId1) || StringUtils.isNotBlank(dateFileId2) || StringUtils.isNotBlank(dateFileId3)) {
-
+        if(StringUtils.isNotBlank(dateFileId1)){
             MongoCursor<Document> cursor1 = getCursor(dateFileId1, mongoTemplate);
             MongoCursor<Document> cursor1 = getCursor(dateFileId1, mongoTemplate);
             if (cursor1.hasNext()) {
             if (cursor1.hasNext()) {
-                antiSecurityFileId = antiSecurityFileId();
+                antiSecurityFileId = StringUtils.isBlank(antiSecurityFileId)?antiSecurityFileId():antiSecurityFileId;
                 insertData1(cursor1, antiSecurityFileId);
                 insertData1(cursor1, antiSecurityFileId);
             }
             }
+        }
+        if (StringUtils.isNotBlank(dateFileId2) ) {
             MongoCursor<Document> cursor2 = getCursor(dateFileId2, mongoTemplate);
             MongoCursor<Document> cursor2 = getCursor(dateFileId2, mongoTemplate);
             if (cursor2.hasNext()) {
             if (cursor2.hasNext()) {
-                if (StringUtils.isBlank(antiSecurityFileId)) {
-                    antiSecurityFileId = antiSecurityFileId();
-                }
+                antiSecurityFileId = StringUtils.isBlank(antiSecurityFileId)?antiSecurityFileId():antiSecurityFileId;
                 insertData2(cursor2, antiSecurityFileId);
                 insertData2(cursor2, antiSecurityFileId);
             }
             }
-
+        }
+        if(StringUtils.isNotBlank(dateFileId3)){
             MongoCursor<Document> cursor3 = getCursor(dateFileId3, mongoTemplate);
             MongoCursor<Document> cursor3 = getCursor(dateFileId3, mongoTemplate);
             if (cursor3.hasNext()) {
             if (cursor3.hasNext()) {
-                if (StringUtils.isBlank(antiSecurityFileId)) {
-                    antiSecurityFileId = antiSecurityFileId();
-                }
+                antiSecurityFileId = StringUtils.isBlank(antiSecurityFileId)?antiSecurityFileId():antiSecurityFileId;
                 insertData3(cursor3, antiSecurityFileId);
                 insertData3(cursor3, antiSecurityFileId);
             }
             }
         }
         }