代码重构

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

@@ -11,8 +11,6 @@ import java.util.List;
 import java.util.Map;
 
 public class AlipayHeaders {
-  private static final Map<Integer, List<String>> mappedHeaders = new HashMap<>();
-  private static final Map<Integer, String> mappedNames = new HashMap<>();
   public static final String REGISTER_1 = "卡类型";
   public static final String REGISTER_2 = "银行简称";
   public static final String REGISTER_3 = "绑定卡号";
@@ -28,16 +26,8 @@ public class AlipayHeaders {
   public static final String ACCOUNT_2 = "支付宝户名";
   public static final String ACCOUNT_3 = "对手支付宝用户ID";
   public static final String ACCOUNT_4 = "对手支付宝户名";
-
-  public AlipayHeaders() {}
-
-  public static List<String> getHeaders(int type) {
-    return mappedHeaders.get(type);
-  }
-
-  public static String getGeneratedName(int type) {
-    return mappedNames.get(type);
-  }
+  private static final Map<Integer, List<String>> mappedHeaders = new HashMap<>();
+  private static final Map<Integer, String> mappedNames = new HashMap<>();
 
   static {
     mappedHeaders.put(
@@ -127,4 +117,14 @@ public class AlipayHeaders {
     mappedNames.put(10, "五联单-转账明细");
     mappedNames.put(11, "五联单-用户汇总表");
   }
+
+  public AlipayHeaders() {}
+
+  public static List<String> getHeaders(int type) {
+    return mappedHeaders.get(type);
+  }
+
+  public static String getGeneratedName(int type) {
+    return mappedNames.get(type);
+  }
 }

src/main/java/ieven/server/webapp/service/FieldsService.java

@@ -26,8 +26,9 @@ public class FieldsService extends Ops {
    */
   public void checkAllFields(List<Fields> originFields) {
     // 五联单-注册信息
-    List<Fields> fields = this.checkFields(originFields, AlipayType.ALIPAY_ORIGIN_TRANSFER);
+    List<Fields> fields = this.checkFields(originFields, AlipayType.ALIPAY_ORIGIN_REGISTER);
     this.updateLogicalFile(fields, "五联单-注册信息");
+
     fields = this.checkFields(originFields, 12);
     this.updateLogicalFile(fields, "五联单-注册信息");
     // 五联单-登录日志
@@ -54,9 +55,15 @@ public class FieldsService extends Ops {
     // 财付通-订单明细
     fields = matchHeaders(originFields, TenpayHeaders.getHeaders(6));
     this.updateLogicalFile(fields, "财付通-订单明细");
+    fields = matchHeaders(originFields, TenpayHeaders.getHeaders(5));
+    this.updateLogicalFile(fields, "财付通-订单明细");
+    fields = matchHeaders(originFields, TenpayHeaders.getHeaders(1));
+    this.updateLogicalFile(fields, "财付通-订单明细");
+    fields = matchHeaders(originFields, TenpayHeaders.getHeaders(2));
+    this.updateLogicalFile(fields, "财付通-订单明细");
     // 财付通-手机明细
     fields = matchHeaders(originFields, TenpayHeaders.getHeaders(4));
-    this.updateLogicalFile(fields, "财付通-订单明细");
+    this.updateLogicalFile(fields, "财付通-手机明细");
   }
 
   void updateLogicalFile(List<Fields> fields, String matchType) {

src/main/java/ieven/server/webapp/service/Ops.java

@@ -243,7 +243,6 @@ public class Ops {
     List<Fields> matched = new ArrayList<>();
     for (Fields fields : needToMatch) {
       List<String> oriHeaders = new ArrayList<>(fields.getFieldsReverse().keySet());
-      System.out.println(oriHeaders);
       // 字段完全一样就说明是需要查找的表
       if (headers.containsAll(oriHeaders) && oriHeaders.containsAll(headers)) {
         matched.add(fields);

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

@@ -42,7 +42,7 @@ public class AlipayService {
     final List<Fields> originFields = queryAllFields(modelId);
     // 先校验文件结构如果有不符合结构的文件 则暂停执行 给于提示
     fieldsService.checkAllFields(originFields);
-    List<LogicalFile> logicalFiles = this.queryAllLogicalFiles(modelId);
+    List<LogicalFile> logicalFiles = this.queryAllLogicalFiles2(modelId);
     List<String> checkResultStrings = new ArrayList<>();
     for (LogicalFile logicalFile : logicalFiles) {
       if (StringUtils.isBlank(logicalFile.getMatchType())) {
@@ -206,6 +206,12 @@ public class AlipayService {
     return mongoTemplate.find(query, LogicalFile.class);
   }
 
+  public List<LogicalFile> queryAllLogicalFiles2(String modelId) {
+    Query query =
+        new Query(Criteria.where("modelId").is(modelId).and("generated").is(Boolean.FALSE));
+    return mongoTemplate.find(query, LogicalFile.class);
+  }
+
   private void clearAllGenerated(String modelId) {
     List<LogicalFile> logicalFiles = queryAllLogicalFiles(modelId);
     for (LogicalFile old : logicalFiles) {