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

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

@@ -1,6 +1,7 @@
 package org.jeecg.modules.api.imf.msg;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import lombok.extern.slf4j.Slf4j;
 import org.jeecg.modules.admin_aircraft_position.entity.AdminAircraftPosition;
 import org.jeecg.modules.admin_dfdl_list.entity.AdminDfdlList;
 import org.springframework.transaction.annotation.Transactional;
@@ -14,6 +15,7 @@ import java.util.Date;
  * @Description:
  * @date 2023/7/20 10:28
  */
+@Slf4j
 public class ArreImfMsg extends ImfMsgAbstract {
     public ArreImfMsg(String xmlStr) {
         super(xmlStr, ImfMsgType.ARRE);
@@ -40,6 +42,7 @@ public class ArreImfMsg extends ImfMsgAbstract {
             // 更新计划表 设置已到达
             adminDfdlList.setArrival(1);
             updateAdminDfdl(adminDfdlList);
+            log.info("航班flid:{},到达本站：{}", adminDfdlList.getFlid(), adminDfdlList);
         }
     }
 }

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

@@ -3,6 +3,8 @@ package org.jeecg.modules.api.imf.msg;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.google.common.base.Strings;
+import lombok.extern.slf4j.Slf4j;
 import org.jeecg.modules.admin_aircraft_position.entity.AdminAircraftPosition;
 import org.jeecg.modules.admin_dfdl_list.entity.AdminDfdlList;
 import org.springframework.transaction.annotation.Transactional;
@@ -16,6 +18,7 @@ import javax.xml.xpath.XPath;
  * @Description:
  * @date 2023/7/19 18:32
  */
