交通分析报告-周总体拥堵概况-拥堵次数计算修改

signal-optimize-service/src/main/resources/mapper/report/GreenWaveWeekDataMapper.xml

@@ -48,11 +48,11 @@
         select * from t_config_peak_hours;
     </select>
     <select id="selectGreenWaveWeekDataByTime" resultType="net.wanji.opt.entity.report.GreenWaveWeekData">
-        SELECT green_id,road_direction,max(traffic_index) max_congest_index,avg(traffic_index) congest_index,count(status>=3) congest_count,count(status>=3)*60*5 congest_duration,avg(speed) speed,sum(trval_time) travel_time
+        SELECT green_id,road_direction,max(traffic_index) max_congest_index,avg(traffic_index) congest_index,sum(status>=3) congest_count,sum(status>=3)*60*5 congest_duration,avg(speed) speed,sum(trval_time) travel_time
         from t_greenwave_hist where start_time BETWEEN #{startDate} and #{endDate} 	AND TIME( start_time ) BETWEEN #{startTime} AND #{endTime} GROUP BY green_id,road_direction
     </select>
     <select id="selectGreenWaveWeekData" resultType="net.wanji.opt.entity.report.GreenWaveWeekData">
-        SELECT green_id,road_direction,max(traffic_index) max_congest_index,avg(traffic_index) congest_index,count(status>=3) congest_count,count(status>=3)*60*5 congest_duration,avg(speed) speed,sum(trval_time) travel_time
+        SELECT green_id,road_direction,max(traffic_index) max_congest_index,avg(traffic_index) congest_index,sum(status>=3) congest_count,sum(status>=3)*60*5 congest_duration,avg(speed) speed,sum(trval_time) travel_time
         from t_greenwave_hist where start_time BETWEEN #{startDate} and #{endDate} GROUP BY green_id,road_direction
     </select>