[add] AI干线数量优化

signal-optimize-service/src/main/java/net/wanji/opt/synthesis/service/impl/StrategyControlServiceImpl.java

@@ -541,6 +541,7 @@ public class StrategyControlServiceImpl implements StrategyControlService {
         queryWrapper.orderByAsc(StrategyGreenOptHistEntity::getControlTime);
         List<StrategyGreenOptHistEntity> entities = strategyGreenOptHistMapper.selectList(queryWrapper);
         if (!CollectionUtils.isEmpty(entities)) {
+            String optMethod = "效率提升";
             Map<Integer, Optional<StrategyGreenOptHistEntity>> groupMap = entities.stream().collect(Collectors.groupingBy(StrategyGreenOptHistEntity::getGreenId, Collectors.maxBy(Comparator.comparing(StrategyGreenOptHistEntity::getControlTime))));
             for (Map.Entry<Integer, Optional<StrategyGreenOptHistEntity>> entry : groupMap.entrySet()) {
                 Integer greenId = entry.getKey();
@@ -563,12 +564,29 @@ public class StrategyControlServiceImpl implements StrategyControlService {
                 ext.setCrossName(greenwaveInfoPO.getName() + desc);
                 String location = greenwaveInfoPO.getWkt();
                 ext.setWkt(location);
-                String optMethod = "效率提升";
                 ext.setOptMethod(optMethod);
                 ext.setStrategyName("动态绿波");
                 results.add(ext);
             }
+            // 补充未优化的绿波
+            Map<Integer, GreenwaveInfoPO> greenWaveMap = GreenWaveInfoCache.greenWaveMap;
+            for (Map.Entry<Integer, GreenwaveInfoPO> entry : greenWaveMap.entrySet()) {
+                Integer greenId = entry.getKey();
+                GreenwaveInfoPO value = entry.getValue();
+                if (!groupMap.containsKey(greenId)) {
+                    StrategyControlDataExt ext = new StrategyControlDataExt();
+                    ext.setBizId(String.valueOf(greenId));
+                    ext.setCrossName(value.getName());
+                    ext.setWkt(value.getWkt());
+                    ext.setOptMethod(optMethod);
+                    ext.setStrategyName("动态绿波");
+                    ext.setOptStatus("未优化");
+                    ext.setStatus(0);
+                    results.add(ext);
+                }
+            }
         }
+
         results.sort(Comparator.comparing(StrategyControlDataExt::getStatus).reversed());
         return results;
     }