Merge remote-tracking branch 'origin/master'

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

@@ -362,6 +362,8 @@ public class HisenseGreenChartTask {
                     if (i == 0) {
                         crossRedTimes.add(Arrays.asList(cycleIndex, cycleIndex + offset + greenStartTime));
                         crossRedTimes.add(Arrays.asList(cycleIndex + offset + greenEndTime, cycleLen + offset));
+                        // 绿灯时间
+                        crossGreenTimes.add(Arrays.asList(cycleIndex + offset + greenStartTime, cycleIndex + offset + greenEndTime));
                     } else if (i > 0 && i < cycleSum) {
                         crossRedTimes.add(Arrays.asList(cycleIndex + offset + greenEndTime, cycleIndex * (i + 1) + offset));
                         // 绿灯时间
@@ -387,6 +389,8 @@ public class HisenseGreenChartTask {
                         }
                         crossRedTimes.add(Arrays.asList(offsetGreen, offset + greenStartTime));
                         crossRedTimes.add(Arrays.asList(cycleIndex + offset + greenEndTime, cycleLen + offset));
+                        // 绿灯时间
+                        crossGreenTimes.add(Arrays.asList(cycleIndex + offset + greenStartTime, cycleIndex + offset + greenEndTime));
                     } else if (i > 0 && i < cycleSum) {
                         crossRedTimes.add(Arrays.asList(cycleIndex + offset, cycleIndex + offset + greenStartTime));
                         crossRedTimes.add(Arrays.asList(cycleIndex + offset + greenEndTime, cycleIndex * (i + 1) + offset));

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

@@ -64,14 +64,14 @@
 
     <select id="getFlow" resultType="java.lang.Integer">
         SELECT COALESCE(flow, 0) from
-                (select cross_id from t_greenwave_cross where green_id = #{greenId} and sort = 1) cross_data
+                (select cross_id from t_greenwave_cross where green_id = #{greenId} and is_key_route = 1 limit 1) cross_data
                     left join
             (SELECT sum(flow) as flow,cross_id from t_cross_dir_data_hist  where start_time BETWEEN #{startDate} AND #{endDate} and dir_type = #{dir} GROUP BY cross_id) cross_flow on cross_data.cross_id = cross_flow.cross_id
     </select>
 
     <select id="getFlowByTime" resultType="java.lang.Integer">
         SELECT COALESCE(flow, 0) from
-                (select cross_id from t_greenwave_cross where green_id = #{greenId} and is_key_route = 1) cross_data
+                (select cross_id from t_greenwave_cross where green_id = #{greenId} and is_key_route = 1 limit 1) cross_data
                     left join
             (SELECT sum(flow) as flow,cross_id from t_cross_dir_data_hist  where start_time BETWEEN #{startDate} AND #{endDate} AND TIME( start_time ) BETWEEN #{startTime} AND #{endTime} and dir_type = #{dir} GROUP BY cross_id) cross_flow on cross_data.cross_id = cross_flow.cross_id
     </select>

signal-optimize-service/src/main/java/net/wanji/opt/servicev2/judgeanalysis/impl/AnalysisGreenCongestionPeriodServiceImpl.java

@@ -270,7 +270,7 @@ public class AnalysisGreenCongestionPeriodServiceImpl implements AnalysisGreenCo
             }
             return - congestIndexAll/x.getList().size();
         })).collect(Collectors.toList());
-        Set<Integer> greenIds = new HashSet<>();
+        List<Integer> greenIds = new ArrayList<>();
         for (GreenReportProblemOverallDataVO periodVO : overallDataVOS) {
             greenIds.add(Integer.valueOf(periodVO.getGreenId()));
             if (greenIds.size() >= 2) {