فهرست منبع

:white_check_mark: 格式化,请忽略

Twelve615 1 سال پیش
والد
کامیت
b5ae0301b4
19فایلهای تغییر یافته به همراه11 افزوده شده و 61 حذف شده
  1. 1 1
      airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/imf/AirportJob.java
  2. 1 25
      airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/imf/ImfMqListener.java
  3. 0 2
      airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/imf/msg/ArreImfMsg.java
  4. 1 1
      airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/imf/msg/BakeImfMsg.java
  5. 1 1
      airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/imf/msg/CaneImfMsg.java
  6. 0 6
      airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/imf/msg/CfceImfMsg.java
  7. 1 2
      airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/imf/msg/DepeImfMsg.java
  8. 0 2
      airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/imf/msg/DfdeImfMsg.java
  9. 0 1
      airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/imf/msg/DfdlImfMsg.java
  10. 2 3
      airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/imf/msg/DlyeImfMsg.java
  11. 1 1
      airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/imf/msg/FpttImfMSg.java
  12. 1 2
      airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/imf/msg/FrttImfMsg.java
  13. 0 4
      airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/imf/msg/HbttImfMsg.java
  14. 0 4
      airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/imf/msg/ImfMsg.java
  15. 0 2
      airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/imf/msg/ImfMsgAbstract.java
  16. 0 1
      airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/imf/msg/ImfMsgOperation.java
  17. 1 1
      airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/imf/msg/ImfMsgType.java
  18. 1 1
      airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/imf/msg/RtneImfMsg.java
  19. 0 1
      airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/imf/msg/StlsImfMsg.java

+ 1 - 1
airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/imf/AirportJob.java

@@ -98,7 +98,7 @@ public class AirportJob extends ImfMsgAbstract implements Job {
             for (AdminAircraftPosition position : adminAircraftPositions) {
                 if (position.getAircraftPositionNum().equals(adminOrder.getAircraftPositionNum())) {
                     // 同机位
-                    setPositionDataToOrder(adminOrder, position,adminSecurityChecks);
+                    setPositionDataToOrder(adminOrder, position, adminSecurityChecks);
                 }
             }
         }

+ 1 - 25
airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/imf/ImfMqListener.java

@@ -1,48 +1,24 @@
 package org.jeecg.modules.api.imf;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.MapperFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Strings;
 import com.rabbitmq.client.Channel;
-import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.boot.starter.rabbitmq.client.RabbitMqClient;
 import org.jeecg.boot.starter.rabbitmq.core.BaseRabbiMqHandler;
 import org.jeecg.boot.starter.rabbitmq.listenter.MqListener;
 import org.jeecg.common.annotation.RabbitComponent;
 import org.jeecg.common.base.BaseMap;
-import org.jeecg.common.util.SpringContextUtils;
-import org.jeecg.modules.admin_dfdl_list.entity.AdminDfdlList;
 import org.jeecg.modules.api.imf.msg.ImfMsg;
 import org.jeecg.modules.api.imf.msg.ImfMsgUtil;
-import org.jeecg.modules.utils.ConversionUtil;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.amqp.support.AmqpHeaders;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Profile;
 import org.springframework.messaging.handler.annotation.Header;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.xpath.*;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.StringReader;
+
 import java.nio.charset.StandardCharsets;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
-import java.util.Date;
 
 /**
  * @author 王葆权

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

@@ -1,8 +1,6 @@
 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;
 

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

@@ -12,7 +12,7 @@ import org.jeecg.modules.admin_dfdl_list.entity.AdminDfdlList;
  * @date 2023/8/15 15:15
  */
 @Slf4j
