浏览代码

代码重构

tom.xu@informa.com 2 年之前
父节点
当前提交
4d4ae4572c
共有 2 个文件被更改,包括 20 次插入2 次删除
  1. 15 1
      src/main/java/ieven/server/webapp/api/AlipayController.java
  2. 5 1
      src/main/resources/props.json

+ 15 - 1
src/main/java/ieven/server/webapp/api/AlipayController.java

@@ -8,6 +8,7 @@ import ieven.server.webapp.domain.data.DataMap;
 import ieven.server.webapp.domain.data.DataService;
 import ieven.server.webapp.domain.data.Fields;
 import ieven.server.webapp.domain.exporter.Exporter;
+import ieven.server.webapp.domain.file.LogicalFile;
 import ieven.server.webapp.infrastructure.wrapper.Mapped;
 import ieven.server.webapp.service.alipay.AlipayService;
 import org.bson.Document;
@@ -160,6 +161,20 @@ public class AlipayController {
     } else {
       String filename = input.getFilename();
       String fileId = input.getFileId();
+      Query query =
+          new Query(
+              Criteria.where("modelId")
+                  .is(input.getModelId())
+                  .and("generated")
+                  .is(Boolean.TRUE)
+                  .and("filename")
+                  .in("反诈治安-交易明细", "五联单-账户明细", "财付通-交易明细"));
+      List<LogicalFile> resultList = this.mongoTemplate.find(query, LogicalFile.class);
+      List<String> fileids = new ArrayList<>();
+      for (LogicalFile logicalFile : resultList) {
+        fileids.add(logicalFile.getId());
+      }
+
       Criteria criteria = this.resolveDetailQuery(filename, fileId, null, null);
       if (criteria == null) {
         return Mapped.ERROR("未查询到明细");
@@ -191,7 +206,6 @@ public class AlipayController {
       if (fileIds.size() <= 1) {
         return null;
       }
-
       criteria.in(fileIds);
     }
 

+ 5 - 1
src/main/resources/props.json

@@ -253,6 +253,10 @@
     "五联单-收货地址分析": "true",
     "五联单-IP地址分析": "true",
     "财付通-账户透视": "true",
-    "财付通-对手透视": "true"
+    "财付通-对手透视": "true",
+    "反诈治安-交易明细": "true",
+    "五联单-转账分析": "true",
+    "五联单-账户明细": "true",
+    "财付通-交易明细": "true"
   }
 }