新增新格式订单明细

src/main/java/ieven/server/webapp/domain/alipay/HeaderProperties.java

@@ -36,6 +36,8 @@ public class HeaderProperties {
 
   private List<String>blackOrder;
   private List<String>blackOrderOutput;
+  private List<String>antiCheatTwo;
+  private List<String>antiCheatTwoOutput;
 
   public HeaderProperties() {}
 

src/main/java/ieven/server/webapp/domain/file/FileService.java

@@ -65,7 +65,7 @@ public class FileService {
     @Value("${spring.data.fileExportPath}")
     private String fileUploadPath;
 
-    String[] order1 = {"反诈数据-订单明细", "治安数据-订单明细", "经侦数据-订单明细", "网黑数据-订单明细", "反诈治安-交易明细", "反诈治安-账户透视", "反诈治安-对手透视"};
+    String[] order1 = {"反诈数据-订单明细","反诈数据-订单明细2", "治安数据-订单明细", "经侦数据-订单明细", "网黑数据-订单明细", "反诈治安-交易明细", "反诈治安-账户透视", "反诈治安-对手透视"};
     String[] order2 = {
             "五联单-注册信息",
             "五联单-登录日志",

src/main/java/ieven/server/webapp/service/alipay/AlipayService.java

@@ -99,6 +99,13 @@ public class AlipayService {
                 new BlackOrder(
                         headerProperties, originFields, modelId, mongoTemplate, fileService, latch15));
         latch15.await();
+
+        //反诈治安-订单明细2
+        CountDownLatch latch16 = new CountDownLatch(1);
+        exec.execute(
+                new AntiCheatTwo(
+                        headerProperties, originFields, modelId, mongoTemplate, fileService, latch16));
+        latch16.await();
         log.info("latch");
         log.info("latch2");
         CountDownLatch latch2 = new CountDownLatch(7);

src/main/java/ieven/server/webapp/service/alipay/AntiCheatTwo.java

@@ -0,0 +1,63 @@
+package ieven.server.webapp.service.alipay;
+
+import com.mongodb.client.MongoCursor;
+import ieven.server.webapp.domain.alipay.HeaderProperties;
+import ieven.server.webapp.domain.data.DataMap;
+import ieven.server.webapp.domain.data.Fields;
+import ieven.server.webapp.domain.file.FileService;
+import ieven.server.webapp.service.Ops;
+import org.apache.commons.collections4.CollectionUtils;
+import org.bson.Document;
+import org.springframework.data.mongodb.core.MongoTemplate;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+
+public class AntiCheatTwo extends Ops implements Runnable {
+    private HeaderProperties headerProperties;
+    List<Fields> originFields;
+    String modelId;
+    MongoTemplate mongoTemplate;
+    FileService fileService;
+    CountDownLatch latch;
+
+    public AntiCheatTwo(HeaderProperties headerProperties, List<Fields> originFields, String modelId, MongoTemplate mongoTemplate, FileService fileService, CountDownLatch latch) {
+        this.headerProperties = headerProperties;
+        this.originFields = originFields;
+        this.modelId = modelId;
+        this.mongoTemplate = mongoTemplate;
+        this.fileService = fileService;
+        this.latch = latch;
+    }
+
+    @Override
+    public void run() {
+        List<String> headers = headerProperties.getEconomicOrder();
+        List<String> outputHeaders = headerProperties.getEconomicOrderOutput();
+        List<Fields> matched = matchHeaders(originFields, headers);
+        if (CollectionUtils.isNotEmpty(matched)) {
+            String newFileId = createLogicAndDeleteOld("经侦数据-订单明细2", modelId, outputHeaders, mongoTemplate, fileService);
+            for (Fields fields : matched) {
+                String fileId = fields.getFileId();
+                MongoCursor<Document> cursor = getCursor(fileId, mongoTemplate);
+                Document originDoc;
+                List<DataMap> needToSave = new ArrayList<>(1000);
+                while (cursor.hasNext()) {
+                    originDoc = cursor.next();
+                    // 拷贝到新的
+                    DataMap newDoc = initWithOrigin(originDoc, newFileId);
+                    needToSave.add(newDoc);
+                    if (needToSave.size() >= 1000) {
+                        saveLines(new ArrayList<>(needToSave), mongoTemplate);
+                        needToSave.clear();
+                    }
+                }
+                if (CollectionUtils.isNotEmpty(needToSave)) {
+                    saveLines(needToSave, mongoTemplate);
+                }
+            }
+        }
+        latch.countDown();
+    }
+}

src/main/java/ieven/server/webapp/service/alipay/AntiSecurityTrade3.java

@@ -55,6 +55,7 @@ public class AntiSecurityTrade3 extends Ops implements Runnable {
         String dateFileId2 = getFileId("治安数据-订单明细", modelId, mongoTemplate);
         String dateFileId3 = getFileId("经侦数据-订单明细", modelId, mongoTemplate);
         String dateFileId4 = getFileId("网黑数据-订单明细", modelId, mongoTemplate);
+        String dateFileId5 = getFileId("反诈数据-订单明细2", modelId, mongoTemplate);
 
         if(StringUtils.isNotBlank(dateFileId1)){
             MongoCursor<Document> cursor1 = getCursor(dateFileId1, mongoTemplate);
@@ -84,6 +85,14 @@ public class AntiSecurityTrade3 extends Ops implements Runnable {
                 insertData4(cursor4, antiSecurityFileId);
             }
         }
+
+        if(StringUtils.isNotBlank(dateFileId5)){
+            MongoCursor<Document> cursor5 = getCursor(dateFileId5, mongoTemplate);
+            if (cursor5.hasNext()) {
+                antiSecurityFileId = StringUtils.isBlank(antiSecurityFileId)?antiSecurityFileId():antiSecurityFileId;
+                insertData5(cursor5, antiSecurityFileId);
+            }
+        }
         latch.countDown();
     }
 
@@ -331,6 +340,11 @@ public class AntiSecurityTrade3 extends Ops implements Runnable {
             dataMap.put("交易流水号", originDoc.getString("银行外部渠道交易流水号"));
             dataMap.put("备注", originDoc.getString("备注"));
             dataMap.put("币种", originDoc.getString("币种"));
+            dataMap.put("交易设备类型", originDoc.getString("交易设备类型"));
+            dataMap.put("交易支付设备IP", originDoc.getString("交易支付设备IP"));
+            dataMap.put("MAC地址", originDoc.getString("MAC地址"));
+            dataMap.put("交易地点经度", originDoc.getString("交易地点经度"));
+            dataMap.put("交易地点纬度", originDoc.getString("交易地点纬度"));
 
             if (f1.equals("贷")) {
                 dataMap.put("交易对手账号", originDoc.getString("付款方支付帐号"));
@@ -519,4 +533,99 @@ public class AntiSecurityTrade3 extends Ops implements Runnable {
             saveLines(needToSave, mongoTemplate);
         }
     }
+
+    public void insertData5(MongoCursor<Document> cursor, String antiSecurityFileId) {
+        Document originDoc;
+        List<DataMap> needToSave = new ArrayList<>(1000);
+        Map<String, Object> dataMapUser = new HashMap<>();
+        while (cursor.hasNext()) {
+            originDoc = cursor.next();
+            DataMap dataMap = new DataMap();
+            dataMap.put("fileId", antiSecurityFileId);
+            dataMap.put("交易主体账号", originDoc.getString("查询账号"));
+            dataMap.put("支付订单号", originDoc.getString("支付机构内部订单号"));
+            String f1 = originDoc.getString("借贷标志");
+            dataMap.put("交易金额", originDoc.getString("交易金额"));
+            dataMap.put("交易余额", originDoc.getString("交易余额"));
+            dataMap.put("交易类型", originDoc.getString("交易类型"));
+            dataMap.put("交易时间", originDoc.getString("交易时间"));
+            dataMap.put("银行类型", originDoc.getString("支付类型"));
+            dataMap.put("交易流水号", originDoc.getString("银行外部渠道交易流水号"));
+            dataMap.put("备注", originDoc.getString("备注"));
+            dataMap.put("币种", originDoc.getString("币种"));
+            dataMap.put("交易设备类型", originDoc.getString("设备类型"));
+            dataMap.put("交易支付设备IP", originDoc.getString("设备IP"));
+            dataMap.put("MAC地址", originDoc.getString("MAC地址"));
+            dataMap.put("交易地点经度", originDoc.getString("交易地点经度"));
+            dataMap.put("交易地点纬度", originDoc.getString("交易地点纬度"));
+
+            if (f1.equals("贷")) {
+                dataMap.put("交易对手账号", originDoc.getString("付款方支付帐号"));
+                dataMap.put("交易对手银行名称", originDoc.getString("付款方银行卡所属行"));
+                dataMap.put("交易对手银行卡号", originDoc.getString("付款方银行卡号"));
+                dataMap.put("交易主体银行名称", originDoc.getString("收款方银行卡所属行"));
+                dataMap.put("交易主体银行卡号", originDoc.getString("收款方银行卡号"));
+                dataMap.put("交易主体户名", originDoc.getString("收款方的商户名称"));
+                dataMap.put("交易主体的出入账标识", "入账");
+                String jyztzh = String.valueOf(originDoc.getString("查询账号"));
+                String jyztzhhm = String.valueOf(originDoc.getString("收款方的商户名称"));
+                if (StringUtils.isNotBlank(jyztzh) && !"null".equals(jyztzh) && StringUtils.isNotBlank(jyztzhhm) && !"null".equals(jyztzhhm)) {
+                    dataMapUser.put(jyztzh, jyztzhhm);
+                }
+            }
+            if (f1.equals("借")) {
+                dataMap.put("交易主体银行名称", originDoc.getString("付款方银行卡所属行"));
+                dataMap.put("交易主体银行卡号", originDoc.getString("付款方银行卡号"));
+                dataMap.put("交易对手账号", originDoc.getString("收款方支付帐号"));
+                dataMap.put("交易对手银行名称", originDoc.getString("收款方银行卡所属行"));
+                dataMap.put("交易对手银行卡号", originDoc.getString("收款方银行卡号"));
+                dataMap.put("交易对手户名", originDoc.getString("收款方的商户名称"));
+                dataMap.put("交易主体的出入账标识", "出账");
+                String jyztzh = String.valueOf(originDoc.getString("收款方支付帐号"));
+                String jyztzhhm = String.valueOf(originDoc.getString("收款方的商户名称"));
+                if (StringUtils.isNotBlank(jyztzh) && !"null".equals(jyztzh) && StringUtils.isNotBlank(jyztzhhm) && !"null".equals(jyztzhhm)) {
+                    dataMapUser.put(jyztzh, jyztzhhm);
+                }
+            }
+            String jyzthm = String.valueOf(dataMap.get("交易主体户名"));
+            if (StringUtils.isBlank(jyzthm) || "-".equals(jyzthm) || "null".equals(jyzthm)) {
+                String account = (String) dataMap.getOrDefault("交易主体账号", "");
+                if (StringUtils.isBlank(account) || "-".equals(account)) {
+                } else {
+                    String newName = accountToName.getOrDefault(account, "");
+                    if (StringUtils.isNotBlank(newName)) {
+                        dataMap.put("交易主体户名", PublicStatic.specialFormatStr(newName));
+                    } else {
+                        dataMap.put("交易主体户名", PublicStatic.specialFormatStr(String.valueOf(dataMapUser.get(account))));
+                    }
+                }
+            } else {
+                dataMap.put("交易主体户名", PublicStatic.specialFormatStr(jyzthm));
+            }
+            String value = String.valueOf(dataMap.get("交易对手户名"));
+            if (StringUtils.isBlank(value) || "-".equals(value) || "null".equals(value)) {
+                String account = (String) dataMap.getOrDefault("交易对手账号", "");
+                if (StringUtils.isBlank(account) || "-".equals(account)) {
+                } else {
+                    String newName = accountToName.getOrDefault(account, "");
+                    if (StringUtils.isNotBlank(newName)) {
+                        dataMap.put("交易对手户名", PublicStatic.specialFormatStr(newName));
+                    } else {
+                        dataMap.put("交易对手户名", PublicStatic.specialFormatStr(String.valueOf(dataMapUser.get(account))));
+                    }
+                }
+            } else {
+                dataMap.put("交易对手户名", PublicStatic.specialFormatStr(value));
+            }
+
+            needToSave.add(dataMap);
+            if (needToSave.size() >= 1000) {
+                saveLines(new ArrayList<>(needToSave), mongoTemplate);
+                needToSave.clear();
+            }
+        }
+        if (CollectionUtils.isNotEmpty(needToSave)) {
+            saveLines(needToSave, mongoTemplate);
+        }
+    }
 }

src/main/resources/application.properties

@@ -53,5 +53,7 @@ headers.static-user-all-output=\u8bc1\u4ef6\u53f7,\u8d26\u6237\u540d\u79f0,\u8d2
 headers.user-account-output=\u652f\u4ed8\u8ba2\u5355\u53f7,\u4ea4\u6613\u6d41\u6c34\u53f7,\u4ea4\u6613\u4e3b\u4f53\u94f6\u884c\u540d\u79f0,\u4ea4\u6613\u4e3b\u4f53\u8d26\u53f7,\u4ea4\u6613\u4e3b\u4f53\u94f6\u884c\u5361\u53f7,\u4ea4\u6613\u4e3b\u4f53\u6237\u540d,\u4ea4\u6613\u7c7b\u578b,\u652f\u4ed8\u7c7b\u578b,\u501f\u8d37\u7c7b\u578b,\u4ea4\u6613\u65f6\u95f4,\u5e01\u79cd,\u4ea4\u6613\u91d1\u989d,\u4ea4\u6613\u4f59\u989d,\u4ea4\u6613\u5bf9\u624b\u8d26\u53f7,\u4ea4\u6613\u5bf9\u624b\u94f6\u884c\u5361\u53f7,\u4ea4\u6613\u5bf9\u624b\u94f6\u884c\u540d\u79f0,\u4ea4\u6613\u5bf9\u624b\u6237\u540d,\u6d88\u8d39POS\u673a\u7f16\u53f7,\u4ea4\u6613\u8bbe\u5907\u7c7b\u578b,\u4ea4\u6613\u652f\u4ed8\u8bbe\u5907IP,MAC\u5730\u5740,\u4ea4\u6613\u5730\u70b9\u7ecf\u5ea6,\u4ea4\u6613\u5730\u70b9\u7eac\u5ea6,\u6d88\u8d39\u540d\u79f0,\u4ea4\u6613\u6765\u6e90\u5730,\u4ea4\u6613\u72b6\u6001,\u5907\u6ce8,\u7c7b\u578b
 headers.black-order=\u5e8f\u53f7,\u67e5\u8be2\u8d26\u53f7,\u4ea4\u6613\u6d41\u6c34\u53f7,\u4ed8\u6b3e\u652f\u4ed8\u5e10\u53f7,\u4ed8\u6b3e\u94f6\u884c\u5361\u94f6\u884c\u540d\u79f0,\u4ed8\u6b3e\u94f6\u884c\u5361\u53f7,\u4ea4\u6613\u91d1\u989d,\u4ea4\u6613\u4f59\u989d,\u6536\u6b3e\u652f\u4ed8\u5e10\u53f7,\u6536\u6b3e\u94f6\u884c\u5361\u94f6\u884c\u540d\u79f0,\u6536\u6b3e\u94f6\u884c\u5361\u53f7,\u4ea4\u6613\u7c7b\u578b,\u4ea4\u6613\u65f6\u95f4,\u652f\u4ed8\u7c7b\u578b,\u4ea4\u6613\u4e3b\u4f53\u7684\u51fa\u5165\u8d26\u6807\u8bc6,\u5e01\u79cd,\u6d88\u8d39POS\u673a\u7f16\u53f7,\u6536\u6b3e\u65b9\u7684\u5546\u6237\u53f7,\u4ea4\u6613\u8bbe\u5907\u7c7b\u578b,\u4ea4\u6613\u652f\u4ed8\u8bbe\u5907IP,MAC\u5730\u5740,\u4ea4\u6613\u5730\u70b9\u7ecf\u5ea6,\u4ea4\u6613\u5730\u70b9\u7eac\u5ea6,\u4ea4\u6613\u8bbe\u5907\u53f7,\u94f6\u884c\u5916\u90e8\u6e20\u9053\u4ea4\u6613\u6d41\u6c34\u53f7,\u6536\u6b3e\u5546\u6237\u540d\u79f0,\u5907\u6ce8
 headers.black-order-output=\u67e5\u8be2\u8d26\u53f7,\u4ea4\u6613\u6d41\u6c34\u53f7,\u4ed8\u6b3e\u652f\u4ed8\u5e10\u53f7,\u4ed8\u6b3e\u94f6\u884c\u5361\u94f6\u884c\u540d\u79f0,\u4ed8\u6b3e\u94f6\u884c\u5361\u53f7,\u4ea4\u6613\u91d1\u989d,\u4ea4\u6613\u4f59\u989d,\u6536\u6b3e\u652f\u4ed8\u5e10\u53f7,\u6536\u6b3e\u94f6\u884c\u5361\u94f6\u884c\u540d\u79f0,\u6536\u6b3e\u94f6\u884c\u5361\u53f7,\u4ea4\u6613\u7c7b\u578b,\u4ea4\u6613\u65f6\u95f4,\u652f\u4ed8\u7c7b\u578b,\u4ea4\u6613\u4e3b\u4f53\u7684\u51fa\u5165\u8d26\u6807\u8bc6,\u5e01\u79cd,\u6d88\u8d39POS\u673a\u7f16\u53f7,\u6536\u6b3e\u65b9\u7684\u5546\u6237\u53f7,\u4ea4\u6613\u8bbe\u5907\u7c7b\u578b,\u4ea4\u6613\u652f\u4ed8\u8bbe\u5907IP,MAC\u5730\u5740,\u4ea4\u6613\u5730\u70b9\u7ecf\u5ea6,\u4ea4\u6613\u5730\u70b9\u7eac\u5ea6,\u4ea4\u6613\u8bbe\u5907\u53f7,\u94f6\u884c\u5916\u90e8\u6e20\u9053\u4ea4\u6613\u6d41\u6c34\u53f7,\u6536\u6b3e\u5546\u6237\u540d\u79f0,\u5907\u6ce8
+headers.anti-cheat-two=\u5e8f\u53f7,\u67e5\u8be2\u8d26\u53f7,\u652f\u4ed8\u673a\u6784\u5185\u90e8\u8ba2\u5355\u53f7,\u4ed8\u6b3e\u65b9\u652f\u4ed8\u5e10\u53f7,\u4ed8\u6b3e\u65b9\u94f6\u884c\u5361\u6240\u5c5e\u884c,\u4ed8\u6b3e\u65b9\u94f6\u884c\u5361\u53f7,\u4ea4\u6613\u91d1\u989d,\u4ea4\u6613\u4f59\u989d,\u6536\u6b3e\u65b9\u652f\u4ed8\u5e10\u53f7,\u6536\u6b3e\u65b9\u94f6\u884c\u5361\u6240\u5c5e\u884c,\u6536\u6b3e\u65b9\u94f6\u884c\u5361\u53f7,\u4ea4\u6613\u7c7b\u578b,\u4ea4\u6613\u65f6\u95f4,\u652f\u4ed8\u7c7b\u578b,\u501f\u8d37\u6807\u5fd7,\u5e01\u79cd,\u6d88\u8d39POS\u673a\u7f16\u53f7,\u6536\u6b3e\u65b9\u7684\u5546\u6237\u53f7,\u6536\u6b3e\u65b9\u7684\u5546\u6237\u540d\u79f0,\u4ea4\u6613\u8bbe\u5907\u53f7,\u94f6\u884c\u5916\u90e8\u6e20\u9053\u4ea4\u6613\u6d41\u6c34\u53f7,\u5907\u6ce8,\u8bbe\u5907\u7c7b\u578b,\u8bbe\u5907IP,IP\u5f52\u5c5e\u5730,MAC\u5730\u5740,\u4ea4\u6613\u5730\u70b9\u7ecf\u5ea6,\u4ea4\u6613\u5730\u70b9\u7eac\u5ea6
+headers.anti-cheat-two-output=\u67e5\u8be2\u8d26\u53f7,\u652f\u4ed8\u673a\u6784\u5185\u90e8\u8ba2\u5355\u53f7,\u4ed8\u6b3e\u65b9\u652f\u4ed8\u5e10\u53f7,\u4ed8\u6b3e\u65b9\u94f6\u884c\u5361\u6240\u5c5e\u884c,\u4ed8\u6b3e\u65b9\u94f6\u884c\u5361\u53f7,\u4ea4\u6613\u91d1\u989d,\u4ea4\u6613\u4f59\u989d,\u6536\u6b3e\u65b9\u652f\u4ed8\u5e10\u53f7,\u6536\u6b3e\u65b9\u94f6\u884c\u5361\u6240\u5c5e\u884c,\u6536\u6b3e\u65b9\u94f6\u884c\u5361\u53f7,\u4ea4\u6613\u7c7b\u578b,\u4ea4\u6613\u65f6\u95f4,\u652f\u4ed8\u7c7b\u578b,\u501f\u8d37\u6807\u5fd7,\u5e01\u79cd,\u6d88\u8d39POS\u673a\u7f16\u53f7,\u6536\u6b3e\u65b9\u7684\u5546\u6237\u53f7,\u6536\u6b3e\u65b9\u7684\u5546\u6237\u540d\u79f0,\u4ea4\u6613\u8bbe\u5907\u53f7,\u94f6\u884c\u5916\u90e8\u6e20\u9053\u4ea4\u6613\u6d41\u6c34\u53f7,\u5907\u6ce8,\u8bbe\u5907\u7c7b\u578b,\u8bbe\u5907IP,IP\u5f52\u5c5e\u5730,MAC\u5730\u5740,\u4ea4\u6613\u5730\u70b9\u7ecf\u5ea6,\u4ea4\u6613\u5730\u70b9\u7eac\u5ea6
 #\u8F6C\u8D26\u5206\u6790-\u603B\u91D1\u989Ddesc
 #\u8D26\u6237\u900F\u89C6-\u4EA4\u6613\u603B\u989Ddesc