2022-01-07 00:00

1.航班执行期监控定时将前一天数据改成获取当天数据
2.油量分析接口获取实体增加字段

pom.xml

@@ -104,7 +104,7 @@
                             <transformers>
                                 <transformer
                                         implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>com.foc.DbSoundsMonitorTask</mainClass>
+                                    <mainClass>com.foc.DspReleaseInfoTask</mainClass>
                                 </transformer>
                             </transformers>
                         </configuration>

src/main/java/com/foc/dao/StatisticalDao.java

@@ -88,6 +88,14 @@ public interface StatisticalDao {
     void insertDspReleaseInfo(List<DspReleaseInfo> list);
 
     /**
+     * 测试批量新增或修改
+     *
+     * @param list
+     */
+    void insertDspReleaseInfo1(List<DspReleaseInfo> list);
+
+
+    /**
      * 根据日期获取航班动态数据
      *
      * @param date
@@ -118,4 +126,32 @@ public interface StatisticalDao {
      * @return
      */
     StatisticalEntity getAirlineStatic(@Param(value = "arrIata") String arrIata, @Param(value = "depIata") String depIata);
+
+    /**
+     * 根据航点三字码查询航点名称
+     * @param iataId
+     * @return
+     */
+    String selectAirPortNameByIataId(@Param(value="iataId") String iataId);
+
+    /**
+     * 根据用户登录名查询用户名7
+     * @param dispatcherName
+     * @return
+     */
+    String selectUserNameByLoginName(@Param(value="dispatcherName") String dispatcherName);
+
+    /**
+     * 根据acno获取acTypeName
+     * @param acNo
+     * @return
+     */
+    String selectAcTypeNameByAcNo(@Param(value="acNo") String acNo);
+
+    /**
+     * 根据三字码获取四字码
+     * @param iataId
+     * @return
+     */
+    String selectIcaoIdByTataId(@Param(value="iataId")String iataId);
 }

src/main/java/com/foc/entity/DspReleaseInfo.java

