修改飞机统计

.gitignore

+# Created by .ignore support plugin (hsz.mobi)
+/im.message.log
+/.idea/
+/.classpath
+/out/
+/.project
+/.settings/

resources/ejweb.properties

@@ -69,7 +69,7 @@ content.sign.private.key=FvNMhdkN5eTsgAfU2YHGJ2RfpKVi3omn
 # Verify Post Content Sign(Default true)
 is.verify.content.sign=false
 # \u9996\u822A\u63A5\u53E3\u57FA\u672C\u5730\u5740
-jdair.api.base.url=http://123.56.146.7
+jdair.api.base.url=https://dsp.jdair.net
 jdair.api.base.param=ai.cc=7&ai.cp=10.68.26.52
 
 #huaweiUC properties

resources/log4j.properties

 # Root logger option
 ## log4j.rootLogger=DEBUG, WARN, INFO, stdout, R
-log4j.rootLogger=DEBUG, stdout, R
+log4j.rootLogger=INFO, stdout, R
 #Console
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
+#log4j.appender.stdout.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n
+log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss a} [Thread: %t][ Class:%c  Method: %l ]%n%p:%m%n
 
 #RollingFile
 log4j.appender.R=org.apache.log4j.RollingFileAppender

resources/mapper/modules/statistics/FlightDynamicsDao.xml

@@ -250,12 +250,12 @@ WHERE c.subtime BETWEEN CONVERT(CONCAT(DATE_ADD(#{fltDate},INTERVAL -1 DAY), " 2
           update_by=VALUES(update_by),
           update_date=VALUES(update_date)
     </insert>
-    
-    <!-- 获取飞机总量 -->
-    <select id="getTotalFlight" resultType="com.ejweb.modules.statistics.entity.FlightTotalEntity">
-        SELECT * 
+
+    <!-- 获取最近时间飞机总量 -->
+    <select id="getLastTotalFlight" resultType="com.ejweb.modules.statistics.entity.FlightTotalEntity">
+        SELECT *
         FROM foc_flight_total
-        WHERE flight_date=#{flightDate}
+        order by flight_date desc limit 1;
     </select>
     <select id="getPlaneDailyUsage" resultType="Double">
          SELECT SUM(unix_timestamp(ata_chn) - unix_timestamp(atd_chn))/(60*60*#{flightTotal}) 

src/com/ejweb/modules/statistics/dao/FlightDynamicsDao.java

@@ -20,8 +20,8 @@ public interface FlightDynamicsDao extends BaseDao{
 	List<FlightDynamicsEntity> getDailyList(FlightDynamicsTotalBean bean);
 	
 	public Integer updateTotalFlight(FlightTotalEntity bean);
-	
-	public FlightTotalEntity getTotalFlight(FlightTotalEntity bean);
+
+    public FlightTotalEntity getLastTotalFlight();
 
 	List<FlightDynamicsDetailEntity> getCancelList(FlightDynamicsDetailBean bean);
 

src/com/ejweb/modules/statistics/service/FlightDynamicsService.java

@@ -188,12 +188,7 @@ public class FlightDynamicsService extends BaseService<FlightDynamicsDao> {
 		} else {
 			LOG.debug("没有数据");
 		}
-		int flightTotal = this.getTotalFlight(bean.getFltDate());
-        if(flightTotal<1){
-            
-            flightTotal = 72;
-        }
-        
+        int flightTotal = getLastTotalFlight();
          totalEntity.setPlanFlightTotal(flightTotal);
         
          totalEntity.setPlaneDailyUsage(dao.getPlaneDailyUsage(bean.getFltDate(),flightTotal));
@@ -220,22 +215,17 @@ public class FlightDynamicsService extends BaseService<FlightDynamicsDao> {
 	    
 	    return dao.updateTotalFlight(bean);
 	}
+
 	/**
-	 * 获取某一天的飞机总量
-	 * 
-	 * @author renmb
-	 * @time  2017年2月8日
-	 * @param flightDate
+     * 获取最近修改的飞机总量
+     *
 	 * @return
 	 */
-	public int getTotalFlight(String flightDate){
-	    
-	    FlightTotalEntity bean = new FlightTotalEntity();
-        bean.setFlightDate(flightDate);
-        
-        FlightTotalEntity total = dao.getTotalFlight(bean);
-        if(total == null)
+    public int getLastTotalFlight() {
+        FlightTotalEntity total = dao.getLastTotalFlight();
+        if (total == null) {
             return 0;
+        }
         return total.getFlightTotal();
 	}
 }