tom.xu@informa.com před 2 roky
rodič
revize
3b1a74fb92

+ 4 - 3
src/main/java/ieven/server/webapp/domain/exporter/Exporter.java

@@ -41,13 +41,14 @@ public class Exporter {
     String date = DataUtils.currentDate().replaceAll(":", "_");
     String filename = "查询结果" + date + ".xlsx";
     LogicalFile logicalFile =
-        mongoTemplate.findOne(new Query(Criteria.where("id").is(fileId)), LogicalFile.class);
+        mongoTemplate.findOne(
+            new Query(Criteria.where("id").is(fields.getFileId())), LogicalFile.class);
     if (logicalFile != null) {
-      filename = logicalFile.getFilename() + ".xlsx";
+      filename = logicalFile.getFilename() + date + ".xlsx";
     }
     if (StringUtils.isNotBlank(modelId)) {
       Model model = mongoTemplate.findOne(new Query(Criteria.where("id").is(modelId)), Model.class);
-      filename = model.getModelName() + ".xlsx";
+      filename = model.getModelName() + date + ".xlsx";
     }
     /*if (fields == null) {
       return "";

+ 16 - 2
src/main/java/ieven/server/webapp/service/Ops.java

@@ -105,8 +105,22 @@ public class Ops {
     InsertManyOptions options = new InsertManyOptions();
     options.ordered(false);
     try {
-      mongoTemplate.getCollection("data").insertMany(manyList, options);
-    } catch (MongoBulkWriteException | DuplicateKeyException ignored) {
+      List<Document> batchInsertList = new ArrayList<>();
+      int k = 0;
+      for (Document document : manyList) {
+        batchInsertList.add(document);
+        k++;
+        if (k >= 1000) {
+          mongoTemplate.getCollection("data").insertMany(batchInsertList, options);
+          batchInsertList = new ArrayList<>();
+          k = 0;
+        }
+      }
+      if (batchInsertList.size() > 0) {
+        mongoTemplate.getCollection("data").insertMany(batchInsertList, options);
+      }
+    } catch (Exception exception) {
+      exception.printStackTrace();
     }
   }
 

+ 0 - 1
src/main/java/ieven/server/webapp/service/alipay/AntiSecurityTrade4.java

@@ -46,7 +46,6 @@ public class AntiSecurityTrade4 extends Ops implements Runnable {
     String dateFileId = getFileId("治安数据-订单明细", modelId, mongoTemplate);
     // 遍历登录日志全表
     if (StringUtils.isNotBlank(dateFileId)) {
-
       MongoCursor<Document> cursor = getCursor(dateFileId, mongoTemplate);
       if (cursor.hasNext()) {
         antiSecurityFileId =