Commit 762373ce authored by hanbing's avatar hanbing

[update] 信号评价-流量取加总

parent 3e0fbee1
...@@ -492,15 +492,12 @@ public class SceneEvaluateServiceImpl implements SceneEvaluateService { ...@@ -492,15 +492,12 @@ public class SceneEvaluateServiceImpl implements SceneEvaluateService {
element.setSort(sort); element.setSort(sort);
List<CrossLaneDataHistPOExt> poExtList = entry.getValue(); List<CrossLaneDataHistPOExt> poExtList = entry.getValue();
// 获取流量 // 获取流量
OptionalDouble optionalAverageFlow = poExtList.stream() int totalFlow = poExtList.stream()
.filter(Objects::nonNull) .filter(Objects::nonNull)
.mapToInt(CrossLaneDataHistPOExt::getFlow) .mapToInt(CrossLaneDataHistPOExt::getFlow)
.average(); .sum();
int averageFlow = 0; int averageFlow = 0;
if (optionalAverageFlow.isPresent()) { element.setFlow(totalFlow);
averageFlow = (int) Math.round(optionalAverageFlow.getAsDouble());
}
element.setFlow(averageFlow);
// 动态指标 // 动态指标
element.setMetricsMap(buildLaneMetricMap(poExtList, status)); element.setMetricsMap(buildLaneMetricMap(poExtList, status));
......
...@@ -18,7 +18,7 @@ import java.util.Map; ...@@ -18,7 +18,7 @@ import java.util.Map;
@NoArgsConstructor @NoArgsConstructor
@ApiModel(value = "SceneEvaluateMetricsLaneVO", description = "车道级指标") @ApiModel(value = "SceneEvaluateMetricsLaneVO", description = "车道级指标")
public class SceneEvaluateMetricsLaneVO { public class SceneEvaluateMetricsLaneVO {
// todo 目前只有拥堵,后期扩展考虑增加字段 // 只有拥堵显示
@ApiModelProperty(value = "等级",notes = "0畅通 1轻度 2中度 3严重") @ApiModelProperty(value = "等级",notes = "0畅通 1轻度 2中度 3严重")
private Integer level ; private Integer level ;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment