Merge remote-tracking branch 'origin/master'

signal-optimize-service/src/main/java/net/wanji/opt/po/base/CrossLaneDataHistPoExtend.java

@@ -45,13 +45,17 @@ public class CrossLaneDataHistPoExtend   {
 
     @ApiModelProperty(value = "交通流量（辆）",notes = "")
     private Integer flow;
+
     @ApiModelProperty(value = "平均速度（km/h）",notes = "")
     private Double speed;
+
     @ApiModelProperty(value = "停车次数",notes = "")
     private Double stopTimes;
+
     @ApiModelProperty(value = "延误时间",notes = "")
     private Integer delayTime;
-    @ApiModelProperty(value = "饱和度",notes = "")
+
+    @ApiModelProperty(value = "饱和度【强度】",notes = "")
     private Double sturation;
 
     @ApiModelProperty(value = "服务水平",notes = "")
@@ -64,4 +68,10 @@ public class CrossLaneDataHistPoExtend   {
 
     @ApiModelProperty(value = "时间轴", notes = "")
     public String timeAxis;
+
+    @ApiModelProperty(value = "绿灯利用率", notes = "")
+    double greenLightEfficiency;
+
+    @ApiModelProperty(value = "空间占有率", notes = "")
+    double vehicleLengthRatioMean;
 }

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

@@ -266,6 +266,8 @@
         round(AVG(delay_time),2) delay_time,
         round(AVG(traffic_index),2) traffic_index,
         round(AVG(sturation),4) sturation,
+        round(AVG(green_light_efficiency),4) green_light_efficiency,
+        round(AVG(vehicle_length_ratio_mean),4) vehicle_length_ratio_mean,
         group_concat(service_level) service_level
         FROM
         (
@@ -288,6 +290,8 @@
                     null as turn_type,
                     null as service_level,
                     traffic_index,
+                    green_light_efficiency,
+                    null as vehicle_length_ratio_mean,
                 </when>
                 <!-- 转向级 -->
                 <when test="objectType==2">
@@ -296,6 +300,8 @@
                     null as lane_no,
                     null as service_level,
                     traffic_index,
+                    green_light_efficiency,
+                    null as vehicle_length_ratio_mean,
                 </when>
                 <!-- 车道级 -->
                 <when test="objectType==3">
@@ -304,6 +310,8 @@
                     t2.turn as turn_type,
                     null as service_level,
                     null as traffic_index,
+                    green_light_efficiency,
+                    vehicle_length_ratio_mean,
                 </when>
                 <!-- 路口级 -->
                 <when test="objectType==4">
@@ -312,6 +320,8 @@
                     null as turn_type,
                     ifnull(service_level,'A') service_level,
                     traffic_index,
+                    green_light_efficiency,
+                    null as vehicle_length_ratio_mean,
                 </when>
                 <otherwise>
                 </otherwise>