修改论证条件

resources/mapper/modules/flight/AirCarrierDao.xml

 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ejweb.modules.flight.dao.AirCarrierDao" >
+<mapper namespace="com.ejweb.modules.flight.dao.AirCarrierDao">
     <!-- 获取当天的飞机号列表 -->
     <select id="findAirCarrierList" resultType="com.ejweb.modules.flight.entity.AirCarrierListEntity">
         <!-- 
@@ -13,25 +13,25 @@
         )
         -->
         SELECT s.id,
-               s.satellite_phone,
-               a.ac_long_no AS  satellite_name
+        s.satellite_phone,
+        a.ac_long_no AS satellite_name
         FROM (
-          SELECT DISTINCT d.ac_long_no
-          FROM foc_flight_dynamics d
-          WHERE d.ac_long_no != ''
-          <if test="queryDate != null and queryDate != ''">
-              AND d.datop_chn=#{queryDate}
-          </if>
-          ORDER BY d.etd_chn DESC
+        SELECT DISTINCT d.ac_long_no
+        FROM foc_flight_dynamics d
+        WHERE d.ac_long_no != ''
+        <if test="queryDate != null and queryDate != ''">
+            AND d.datop_chn=#{queryDate}
+        </if>
+        ORDER BY d.etd_chn DESC
         ) a
         LEFT JOIN foc_satellite_phone s
-         ON a.ac_long_no = s.satellite_name
-           AND s.status=1
+        ON a.ac_long_no = s.satellite_name
+        AND s.status=1
         <if test="airCarrierNo != null and airCarrierNo != ''">
-           WHERE a.ac_long_no LIKE 
-           <if test="dbName == 'oracle'">'%'||#{airCarrierNo}||'%')</if>
-           <if test="dbName == 'mssql'">'%'+#{airCarrierNo}+'%')</if>
-           <if test="dbName == 'mysql'">CONCAT('%', #{airCarrierNo}, '%')</if> 
+            WHERE a.ac_long_no LIKE
+            <if test="dbName == 'oracle'">'%'||#{airCarrierNo}||'%')</if>
+            <if test="dbName == 'mssql'">'%'+#{airCarrierNo}+'%')</if>
+            <if test="dbName == 'mysql'">CONCAT('%', #{airCarrierNo}, '%')</if>
         </if>
     </select>
     <!-- 查询航班列表 -->
@@ -59,7 +59,22 @@
                d.status,
                d.flight_no,
                d.ac_long_no,
-               d.datop_chn AS flightDate
+               d.datop_chn AS flightDate,
+               case d.stc when 'A' then '货运包机'
+                    when 'C' then '旅客包机'
+                    when 'D' then '补班'
+                    when 'E' then '专机'
+                    when 'F' then '货机'
+                    when 'G' then '加班'
+                    when 'H' then '货物加班'
+                    when 'J' then '正班'
+                    when 'K' then '训练/本场训练'
+                    when 'L' then '急救'
+                    when 'O' then '公务飞行'
+                    when 'P' then '调机'
+                    when 'T' then '试飞'
+                    when 'X' then '技术经停'
+               else '其他' end `stc`
         FROM foc_flight_dynamics d
         INNER JOIN foc_airports dp
           ON d.dep_stn=dp.airport_iata

src/com/ejweb/core/util/PropertiesUtils.java

@@ -8,20 +8,31 @@ import java.util.Properties;
  * @author zangtao
  */
 public class PropertiesUtils {
-    private static Properties properties ;
+    private static Properties properties;
 
     /**
      * 获取配置文件中配置信息
      */
-    static { }
+    static {
+    }
 
-    public static Properties getProperties(){
-        if (properties == null){
+    public static Properties getProperties() {
+        if (properties == null) {
             properties = new Properties();
+            InputStreamReader in = null;
             try {
-                properties.load(new InputStreamReader(PropertiesUtils.class.getClassLoader().getResourceAsStream("redis.properties"),"UTF-8"));
+                in = new InputStreamReader(PropertiesUtils.class.getClassLoader().getResourceAsStream("redis.properties"), "UTF-8");
+                properties.load(in);
             } catch (IOException e) {
                 e.printStackTrace();
+            } finally {
+                if (in != null) {
+                    try {
+                        in.close();
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
             }
         }
         return properties;

src/com/ejweb/modules/flight/entity/AirCarrierFlightListEntity.java

@@ -87,6 +87,7 @@ public class AirCarrierFlightListEntity extends BaseEntity {
     @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private Date latestModifyTime;
 
+    private String stc;
     public Date getEta() {
         return eta;
     }
@@ -242,4 +243,12 @@ public class AirCarrierFlightListEntity extends BaseEntity {
     public void setLatestModifyTime(Date latestModifyTime) {
         this.latestModifyTime = latestModifyTime;
     }
+
+    public String getStc() {
+        return stc;
+    }
+
+    public void setStc(String stc) {
+        this.stc = stc;
+    }
 }