[add] 绿波策略优化记录

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

@@ -488,37 +488,35 @@ public class StrategyControlServiceImpl implements StrategyControlService {
 
     private List<StrategyControlDataExt> getGreenList(Date date) {
         List<StrategyControlDataExt> results = new ArrayList<>();
-        List<HoloEventInfoPO> holoEventInfoPOS = holoEventMapper.selectAIGreenList(date);
-        if (!CollectionUtils.isEmpty(holoEventInfoPOS)) {
-            for (HoloEventInfoPO holoEventInfoPO : holoEventInfoPOS) {
+        LambdaQueryWrapper<StrategyGreenOptHistEntity> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.ge(StrategyGreenOptHistEntity::getControlTime, date);
+        queryWrapper.orderByAsc(StrategyGreenOptHistEntity::getControlTime);
+        List<StrategyGreenOptHistEntity> entities = strategyGreenOptHistMapper.selectList(queryWrapper);
+        if (!CollectionUtils.isEmpty(entities)) {
+            for (StrategyGreenOptHistEntity entity : entities) {
+                Integer greenId = entity.getGreenId();
                 StrategyControlDataExt ext = new StrategyControlDataExt();
-                ext.setBizId(holoEventInfoPO.getCrossId());
-                ext.setCrossName(holoEventInfoPO.getRemark());
-                String location = holoEventInfoPO.getExtend();
-                ext.setWkt(location);
-                Integer alarmStatus = holoEventInfoPO.getAlarmStatus();
-                String optMethod = "效率提升";
-                if (Objects.isNull(alarmStatus)) {
-                    ext.setStatus(-1);
+                Integer controlMethod = entity.getControlMethod();
+                if (Objects.equals(-1, controlMethod)) {
+                    ext.setStatus(0);
+                    ext.setOptStatus("优化中");
                 } else {
-                    ext.setStatus(alarmStatus);
+                    ext.setStatus(1);
+                    ext.setOptStatus("未优化");
                 }
+                Map<Integer, GreenwaveInfoPO> greenWaveMap = GreenWaveInfoCache.greenWaveMap;
+                GreenwaveInfoPO greenwaveInfoPO = greenWaveMap.get(greenId);
+                ext.setBizId(String.valueOf(entity.getGreenId()));
+                ext.setCrossName(greenwaveInfoPO.getName());
+                String location = greenwaveInfoPO.getWkt();
+                ext.setWkt(location);
+                String optMethod = "效率提升";
                 ext.setOptMethod(optMethod);
-                String desc = EventStatusEnum.getDesc(alarmStatus);
-                ext.setOptStatus(desc);
-                String type = holoEventInfoPO.getType();
-                if (StringUtils.isBlank(type)) {
-                    ext.setStrategyName("动态绿波");
-                }
-                if (StringUtils.equals("705", type)) {
-                    ext.setStrategyName("干线-缓行");
-                }
-                if (StringUtils.equals("706", type)) {
-                    ext.setStrategyName("干线-拥堵");
-                }
+                ext.setStrategyName("动态双向绿波");
                 results.add(ext);
             }
         }
+
         results.sort(Comparator.comparing(StrategyControlDataExt::getStatus).reversed());
         return results;
     }