@@ -24,12 +24,30 @@ public class DspReleaseInfo {
 
     private String arrIataId;
 
+    private String airlineOil;
+
     private String totalOil;
 
     private String dispatcherName;
 
     private String extraOilFuelReason;
 
+    private String remarkMsg;
+
+    private String alt1Fuel;
+
+    private String alt1Time;
+
+    private String alt1Distance;
+
+    private String alt2Fuel;
+
+    private String alt2Time;
+
+    private String alt2Distance;
+
+    private Integer cruisingAltitude;
+
     private String eET;
 
     private String weightUnit;
@@ -41,4 +59,16 @@ public class DspReleaseInfo {
     private String updateDate;
 
     private String delFlag;
+
+    private String depAirPortName;
+
+    private String arrAirPortName;
+
+    private String dispatcherAccount;
+
+    private String acTypeName;
+
+    private String arrIcaoId;
+
+    private String depIcaoId;
 }

src/main/java/com/foc/service/DspReleaseInfoService.java

@@ -75,6 +75,7 @@ public class DspReleaseInfoService {
                 String resultString = nativeHttpCall(map, gatewayUatUrl, key);
                 //解密
                 decrypt(resultString, key, dao);
+//                String sd="39f5ecac8ed14bb4a76fa01292abcb7a338fde227c9200e86e7785bff9abbb5e25af7a08ed0595f2d305c24c9c6c0c0f3a85691620731e43853dd52d101fc84a69a3e408e03ee968512b345dae32e13af0b4d8eaa09ae93f89ea402960fb89c14441133817376da8c235343a5e7c3101ce7c5c3818a7db6d79fc8eaef826080fddac40cdd685de0b24f9fa4e7beb7f6fff132b8b092ad11b6a2042d508a71600fe2a55983c120544e6a2307b7b4d671ab11087c5249d2688eb10f28a1eaf24177592a32b10df8923f4a3212306565050955b488eacbdba2318771887ba1eb52507bb32e17e7a37b7cc9c765a1abd442cbe7441ec5bdf331ec26d8d2ae00bd3dc291dd50c688c17d19292c574d9a358f4f31f2c8f95615cd4f52901985f5bd2bb90105ee17bc2ccbf291dd50c688c17d1c1e4e51cafe3176a96e6cb2b6741689bd106a9acb5f4c82d02cc5457f9153f5ccab37bb4da88dd4cb407a9f6ea2d0d353f659ce9fb11c3fe71d5e8180c7c6837356c075664f555e1d13c1731ac2dce739fb3e3930d19756e035d32b893f6010199a103234824347b053a2af9371c1b2d58e71e04f955fb0010241eaab1a66eb77f2163f40cd348eb6c153b0d2f9d0df8ddd88c479fa4c3704b67c4ab225e580a09ec6290377046d7d429a3647c0f6d0a1ae517e96713689a69c444e64fed346ac73364121dd485d7a4ef3a7dc445a0145b957104bc38a7fb37e6d82055bc17412c5f86be29c7bc8d3e2bdb4077702391821c08ef20b58a7ef9656ece954da05a0a0be325273a2413a48d806ef273d7e3387d728d76fc9bd144384673a36166cd27cf03d70038988e3c087276d90c1f3a467b462eb81b47a63de30557986970863d723b3e34e50ede064e2a971d440253a341259623dbcf8c1be141b38a2d4db4cce9f26b2e608dcb9a5e1b006e2147bd70ebe17934799931afb9211a8e7c7e05a0bb4bf76ad7d55b9a2d1f42a65257532166c978f3dcaadb922a4d78926d1a53c5b6ab20b1d4a91f384609e837390db68cb32735ce906a959f8b3556ab495c73cf098b5185c819fee87b633b5d925b2fed1e23b676ea5400cc22874e9635c7b29253a6d15752d8b1fa128dfd3bc2dbd83ad897c9c4c80971560bdf0ead6d423eed4d592e05d07502211230d43511cd42101d4bad13e14db78895f391af47542fb53667c01ed155b579997a625502905bfeaa46b2f62810b957e02cf39074d8ca37160a1afa05f24b789459cfa502e232bc80784e8f3a70f7f2c63ee5b2fb30a9f9abd7fb832e8344667541e8011263555f1b3c6eab9f137c7cce2009b0eff5a367438fc9a6c75562011dd14892bad6c16f8f29e9f893c66ee681ba2edb638662f9bf8200ab1a68b70af3d50d501deecc718bcc0b2a5a9e684c84cfe51ab2610b12e2b0316f12b5026a74d23fc4cf955ffbaa1ef15820a1fcd76f562b0c4fb829d4580a33381983126046c5d9805afd8bc9a6f61ab82f465c993c13cafebcce2c79a1219b9f7e1859927e3e0db2d32054c8bccdf7ef4a2b5f8ab459c24068fb38db512dee5973c5f23fba469135316ff26b9f8ba3cf81f8e74f8b7bc9b503f566699a1c29ced0e89e6629cd8128535bdf6ed3cb5eb6564460f31824b9c94f062b34e43d595b658a1b65797844b5a2d3d2cc7a424db1718c05b925df9830b1d24969dc5ea45f38c8377b41ad491a2dfa0dba646145d23c2632109bda5c2e5f8ca5669625e63f9da83c64e26ec36bf40c49a320eb5cdf7fb20a1c3ca106f79282cfb8a4b101eb1f5decde7853b0999c3aeac30ebd9aa5398b4fa2a07fe43eb2ccfe845128de5bc94d39c7ddf1fed5d3742e6c622d98928d2ba96933d2a59860e4c0d862f63d21ca9621abde3700e691cd8c372a407de7033dd2f48db3d17af9bf017cd4bb9e904a71a519b20aad0ab468b3024a4bdf53a6683c3fd63de1b1a4b909c7a17d22105c7d1f07722558d1b76a1b96085cef60d1f63c74bd9c3201638fdbe738abd8ef478c8f49a2e5645aeec1a4b552662b5443443d102f961e0cb1d385e8988539cc9be133e0a667ca08b58c98b298423930d0f01d06d4654069888f62b15d80f30dd5faee2f0b0331d787c315c83e48d9df04c2bcf0c50637c3167f8dc1a8e2f521fdaaddf0c50637c3167f8dc1a8e2f521fdaadd7f01f4c0810a192f932ab1a369864dd2ba67ba9e3dc9d7d6e96bc702f692b7f793ff1f4769e7e5f13cc7e46e07be1d9b561cf5f334e9271ce0454363a31478f7955039add7c86ed3ca281f52e2bb189248264d2ad82fe249103e9b138dc1f687eaa042294e098b2fd186cd08ce9153c76cc5bc984e35b55e2587d8d50997b7cf86fef78c19225242f0710fd0834412e7";
             }
             session.commit();
         }
