typeB 格式处理

mainFactory/src/main/java/org/bfkj/utils/DataFormat.java

@@ -90,9 +90,20 @@ public class DataFormat {
             tempIndex = index;
         }
         return tempIndex == str.length() ? str : str.substring(0, tempIndex);
+    }
+
+//    public static List<Map<String, Object>> typeBToMapList(List<String> typeList, String dataObjectId, Map<String, String> transMaps) {
+//        if (Objects.isNull(typeList) || typeList.isEmpty()) return new ArrayList<>() {{
+//            add(processSuccess(null));
+//        }};
+//        List<Map<String, Object>> returnmap = new ArrayList<>();
+//        for (String typeStr : typeList) {
+//            returnmap.add(typeBToMap(typeStr, dataObjectId, transMaps));
+//        }
+//        return returnmap;
+//    }
 
 
-    }
     public static Map<String, Object> typeBToMap(String typeStr, String dataObjectId, Map<String, String> transMaps) {
         try {
             if (Objects.isNull(typeStr)) {
@@ -312,10 +323,16 @@ public class DataFormat {
         if (MapTools.isNotBlank(landAirport)) {
             inMap.put("landAirport", inMap.get(landAirport));
         }
-        String flightNo = inMap.containsKey("flightNo") ? "flightNo" : (inMap.containsKey("inflightNo") ? "inflightNo" : null);
-        if (MapTools.isNotBlank(flightNo)) {
-            inMap.put("flightNo", inMap.get(flightNo));
+
+        String carrierFlights = inMap.containsKey("flightNo") ? "flightNo" : (inMap.containsKey("inflightNo") ? "inflightNo" : null);
+        if (MapTools.isNotBlank(carrierFlights)) {
+            inMap.put("carrierFlights", inMap.get(carrierFlights));
         }
+        String carrierFlightsDate = inMap.containsKey("flightDate") ? "flightDate" : (inMap.containsKey("inflightDate") ? "inflightDate" : null);
+        if (MapTools.isNotBlank(carrierFlightsDate)) {
+            inMap.put("carrierFlightsDate", inMap.get(carrierFlightsDate));
+        }
+
         String readAddess = inMap.containsKey("location_code") ? "location_code" : (inMap.containsKey("checkInLocation") ? "checkInLocation" : inMap.containsKey("operationArea") ? "operationArea" : null);
         if (MapTools.isNotBlank(readAddess)) {
             inMap.put("readAddess", inMap.get(readAddess));
@@ -417,7 +434,6 @@ public class DataFormat {
         } catch (Exception e) {
             return processFail(LogUtils.getException(e));
         }
-
     }
 
     public Map<String, Object> collectInsertOrUpdate(List<String> ids, String sourceTable, String sourceKey, String targetTable, List<String> uniqueList, boolean isActive, List<String> targetNull, String dbConnect) {