修正路口及干线持续时长无数据，路口高峰计算计算昨日

signal-optimize-data-compute/src/main/java/net/wanji/opt/dao/mapper/judgeanalysis/AnalysisGreenCongestionPeriodMapper.java

@@ -23,5 +23,6 @@ public interface AnalysisGreenCongestionPeriodMapper {
     List<laneDataHist> selectCrossPeakDetail(@Param("date") String date);
     List<laneDataHist> selectCrossMAXPeakDetail(@Param("date") String date);
     void updateCrossMAXPeakDetail(Map<String, Object> map);
+    void insertCrossDataHistByDay(Map<String, Object> map);
     List<AnalysisGreenCongestionPeriodVO> selectListByWeek(@Param("yearWeek") Integer yearWeek);
 }

signal-optimize-data-compute/src/main/java/net/wanji/opt/servicev2/judgeanalysis/AnalysisGreenCongestionPeriodService.java

@@ -10,6 +10,7 @@ public interface AnalysisGreenCongestionPeriodService {
     public void selectCountByCongestionPeriod() throws ParseException;
     public void selectCountByLandData() throws ParseException;
     public void selectCountByCrossData() throws ParseException;
+    public void selectCountByCrossDataOneDay() throws ParseException;
     GreenReportProblemOverallAnalysisResult selectListByWeek(Integer year, Integer week, String ids);
 
     List<GreenReportProblemDetailAnalysisResult> getProblemDetail(Integer year, Integer week, String ids);

signal-optimize-data-compute/src/main/java/net/wanji/opt/task/AnalysisGreenCongestionPeriodWeekTask.java

@@ -26,6 +26,6 @@ public class AnalysisGreenCongestionPeriodWeekTask {
 
         analysisGreenCongestionPeriodService.selectCountByLandData();
 
-        analysisGreenCongestionPeriodService.selectCountByCrossData();
+        //analysisGreenCongestionPeriodService.selectCountByCrossData();
     }
 }

signal-optimize-data-compute/src/main/resources/mapper/judgeanalysis/AnalysisGreenCongestionPeriodMapper.xml

@@ -135,6 +135,21 @@
           and a.cross_id = #{crossId}
     </insert>
 
+    <insert id="insertCrossDataHistByDay" parameterType="map">
+        insert into t_analysis_report_cross_peak_detail (cross_id,week_day,peak_type,day_type,peak_start_time,peak_end_time,day_total_flow,
+               day_max_hour_flow,peak_max_hour_flow,peak_traffic_index,peak_avg_deay_time,peak_max_queue_length,
+               peak_avg_stop_times,year_week,week_start_time,week_end_time,insert_time,peak_capacity,peak_flow,peak_speed)
+
+        select a.cross_id,#{weekDay} as week_day,#{peakType},#{dayType},DATE_FORMAT(#{startTime},'%Y-%m-%d %H:%i:%s') as peak_start_time,
+               DATE_FORMAT(#{endTime},'%Y-%m-%d %H:%i:%s') as peak_end_time, #{sumFlowDate},#{maxFlowDate},#{maxFlow},AVG(traffic_index),
+               CEIL(AVG(delay_time)),CEIL(AVG(queue_length)),CEIL(AVG(stop_times)),
+               #{weekNumber} as year_week,DATE_FORMAT(#{weekStartTime},'%Y-%m-%d') as week_start_time,
+               DATE_FORMAT(#{weekEndTime},'%Y-%m-%d') as week_end_time,now(),#{maxFlow},sum(flow),AVG(speed)
+        from t_cross_data_hist a
+        where DATE_FORMAT(a.start_time,'%Y-%m-%d %H:%i:00') between DATE_FORMAT(#{startTime},'%Y-%m-%d %H:%i:00') and DATE_FORMAT(DATE_SUB(#{endTime},INTERVAL 5 MINUTE),'%Y-%m-%d %H:%i:%s')
+          and a.cross_id = #{crossId}
+    </insert>
+
     <select id="selectCrossPeakDetail" parameterType="String" resultMap="AnalysisLaneDataHistMap">
         select  t.cross_id,t.peak_start_time as start_time,t.peak_end_time as endTime ,t.peak_type,t.peak_traffic_index as traffic_index
         from t_analysis_report_cross_peak_detail t

signal-optimize-service/src/main/resources/mapper/CrossMapper.xml

@@ -62,7 +62,7 @@
     </select>
 
     <select id="getCrossRealTimeAlarms" parameterType="String" resultMap="CrossRealTimeAlarmsResultMap">
-        select a.type , a.start_time as startTime , SUBSTR(a.dir, 2, length(a.dir)-2) as dir , a.event_serial_number as eventSerialNumber , a.duration
+        select a.type , a.start_time as startTime , SUBSTR(a.dir, 2, length(a.dir)-2) as dir , a.event_serial_number as eventSerialNumber , TIMESTAMPDIFF(SECOND, a.start_time, a.end_time)  as  duration
         from t_event_info a
         where a.start_time = (select  MAX(start_time) from t_event_info where cross_id = #{crossID}
         and start_time <![CDATA[ <= ]]>  DATE_FORMAT(#{time}, '%Y-%m-%d %H:%i:%s') and start_time >=  DATE_FORMAT(DATE_SUB(#{time},INTERVAL 5 MINUTE), '%Y-%m-%d %H:%i:%s')

signal-optimize-service/src/main/resources/mapper/TrunkLineMapper.xml

@@ -39,7 +39,7 @@
     </select>
 
     <select id="getTrunkLineRealTimeAlarm" parameterType="map" resultMap="tlRealTimeAlarmsResultMap">
-        select a.type , a.start_time as startTime , SUBSTR(a.dir, 2, length(a.dir)-2) as dir , a.duration
+        select a.type , a.start_time as startTime , SUBSTR(a.dir, 2, length(a.dir)-2) as dir , TIMESTAMPDIFF(SECOND, a.start_time, a.end_time)  as  duration
         from t_event_info a
         where a.start_time = (select  MAX(start_time) from t_event_info where green_id = #{greenID}
           and start_time <![CDATA[ <= ]]>  DATE_FORMAT(#{time}, '%Y-%m-%d %H:%i:%s') and start_time >=  DATE_FORMAT(DATE_SUB(#{time},INTERVAL 5 MINUTE), '%Y-%m-%d %H:%i:%s')