+@Slf4j
 public class CfceImfMsg extends ImfMsgAbstract {
 
     public CfceImfMsg(String xmlStr) {
@@ -26,9 +29,13 @@ public class CfceImfMsg extends ImfMsgAbstract {
     @Transactional
     public void handle() {
         // 更换计划表中的航班
-        AdminDfdlList entity = new AdminDfdlList();
         String flid = getStrVal("/MSG/DFLT/FLID");
-        entity.setFlid(Integer.valueOf(flid));
+        if (Strings.isNullOrEmpty(flid)) {
+            log.info("未找到要更换的航班!flid:{}", flid);
+            return;
+        }
+        AdminDfdlList entity = getAdminDfdlListService().getById(flid);
+        log.info("航班更换前：{}", entity);
 
         String ffid = getStrVal("/MSG/DFLT/FFID");
         entity.setFfid(ffid);
@@ -45,14 +52,14 @@ public class CfceImfMsg extends ImfMsgAbstract {
 
 
         updateAdminDfdl(entity);
+        log.info("航班更换后：{}", entity);
 
         // 查询机位表中是否有此航班 有就更新
         QueryWrapper<AdminAircraftPosition> aircraftPositionQueryWrapper = new QueryWrapper<>();
         aircraftPositionQueryWrapper.eq("flight_sole", flid);
         AdminAircraftPosition one = getAdminAircraftPositionService().getOne(aircraftPositionQueryWrapper);
         if (one != null) {
-            AdminDfdlList byId = getAdminDfdlListService().getById(entity.getFlid());
-            adminDfdlCopyToAirPosition(byId, one);
+            adminDfdlCopyToAirPosition(entity, one);
         }
     }
 }

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

@@ -2,6 +2,7 @@ package org.jeecg.modules.api.imf.msg;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.SpringContextUtils;
 import org.jeecg.modules.admin_aircraft_position.entity.AdminAircraftPosition;
 import org.jeecg.modules.admin_dfdl_list.entity.AdminDfdlList;
@@ -24,6 +25,7 @@ import java.util.stream.Collectors;
  * @Description:
  * @date 2023/7/20 9:44
  */
+@Slf4j
 public class DepeImfMsg extends ImfMsgAbstract {
 
     private IAdminSecurityCheckService adminSecurityCheckService;
@@ -43,12 +45,13 @@ public class DepeImfMsg extends ImfMsgAbstract {
         //起飞时间 20230619112000
         String FRTT = getStrVal("/MSG/DFLT/FRTT");
         Date date = strToDate(FRTT);
-        if (date != null && date.before(new Date())) {
+        if (date != null) {
             // 已经起飞
             LambdaQueryWrapper<AdminAircraftPosition> adminAircraftPositionLambdaQueryWrapper = new LambdaQueryWrapper<>();
             adminAircraftPositionLambdaQueryWrapper.eq(AdminAircraftPosition::getFlightAfid, FLID);
             AdminAircraftPosition adminAircraftPosition = getAdminAircraftPositionService().getOne(adminAircraftPositionLambdaQueryWrapper);
             if (adminAircraftPosition != null) {
+                log.info("航班已经起飞：{}", adminAircraftPosition);
                 // 设置为空置
                 getAdminAircraftPositionService().dept(adminAircraftPosition.getId());
                 // 设置计划已经起飞

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

@@ -2,6 +2,7 @@ package org.jeecg.modules.api.imf.msg;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.google.common.base.Strings;
+import lombok.extern.slf4j.Slf4j;
 import org.jeecg.modules.admin_aircraft_position.entity.AdminAircraftPosition;
 import org.jeecg.modules.admin_dfdl_list.entity.AdminDfdlList;
 
@@ -12,6 +13,7 @@ import org.jeecg.modules.admin_dfdl_list.entity.AdminDfdlList;
  * @Description:
  * @date 2023/7/20 9:14
  */
+@Slf4j
 public class DfdeImfMsg extends ImfMsgAbstract {
 
     public DfdeImfMsg(String xmlStr) {
@@ -26,6 +28,7 @@ public class DfdeImfMsg extends ImfMsgAbstract {
             // 信息缺失
             return;
         }
+        log.info("航班已被删除：{}", getAdminDfdlListService().getById(FLID));
         getAdminDfdlListService().removeById(FLID);
         // 删除缓存
         if (getRedisUtil().hasKey(ImfMsgType.DFDL.getRedisKey() + FLID)) {

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

@@ -43,6 +43,7 @@ public class DfdlImfMsg extends ImfMsgAbstract {
     @AutoLog(value = "处理DFDL计划消息")
     @Transactional
     public void handle() {
+        log.info("处理计划中...");
         XPath xpath = getXpath();
         XPathExpression expr = null;
         // 计划表数据
@@ -113,5 +114,6 @@ public class DfdlImfMsg extends ImfMsgAbstract {
         adminDfdlMq.setDfdl(getXmlStr());
         adminDfdlMq.setUpdateTime(new Date());
         getAdminDfdlMqService().updateById(adminDfdlMq);
+        getRedisUtil().set("DFDL", getXmlStr());
     }
 }

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

@@ -2,6 +2,7 @@ package org.jeecg.modules.api.imf.msg;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.extern.slf4j.Slf4j;
 import org.jeecg.modules.admin_dfdl_list.entity.AdminDfdlList;
 import org.jeecg.modules.utils.ConversionUtil;
 
@@ -12,6 +13,7 @@ import org.jeecg.modules.utils.ConversionUtil;
  * @Description:
  * @date 2023/7/20 9:04
  */
+@Slf4j
 public class DfieImfMsg extends ImfMsgAbstract {
 
     public DfieImfMsg(String xmlStr) {
@@ -34,6 +36,7 @@ public class DfieImfMsg extends ImfMsgAbstract {
         // 添加缓存
         if (save) {
             // 计划缓存
+            log.info("已添加航班计划：{}", adminDfdlList);
             getRedisUtil().set(ImfMsgType.DFDL.getRedisKey() + adminDfdlList.getFlid(), json);
         }
     }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.fasterxml.jackson.core.JsonProcessingException;
+import lombok.extern.slf4j.Slf4j;
 import org.jeecg.modules.admin_aircraft_position.entity.AdminAircraftPosition;
 import org.jeecg.modules.admin_dfdl_list.entity.AdminDfdlList;
 
@@ -14,6 +15,7 @@ import org.jeecg.modules.admin_dfdl_list.entity.AdminDfdlList;
  * @Description:
  * @date 2023/7/20 9:23
  */
+@Slf4j
 public class HbttImfMsg extends ImfMsgAbstract {
     public HbttImfMsg(String xmlStr) {
         super(xmlStr, ImfMsgType.HBTT);
@@ -28,6 +30,7 @@ public class HbttImfMsg extends ImfMsgAbstract {
         String NAWC = getStrVal("/MSG/DFLT/NAWC");
         AdminDfdlList oldPlan = getAdminDfdlListService().getById(FLID);
         if (oldPlan != null) {
+            log.info("航班号变更前：{}", oldPlan);
             UpdateWrapper<AdminDfdlList> adminDfdlListUpdateWrapper = new UpdateWrapper<>();
             adminDfdlListUpdateWrapper.eq("flid", FLID).eq("ffid", FFID).set("ffid", HBID).set("flno", NFLN).set("awcd", NAWC);
             boolean update = getAdminDfdlListService().update(adminDfdlListUpdateWrapper);
@@ -41,6 +44,7 @@ public class HbttImfMsg extends ImfMsgAbstract {
                     throw new RuntimeException(e);
                 }
                 getRedisUtil().set(ImfMsgType.DFDL.getRedisKey() + FLID, adminDfdlJson);
+                log.info("航班号变更后：{}", byId);
 
                 // 更新机位表
                 LambdaQueryWrapper<AdminAircraftPosition> adminAircraftPositionLambdaQueryWrapperWrapper = new LambdaQueryWrapper<>();