@@ -167,6 +168,12 @@ public class DspReleaseInfoService {
                 List<DspReleaseInfo> dspReleaseInfoList = JSON.parseArray(data, DspReleaseInfo.class);
                 if (Empty4JUtil.listIsNotEmpty(dspReleaseInfoList)) {
                     for (DspReleaseInfo ss : dspReleaseInfoList) {
+                        ss.setDepAirPortName(dao.selectAirPortNameByIataId(ss.getDepIataId()));
+                        ss.setArrAirPortName(dao.selectAirPortNameByIataId(ss.getArrIataId()));
+                        ss.setDispatcherAccount(dao.selectUserNameByLoginName(ss.getDispatcherName()));
+                        ss.setAcTypeName((dao.selectAcTypeNameByAcNo(ss.getAcNo())==null)?"":dao.selectAcTypeNameByAcNo(ss.getAcNo()));
+                        ss.setArrIcaoId(dao.selectIcaoIdByTataId(ss.getArrIataId()));
+                        ss.setDepIcaoId(dao.selectIcaoIdByTataId(ss.getDepIataId()));
                         ss.setDelFlag("0");
                         ss.setCreateDate(DateUtils.getTime("yyyy-MM-dd hh:mm:ss"));
                         ss.setUpdateDate(DateUtils.getTime("yyyy-MM-dd hh:mm:ss"));
@@ -182,4 +189,12 @@ public class DspReleaseInfoService {
         }
 
     }
+
+    public static void main(String[] args) throws GeneralSecurityException, UnsupportedEncodingException {
+        init();
+        StatisticalDao dao = session.getMapper(StatisticalDao.class);
+        String s="39f5ecac8ed14bb4a76fa01292abcb7a338fde227c9200e86e7785bff9abbb5e25af7a08ed0595f2d305c24c9c6c0c0f3a85691620731e43853dd52d101fc84a69a3e408e03ee968512b345dae32e13af0b4d8eaa09ae93f89ea402960fb89c14441133817376da8c235343a5e7c3101ce7c5c3818a7db6d79fc8eaef826080fddac40cdd685de0b24f9fa4e7beb7f6fff132b8b092ad11b6a2042d508a71600fe2a55983c120544e6a2307b7b4d671ab11087c5249d2688eb10f28a1eaf24177592a32b10df8923f4a3212306565050955b488eacbdba2318771887ba1eb52507bb32e17e7a37b7cc9c765a1abd442cbe7441ec5bdf331ec26d8d2ae00bd3dc291dd50c688c17d19292c574d9a358f4f31f2c8f95615cd4f52901985f5bd2bb90105ee17bc2ccbf291dd50c688c17d1c1e4e51cafe3176a96e6cb2b6741689bd106a9acb5f4c82d02cc5457f9153f5ccab37bb4da88dd4cb407a9f6ea2d0d353f659ce9fb11c3fe71d5e8180c7c6837356c075664f555e1d13c1731ac2dce739fb3e3930d19756e035d32b893f6010199a103234824347b053a2af9371c1b2d58e71e04f955fb0010241eaab1a66eb77f2163f40cd348eb6c153b0d2f9d0df8ddd88c479fa4c3704b67c4ab225e580a09ec6290377046d7d429a3647c0f6d0a1ae517e96713689a69c444e64fed346ac73364121dd485d7a4ef3a7dc445a0145b957104bc38a7fb37e6d82055bc17412c5f86be29c7bc8d3e2bdb4077702391821c08ef20b58a7ef9656ece954da05a0a0be325273a2413a48d806ef273d7e3387d728d76fc9bd144384673a36166cd27cf03d70038988e3c087276d90c1f3a467b462eb81b47a63de30557986970863d723b3e34e50ede064e2a971d440253a341259623dbcf8c1be141b38a2d4db4cce9f26b2e608dcb9a5e1b006e2147bd70ebe17934799931afb9211a8e7c7e05a0bb4bf76ad7d55b9a2d1f42a65257532166c978f3dcaadb922a4d78926d1a53c5b6ab20b1d4a91f384609e837390db68cb32735ce906a959f8b3556ab495c73cf098b5185c819fee87b633b5d925b2fed1e23b676ea5400cc22874e9635c7b29253a6d15752d8b1fa128dfd3bc2dbd83ad897c9c4c80971560bdf0ead6d423eed4d592e05d07502211230d43511cd42101d4bad13e14db78895f391af47542fb53667c01ed155b579997a625502905bfeaa46b2f62810b957e02cf39074d8ca37160a1afa05f24b789459cfa502e232bc80784e8f3a70f7f2c63ee5b2fb30a9f9abd7fb832e8344667541e8011263555f1b3c6eab9f137c7cce2009b0eff5a367438fc9a6c75562011dd14892bad6c16f8f29e9f893c66ee681ba2edb638662f9bf8200ab1a68b70af3d50d501deecc718bcc0b2a5a9e684c84cfe51ab2610b12e2b0316f12b5026a74d23fc4cf955ffbaa1ef15820a1fcd76f562b0c4fb829d4580a33381983126046c5d9805afd8bc9a6f61ab82f465c993c13cafebcce2c79a1219b9f7e1859927e3e0db2d32054c8bccdf7ef4a2b5f8ab459c24068fb38db512dee5973c5f23fba469135316ff26b9f8ba3cf81f8e74f8b7bc9b503f566699a1c29ced0e89e6629cd8128535bdf6ed3cb5eb6564460f31824b9c94f062b34e43d595b658a1b65797844b5a2d3d2cc7a424db1718c05b925df9830b1d24969dc5ea45f38c8377b41ad491a2dfa0dba646145d23c2632109bda5c2e5f8ca5669625e63f9da83c64e26ec36bf40c49a320eb5cdf7fb20a1c3ca106f79282cfb8a4b101eb1f5decde7853b0999c3aeac30ebd9aa5398b4fa2a07fe43eb2ccfe845128de5bc94d39c7ddf1fed5d3742e6c622d98928d2ba96933d2a59860e4c0d862f63d21ca9621abde3700e691cd8c372a407de7033dd2f48db3d17af9bf017cd4bb9e904a71a519b20aad0ab468b3024a4bdf53a6683c3fd63de1b1a4b909c7a17d22105c7d1f07722558d1b76a1b96085cef60d1f63c74bd9c3201638fdbe738abd8ef478c8f49a2e5645aeec1a4b552662b5443443d102f961e0cb1d385e8988539cc9be133e0a667ca08b58c98b298423930d0f01d06d4654069888f62b15d80f30dd5faee2f0b0331d787c315c83e48d9df04c2bcf0c50637c3167f8dc1a8e2f521fdaaddf0c50637c3167f8dc1a8e2f521fdaadd7f01f4c0810a192f932ab1a369864dd2ba67ba9e3dc9d7d6e96bc702f692b7f793ff1f4769e7e5f13cc7e46e07be1d9b561cf5f334e9271ce0454363a31478f7955039add7c86ed3ca281f52e2bb189248264d2ad82fe249103e9b138dc1f687eaa042294e098b2fd186cd08ce9153c76cc5bc984e35b55e2587d8d50997b7cf86fef78c19225242f0710fd0834412e7";
+        decrypt(s,"SkRfRk9DSU1DX1VBVA0ODw==",dao);
+        session.commit();
+    }
 }

src/main/java/com/foc/service/DynamicFlightService.java

@@ -18,6 +18,7 @@ import org.springframework.util.CollectionUtils;
 
 import java.io.IOException;
 import java.io.Reader;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -70,13 +71,15 @@ public class DynamicFlightService {
         return verifyAcTypes;
     }
 
-    public static void sta() {
+    public static void
+    sta() {
         StatisticalDao dao = session.getMapper(StatisticalDao.class);
         //总机型集合
         List<String> verifyAcTypes = getVerifyAcType();
 
         //获取航班动态表中所有航班性质为A,J,G，状态不为CNL，子机型为319/A320,321,320neo,330的航线的最后一班时间
-        String date = DateUtils.getLastDate();
+        //String date = DateUtils.getLastDate();
+        String date=DateUtils.getTime("yyyy-MM-dd 23:59:59");
         List<StatisticalEntity> list = dao.getFlightList(date);
         List<StatisticalEntity> slist = new ArrayList<>();
         //根据论证机型获取机型下的子机型
@@ -171,4 +174,5 @@ public class DynamicFlightService {
         session.commit();
         session.close();
     }
+
 }

src/main/resources/mapper/StatisticalMapper.xml

@@ -126,6 +126,55 @@
     </select>
 
     <insert id="insertDspReleaseInfo" parameterType="java.util.List">
+        INSERT INTO foc_flight_dynamics_sta ( send_time, flight_no, std, ac_no, dep_iata_id, arr_iata_id, total_oil, dispatcher_name, extra_oil_fuel_reason, e_e_t, weight_unit
+        , update_time,create_date,update_date, del_flag
+        ,airline_oil,remark_msg,alt1_fuel,alt1_time,alt1_distance,alt2_fuel,alt2_time,alt2_distance,cruising_altitude,
+        dep_air_port_name,arr_air_port_name,dispatcher_account,ac_type_name,arr_icao_id,dep_icao_id)
+        VALUES
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
+            #{item.sendTime}
+            , #{item.flightNo}
+            , #{item.std}
+            , #{item.acNo}
+            , #{item.depIataId}
+            , #{item.arrIataId}
+            , #{item.totalOil}
+            , #{item.dispatcherName}
+            , #{item.extraOilFuelReason}
+            , #{item.eET}
+            , #{item.weightUnit}
+            , #{item.updateTime}
+            , #{item.createDate}
+            , #{item.updateDate}
+            , #{item.delFlag}
+            , #{item.airlineOil}
+            , #{item.remarkMsg}
+            , #{item.alt1Fuel}
+            , #{item.alt1Time}
+            , #{item.alt1Distance}
+            , #{item.alt2Fuel}
+            , #{item.alt2Time}
+            , #{item.alt2Distance}
+            , #{item.cruisingAltitude}
+            , #{item.depAirPortName}
+            , #{item.arrAirPortName}
+            , #{item.dispatcherAccount}
+            , #{item.acTypeName}
+            , #{item.arrIcaoId}
+            , #{item.depIcaoId}
+            )
+        </foreach>
+        ON DUPLICATE KEY UPDATE
+        send_time = values(send_time)
+        , total_oil = values(total_oil)
+        , extra_oil_fuel_reason = values(extra_oil_fuel_reason)
+        , e_e_t = values(e_e_t)
+        , update_date = values(update_date)
+
+    </insert>
+
+    <insert id="insertDspReleaseInfo1" parameterType="java.util.List">
         INSERT INTO foc_flight_dynamics_sta ( send_time, flight_no, std, ac_no, dep_iata_id, arr_iata_id, total_oil, dispatcher_name, extra_oil_fuel_reason, e_e_t, weight_unit, update_time,create_date,update_date, del_flag )
         VALUES
         <foreach collection="list" item="item" index="index" separator=",">
@@ -200,4 +249,20 @@
     <select id="getAirlineStatic" resultType="com.foc.entity.StatisticalEntity">
         select * from foc_airline_sta where dep_iata=#{depIata} and arr_iata=#{arrIata} and del_flag=0
     </select>
+
+    <select id="selectAirPortNameByIataId" parameterType="string" resultType="string">
+        select city_name from  foc_airports where airport_iata=#{iataId}
+    </select>
+
+    <select id="selectUserNameByLoginName" resultType="java.lang.String">
+         select IFNULL(name,'') from  sys_user where login_name=#{dispatcherName}
+    </select>
+
+    <select id="selectAcTypeNameByAcNo" resultType="java.lang.String">
+        select  IFNULL(verify_ac_type,'') from foc_ac_type_oil where ac_no=#{acNo}
+    </select>
+
+    <select id="selectIcaoIdByTataId" resultType="java.lang.String">
+        select airport_icao from foc_airports where airport_iata=#{iataId}
+    </select>
 </mapper>
\ No newline at end of file