:construction: 格式化顺带加了日志

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/imf/msg/CfceImfMsg.java

@@ -39,7 +39,7 @@ public class CfceImfMsg extends ImfMsgAbstract {
         String cfno = getStrVal("/MSG/DFLT/CFNO");
         entity.setCfno(cfno);
 
-        String[] parts = ffid.split( "-" ); // 分割字符串
+        String[] parts = ffid.split("-"); // 分割字符串
         entity.setAwcd(parts[0]);
         entity.setFlno(parts[1]);
 
@@ -48,11 +48,11 @@ public class CfceImfMsg extends ImfMsgAbstract {
 
         // 查询机位表中是否有此航班 有就更新
         QueryWrapper<AdminAircraftPosition> aircraftPositionQueryWrapper = new QueryWrapper<>();
-        aircraftPositionQueryWrapper.eq("flight_sole",flid);
+        aircraftPositionQueryWrapper.eq("flight_sole", flid);
         AdminAircraftPosition one = getAdminAircraftPositionService().getOne(aircraftPositionQueryWrapper);
         if (one != null) {
             AdminDfdlList byId = getAdminDfdlListService().getById(entity.getFlid());
-            adminDfdlCopyToAirPosition(byId,one);
+            adminDfdlCopyToAirPosition(byId, one);
         }
     }
 }

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/imf/msg/DfdlImfMsg.java

