[add] 绿波干线运行监测优化返回数据

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

@@ -538,18 +538,30 @@ public class TrendServiceImpl implements TrendService {
         List<GreenwaveRunMonitorVO> res = new ArrayList<>();
         Date date = new Date();
         List<GreenwaveHistPOExt> extList = greenwaveHistoryMapper.selectRunMonitorV2(greenwaveIdBO.getGreenwaveId(), date);
-        for (GreenwaveHistPOExt greenwaveHistPOExt : extList) {
-            GreenwaveRunMonitorVO greenWaveRunMonitorVO = new GreenwaveRunMonitorVO();
-            String hour = greenwaveHistPOExt.getHour();
-            greenWaveRunMonitorVO.setHour(hour);
-            greenWaveRunMonitorVO.setAvgSpeed(greenwaveHistPOExt.getAvgSpeed());
-            Double congestionIndex = greenwaveHistPOExt.getCongestionIndex();
-            greenWaveRunMonitorVO.setCongestionIndex(congestionIndex);
-            Double trvalTime = greenwaveHistPOExt.getTrvalTime();
-            greenWaveRunMonitorVO.setTravelTime(trvalTime.intValue());
-            greenWaveRunMonitorVO.setRoadDirection(greenwaveHistPOExt.getRoadDirection());
-            res.add(greenWaveRunMonitorVO);
+        if (!CollectionUtils.isEmpty(extList)) {
+            Map<String, List<GreenwaveHistPOExt>> listMap = extList.stream().collect(Collectors.groupingBy(GreenwaveHistPOExt::getRoadDirection));
+            for (Map.Entry<String, List<GreenwaveHistPOExt>> entry : listMap.entrySet()) {
+                String roadDirection = entry.getKey();
+                List<GreenwaveHistPOExt> value = entry.getValue();
+                GreenwaveRunMonitorVO vo = new GreenwaveRunMonitorVO();
+                vo.setRoadDirection(roadDirection);
+                List<GreenwaveRunMonitorVO.Detail> details = new ArrayList<>(value.size());
+                for (GreenwaveHistPOExt greenwaveHistPOExt : value) {
+                    GreenwaveRunMonitorVO.Detail detail = new GreenwaveRunMonitorVO.Detail();
+                    String hour = greenwaveHistPOExt.getHour();
+                    detail.setHour(hour);
+                    detail.setAvgSpeed(greenwaveHistPOExt.getAvgSpeed());
+                    Double congestionIndex = greenwaveHistPOExt.getCongestionIndex();
+                    detail.setCongestionIndex(congestionIndex);
+                    Double trvalTime = greenwaveHistPOExt.getTrvalTime();
+                    detail.setTravelTime(trvalTime.intValue());
+                    details.add(detail);
+                }
+                vo.setDetailList(details);
+                res.add(vo);
+            }
         }
+
         return res;
     }
 

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

@@ -924,8 +924,13 @@ public class StrategyControlServiceImpl implements StrategyControlService {
                 List<StrategyControlDataVO> dataList = new ArrayList<>();
                 for (StrategyPlanDTO strategyPlanDTO : resultList) {
                     StrategyControlDataVO dataVO = new StrategyControlDataVO();
-                    dataVO.setBizId(strategyPlanDTO.getCrossId());
-                    dataVO.setBizType(0);
+                    String bizId = strategyPlanDTO.getCrossId();
+                    dataVO.setBizId(bizId);
+                    if (bizId.length() == 1) {
+                        dataVO.setBizType(1);
+                    } else {
+                        dataVO.setBizType(0);
+                    }
                     dataVO.setStrategy(strategyPlanDTO.getStrategy());
                     dataVO.setScheduleStart(strategyPlanDTO.getStartTime());
                     dataVO.setScheduleEnd(strategyPlanDTO.getEndTime());

signal-optimize-service/src/main/java/net/wanji/opt/vo/GreenwaveRunMonitorVO.java

 package net.wanji.opt.vo;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 @NoArgsConstructor
 @Data
 @ApiModel(value = "GreenwaveRunMonitorVO", description = "子区信息-运行监测返回值")
 public class GreenwaveRunMonitorVO {
-    @ApiModelProperty(value = "时间")
-    private String hour;
-    @ApiModelProperty(value = "平均速度")
-    private Integer avgSpeed;
-    @ApiModelProperty(value = "拥堵指数")
-    private Double congestionIndex;
-    @ApiModelProperty(value = "行程时间")
-    private Integer travelTime;
+
     @ApiModelProperty(value = "绿波方向")
     private String roadDirection;
+    private List<Detail> detailList;
+    @Data
+    public static class Detail {
+        @ApiModelProperty(value = "时间")
+        private String hour;
+        @ApiModelProperty(value = "平均速度")
+        private Integer avgSpeed;
+        @ApiModelProperty(value = "拥堵指数")
+        private Double congestionIndex;
+        @ApiModelProperty(value = "行程时间")
+        @JsonProperty("trvalTime")
+        private Integer travelTime;
+    }
 }

signal-optimize-service/src/main/resources/mapper/GreenwaveHistMapper.xml

@@ -85,7 +85,7 @@
         when road_direction='e2w' then '东向西'
         when road_direction='w2e' then '西向东'
         end ) roadDirection,
-        DATE_FORMAT(start_time, '%Y-%m-%d %H:%i:00') AS hour,
+        DATE_FORMAT(start_time, '%H:%i') AS hour,
         speed AS avg_speed,
         traffic_index AS congestion_index,
         trval_time AS trval_time