-public class BakeImfMsg extends ImfMsgAbstract{
+public class BakeImfMsg extends ImfMsgAbstract {
 
     public BakeImfMsg(String xmlStr) {
         super(xmlStr, ImfMsgType.BAKE);

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

@@ -13,7 +13,7 @@ import org.jeecg.modules.admin_dfdl_list.entity.AdminDfdlList;
  * @date 2023/8/15 15:13
  */
 @Slf4j
-public class CaneImfMsg extends ImfMsgAbstract{
+public class CaneImfMsg extends ImfMsgAbstract {
 
     public CaneImfMsg(String xmlStr) {
         super(xmlStr, ImfMsgType.CANE);

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

@@ -1,16 +1,10 @@
 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;
 
-import javax.xml.xpath.XPath;
-
 /**
  * @author 王葆权
  * @Title: 处理航班更换信息

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

@@ -3,7 +3,6 @@ package org.jeecg.modules.api.imf.msg;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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;
 import org.jeecg.modules.admin_order.entity.AdminOrder;
 import org.jeecg.modules.admin_order.service.IAdminOrderService;
@@ -53,7 +52,7 @@ public class DepeImfMsg extends ImfMsgAbstract {
                 //判断起飞航班
                 if ("D".equals(byId.getFlio()) && byId.getAfid() != null) {
                     AdminDfdlList adminDfdlList = getAdminDfdl(String.valueOf(byId.getAfid()));
-                    if (adminDfdlList.getEstr()!=null && byId.getEstr()!=null && !byId.getEstr().before(adminDfdlList.getEstr())) {
+                    if (adminDfdlList.getEstr() != null && byId.getEstr() != null && !byId.getEstr().before(adminDfdlList.getEstr())) {
                         //先入站再出站才设置否则不设置 A -> D
                         adminDfdlList.setDepe(1);
                         adminDfdlList.setFrtt(date);

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

@@ -1,9 +1,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;
 import org.springframework.transaction.annotation.Transactional;
 

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

@@ -1,7 +1,6 @@
 package org.jeecg.modules.api.imf.msg;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;

+ 2 - 3
airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/imf/msg/DlyeImfMsg.java

@@ -3,7 +3,6 @@ package org.jeecg.modules.api.imf.msg;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.google.common.base.Strings;
 import lombok.extern.slf4j.Slf4j;
-import net.sf.saxon.trans.SymbolicName;
 import org.jeecg.modules.admin_dfdl_list.entity.AdminDfdlList;
 
 /**
@@ -57,9 +56,9 @@ public class DlyeImfMsg extends ImfMsgAbstract {
         String ABST = getStrVal("/MSG/DFLT/ABST");
         if (Strings.isNullOrEmpty(ABST)) {
             // 取消航班延误状态
-            updateWrapper.set(AdminDfdlList::getDlye,0);
+            updateWrapper.set(AdminDfdlList::getDlye, 0);
         } else {
-            updateWrapper.set(AdminDfdlList::getDlye,1);
+            updateWrapper.set(AdminDfdlList::getDlye, 1);
         }
         boolean update = getAdminDfdlListService().update(updateWrapper);
         log.info("修改计划 {} {}", FLID, update ? "成功" : "失败");

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

@@ -13,7 +13,7 @@ import org.jeecg.modules.admin_dfdl_list.entity.AdminDfdlList;
  * @date 2023/8/15 15:01
  */
 @Slf4j
-public class FpttImfMSg extends ImfMsgAbstract{
+public class FpttImfMSg extends ImfMsgAbstract {
 
     public FpttImfMSg(String xmlStr) {
         super(xmlStr, ImfMsgType.FPTT);

+ 1 - 2
airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/imf/msg/FrttImfMsg.java

@@ -1,7 +1,6 @@
 package org.jeecg.modules.api.imf.msg;
 
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
 import com.google.common.base.Strings;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.modules.admin_dfdl_list.entity.AdminDfdlList;
@@ -16,7 +15,7 @@ import org.jeecg.modules.admin_dfdl_list.entity.AdminDfdlList;
  * @date 2023/8/15 15:09
  */
 @Slf4j
-public class FrttImfMsg extends ImfMsgAbstract{
+public class FrttImfMsg extends ImfMsgAbstract {
 
     public FrttImfMsg(String xmlStr) {
         super(xmlStr, ImfMsgType.FRTT);

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

@@ -1,11 +1,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 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;
 import org.springframework.transaction.annotation.Transactional;
 

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

@@ -1,9 +1,5 @@
 package org.jeecg.modules.api.imf.msg;
 
-import org.w3c.dom.Document;
-
-import javax.xml.xpath.XPath;
-
 /**
  * @author 王葆权
  * @Title: imf消息实体接口

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

@@ -11,7 +11,6 @@ import com.google.common.base.Strings;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.boot.starter.rabbitmq.client.RabbitMqClient;
-import org.jeecg.common.base.BaseMap;
 import org.jeecg.common.util.RedisUtil;
 import org.jeecg.common.util.SpringContextUtils;
 import org.jeecg.modules.admin_aircraft_position.entity.AdminAircraftPosition;
@@ -35,7 +34,6 @@ import java.io.StringReader;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.function.Function;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 

+ 0 - 1
airport/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/imf/msg/ImfMsgOperation.java

@@ -3,7 +3,6 @@ package org.jeecg.modules.api.imf.msg;
 import org.w3c.dom.Document;
 
 import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathConstants;
 
 /**
  * @author 王葆权

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

@@ -29,7 +29,7 @@ public enum ImfMsgType {
     RTNE("RTNE", "航班返航消息", "RTNE_"),
     BAKE("BAKE", "航班滑回消息", "BAKE_"),
     DFUE("DFUE", "航班动态信息更新", "DFUE_"),
-    AIRL("AIRL","航班航线变更消息","AIRL_" ),
+    AIRL("AIRL", "航班航线变更消息", "AIRL_"),
     NONE("NONE", "空的消息", "NONE_");
     private final String name;
     private final String description;

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

@@ -12,7 +12,7 @@ import org.jeecg.modules.admin_dfdl_list.entity.AdminDfdlList;
  * @date 2023/8/15 15:14
  */
 @Slf4j
-public class RtneImfMsg extends ImfMsgAbstract{
+public class RtneImfMsg extends ImfMsgAbstract {
 
     public RtneImfMsg(String xmlStr) {
         super(xmlStr, ImfMsgType.RTNE);

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

@@ -58,7 +58,6 @@ public class StlsImfMsg extends ImfMsgAbstract {
     }
 
 
-
     /**
      * 判断已经到站的飞机是否需要占用机位
      * 需要返回 true