@@ -90,6 +90,7 @@ public class DfdlImfMsg extends ImfMsgAbstract {
     /**
      * 更新机位表数据
      * 同步前一天落地但没有起飞的  也就是没有AFID的
+     *
      * @param dfdlList 新的计划列表
      */
     private void updateAircraftPosition(List<AdminDfdlList> dfdlList) {

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/imf/msg/HbttImfMsg.java

@@ -48,11 +48,11 @@ public class HbttImfMsg extends ImfMsgAbstract {
                         .eq(AdminAircraftPosition::getFlightSole, oldPlan.getFlid())
                         .eq(AdminAircraftPosition::getFlightAfid, oldPlan.getAfid())
                         .eq(AdminAircraftPosition::getFlightNum, oldPlan.getAwcd() + "-" + oldPlan.getFlno())
-                        .eq(AdminAircraftPosition::getAircraftNum,oldPlan.getCfno())
+                        .eq(AdminAircraftPosition::getAircraftNum, oldPlan.getCfno())
                 ;
                 AdminAircraftPosition one = getAdminAircraftPositionService().getOne(adminAircraftPositionLambdaQueryWrapperWrapper);
                 if (one != null) {
-                    one.setFlightNum(byId.getAwcd()+"-"+byId.getFlno());
+                    one.setFlightNum(byId.getAwcd() + "-" + byId.getFlno());
                     getAdminAircraftPositionService().updateById(one);
                 }
             }

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/imf/msg/ImfMsg.java

@@ -23,6 +23,7 @@ public interface ImfMsg extends ImfMsgOperation {
 
     /**
      * 获取消息类型名称
+     *
      * @return
      */
     String getTypeName();

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/imf/msg/ImfMsgAbstract.java

@@ -343,8 +343,8 @@ abstract class ImfMsgAbstract<T extends ImfMsgType> implements ImfMsg {
         }
     }
 
-    void setStlsDate(AdminDfdlList adminDfdlList){
-        setStlsDate(getObjectMapper(),getXmlStr(),adminDfdlList);
+    void setStlsDate(AdminDfdlList adminDfdlList) {
+        setStlsDate(getObjectMapper(), getXmlStr(), adminDfdlList);
     }
 
     Map getStlsDateMap(ObjectMapper objectMapper, String nodeStr) {
@@ -372,7 +372,7 @@ abstract class ImfMsgAbstract<T extends ImfMsgType> implements ImfMsg {
         if (adminDfdlList == null || adminDfdlList.getFlid() == null) {
             return false;
         }
-        log.info("更新计划flid:{}",adminDfdlList.getFlid());
+        log.info("更新计划flid:{},内容{}", adminDfdlList.getFlid(), adminDfdlList);
         boolean b = getAdminDfdlListService().updateById(adminDfdlList);
         if (b) {
             //更新缓存

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/imf/msg/ImfMsgType.java

@@ -13,22 +13,22 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum ImfMsgType {
-    DFDL("DFDL", "动态航班整表同步事件","DFDL_"),
-    STLS("STLS", "航班机位动态信息更新事件","STLS_"),
-    DEPE("DEPE", "航班本站起飞消息","DEPE_"),
-    ARRE("ARRE", "航班到达本站消息","ARRE_"),
-    CFCE("CFCE", "航班更换飞机消息","CFCE_"),
-    DFIE("DFIE", "航班动态增加信息","DFIE_"),
-    DFDE("DFDE", "动态航班删除","DFDE_"),
-    HBTT("HBTT", "航班号变更消息","HBTT_");
+    DFDL("DFDL", "动态航班整表同步事件", "DFDL_"),
+    STLS("STLS", "航班机位动态信息更新事件", "STLS_"),
+    DEPE("DEPE", "航班本站起飞消息", "DEPE_"),
+    ARRE("ARRE", "航班到达本站消息", "ARRE_"),
+    CFCE("CFCE", "航班更换飞机消息", "CFCE_"),
+    DFIE("DFIE", "航班动态增加信息", "DFIE_"),
+    DFDE("DFDE", "动态航班删除", "DFDE_"),
+    HBTT("HBTT", "航班号变更消息", "HBTT_");
     private final String name;
     private final String description;
     private final String redisKey;
 
-    public static ImfMsgType findByName(String name){
+    public static ImfMsgType findByName(String name) {
         ImfMsgType[] values = values();
         for (ImfMsgType value : values) {
-            if (value.name.equals(name)){
+            if (value.name.equals(name)) {
                 return value;
             }
         }

airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/imf/msg/StlsImfMsg.java

@@ -119,15 +119,15 @@ public class StlsImfMsg extends ImfMsgAbstract {
                 Object rstr = map.get("RSTR");
 
                 if (rstr != null) {
-                    log.info("判断flid：{}是否已经占用机位",adminDfdlList.getFlid());
+                    log.info("判断flid：{}是否已经占用机位", adminDfdlList.getFlid());
                     // 有开始占用时间，证明到站了
                     Object rend = map.get("REND");
                     if (rend != null) {
-                        log.info("flid：{},有实际结束占用时间{}",adminDfdlList.getFlid(),String.valueOf(rend).replace("null", ""));
+                        log.info("flid：{},有实际结束占用时间{}", adminDfdlList.getFlid(), String.valueOf(rend).replace("null", ""));
                         // 有结束占用机位的时间
                         Date rendDate = strToDate(String.valueOf(rend).replace("null", ""));
                         if (rendDate.before(now)) {
-                            log.info("flid：{},有实际结束占用时间{}, 且小于当前时间, 清空机位",adminDfdlList.getFlid(),String.valueOf(rend).replace("null", ""));
+                            log.info("flid：{},有实际结束占用时间{}, 且小于当前时间, 清空机位", adminDfdlList.getFlid(), String.valueOf(rend).replace("null", ""));
                             //不在占用时间范围内，结束占用机位，清空机位后续不做处理
                             getAdminAircraftPositionService().dept(aircraftPosition.getId());
                             adminDfdlList.setArrival(1);
@@ -136,21 +136,21 @@ public class StlsImfMsg extends ImfMsgAbstract {
                             return;
                         } else {
                             // 在占用时间范围内,到站
-                            log.info("flid：{},有实际结束占用时间{}，且大于当前时间",adminDfdlList.getFlid(),rendDate);
+                            log.info("flid：{},有实际结束占用时间{}，且大于当前时间", adminDfdlList.getFlid(), rendDate);
                         }
                     } else {
                         // 没有结束占用时间，到站
-                        log.info("flid：{},没有实际结束占用时间,判断是否有实际开始占用时间",adminDfdlList.getFlid());
+                        log.info("flid：{},没有实际结束占用时间,判断是否有实际开始占用时间", adminDfdlList.getFlid());
                         // 判断到站时间是否在当前时间之前，避免脏数据
                         Date rstrDate = strToDate(String.valueOf(rstr).replace("null", ""));
-                        if (rstrDate!=null) {
-                            log.info("flid：{},有实际开始占用时间{},应占用机位",rstrDate ,adminDfdlList.getFlid());
+                        if (rstrDate != null) {
+                            log.info("flid：{},有实际开始占用时间{},应占用机位", rstrDate, adminDfdlList.getFlid());
                             // 到站
                             aircraftPosition.setType("使用中");
                             adminDfdlList.setArrival(1);
                             setStlsDate(adminDfdlList);
                             if (!isChangeFlag) {
-                                log.info("flid：{},copy",adminDfdlList.getFlid());
+                                log.info("flid：{},copy", adminDfdlList.getFlid());
                                 adminDfdlCopyToAirPosition(adminDfdlList, aircraftPosition);
                             }
                             // 更新机位
@@ -163,10 +163,10 @@ public class StlsImfMsg extends ImfMsgAbstract {
                     }
                 } else {
                     // 没有实际占用时间，设置预计时间
-                    log.info("flid：{},没有实际占用时间",adminDfdlList.getFlid());
+                    log.info("flid：{},没有实际占用时间", adminDfdlList.getFlid());
                 }
 
-                if(adminAircraftPosition == null){
+                if (adminAircraftPosition == null) {
                     log.info("此航班【{}】未在机位表中被发现，判断是否有结束时间，有直接占用，没有判断机位上航班【{}】是否结束占用没结束就不占用", FLID, aircraftPosition.getFlightSole());
                     // 在机位表中没有找到航班对应的机位, 判断机位上航班是否结束占用
                     if (aircraftPosition.getFlightSole() != null && !FLID.equals(aircraftPosition.getFlightSole())) {
@@ -206,8 +206,8 @@ public class StlsImfMsg extends ImfMsgAbstract {
                 getAdminAircraftPositionService().updateById(aircraftPosition);
                 // 更新计划
                 updateAdminDfdl(adminDfdlList);
-                log.info("最终更新计划数据：{}",adminDfdlList);
-                log.info("最终更新机位数据：{}",aircraftPosition);
+                log.info("最终更新计划数据：{}", adminDfdlList);
+                log.info("最终更新机位数据：{}", aircraftPosition);
             } else {
                 log.error("未找到对应机位【{}】", CODE);
             }