[add] 绿波图红绿灯优化

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

@@ -105,7 +105,12 @@ public class HisenseGreenChartTask {
                     Integer indexDir = indexDTO.getInDir();
                     Integer totalDistance = indexDTO.getTotalDistance();
 
-                    String greenKey = CommonUtils.getStrJoin(String.valueOf(greenId), String.valueOf(indexDir));
+                    String greenKey = null;
+                    if (Objects.equals(3, greenId)) {
+                        greenKey = CommonUtils.getStrJoin(String.valueOf(greenId), String.valueOf(indexDir + 2));
+                    } else {
+                        greenKey = CommonUtils.getStrJoin(String.valueOf(greenId), String.valueOf(indexDir));
+                    }
                     GreenwaveRealtimePO greenwaveRealtimePO = realTimeMap.get(greenKey);
                     Double speed = Objects.isNull(greenwaveRealtimePO.getSpeed()) ? 0 : greenwaveRealtimePO.getSpeed();
                     // km/h速度换成m/s
@@ -122,7 +127,13 @@ public class HisenseGreenChartTask {
                     List<GreenCrossDirDTO> backValue = value.stream().sorted(Comparator.comparingInt(GreenCrossDirDTO::getSort).reversed()).collect(Collectors.toList());
                     List<Double> backOffsets = new ArrayList<>();
                     List<Double> backDistances = new ArrayList<>();
-                    String backGreenKey = CommonUtils.getStrJoin(String.valueOf(greenId), String.valueOf(indexOutDir));
+
+                    String backGreenKey = null;
+                    if (Objects.equals(3, greenId)) {
+                        backGreenKey = CommonUtils.getStrJoin(String.valueOf(greenId), String.valueOf(indexOutDir + 2));
+                    } else {
+                        backGreenKey = CommonUtils.getStrJoin(String.valueOf(greenId), String.valueOf(indexOutDir));
+                    }
                     GreenwaveRealtimePO backGreenwaveRealtimePO = realTimeMap.get(backGreenKey);
                     // km/h速度换成m/s
                     Double backSpeed = Objects.isNull(backGreenwaveRealtimePO.getSpeed()) ? 0 : backGreenwaveRealtimePO.getSpeed();
@@ -353,14 +364,19 @@ public class HisenseGreenChartTask {
                         crossRedTimes.add(Arrays.asList(cycleIndex + offset + greenEndTime, cycleLen + offset));
                     } else if (i > 0 && i < cycleSum) {
                         crossRedTimes.add(Arrays.asList(cycleIndex + offset + greenEndTime, cycleIndex * (i + 1) + offset));
+                        // 绿灯时间
+                        crossGreenTimes.add(Arrays.asList(cycleIndex + offset + greenStartTime, cycleIndex + offset + greenEndTime));
                     } else if (i == cycleSum) {
                         // a最后一个周期补充相位差
                         crossRedTimes.add(Arrays.asList(cycleIndex + offset + greenEndTime, cycleIndex + offset + endCycleExt));
                         // 绿灯时间
-                        crossGreenTimes.add(Arrays.asList(cycleIndex + offset + greenStartTime, cycleIndex + offset + greenEndTime));
+                        if (greenStartTime > endCycleExt) {
+                            //crossGreenTimes.add(Arrays.asList(cycleIndex + offset + greenStartTime, cycleIndex + offset + endCycleExt));
+                        } else {
+                            crossGreenTimes.add(Arrays.asList(cycleIndex + offset + greenStartTime, cycleIndex + offset + endCycleExt));
+                        }
                     }
-                    // 绿灯时间
-                    crossGreenTimes.add(Arrays.asList(cycleIndex + offset + greenStartTime, cycleIndex + offset + greenEndTime));
+
                 } else { // 红灯结束时间 < 相位差, 相位差包含绿灯,endCycleExt都是红灯
                     // 相位差中绿灯时间
                     if (i == 0) {
@@ -374,14 +390,15 @@ public class HisenseGreenChartTask {
                     } 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));
+                        // 绿灯时间
+                        crossGreenTimes.add(Arrays.asList(cycleIndex + offset + greenStartTime, cycleIndex + offset + greenEndTime));
                     }
                     // 最后一个周期补充相位差
                     if (i == cycleSum) {
-                        crossRedTimes.add(Arrays.asList(cycleIndex + offset, cycleIndex + offset + greenStartTime));
-                        crossRedTimes.add(Arrays.asList(cycleIndex + offset + greenEndTime, cycleIndex + offset + endCycleExt));
+                        crossRedTimes.add(Arrays.asList(cycleIndex + offset, cycleIndex + offset + endCycleExt));
+                        //crossRedTimes.add(Arrays.asList(cycleIndex + offset + greenEndTime, cycleIndex + offset + endCycleExt));
                     }
-                    // 绿灯时间
-                    crossGreenTimes.add(Arrays.asList(cycleIndex + offset + greenStartTime, cycleIndex + offset + greenEndTime));
+
                 }
             }
             crossRedTimesMap.put(crossId, crossRedTimes);