场景详细评价平均指标

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

@@ -18,8 +18,8 @@ public class CrossLaneDataHistPoExtend   {
     @ApiModelProperty(name = "路口编号",notes = "")
     private String crossId;
     //车道ID
-    @ApiModelProperty(value = "车道ID", notes = "")
-    private String laneId;
+    @ApiModelProperty(value = "车道号", notes = "")
+    private Integer laneNo;
     //方向
     @ApiModelProperty(value = "方向", notes = "")
     private Integer dirType;

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

@@ -249,7 +249,7 @@
             resultType="net.wanji.opt.po.base.CrossLaneDataHistPoExtend">
         SELECT  MIN(ifnull(t.unit_time,#{startDate})) start_time,
         cross_id  ,
-        lane_id  ,
+        lane_no  ,
         dir_type  ,
         turn_type  ,
         SUM(flow) flow,
@@ -278,7 +278,7 @@
                    <!-- 方向级 -->
                 <when test="objectType==1">
                     dir_type,
-                    null as lane_id,
+                    null as lane_no,
                     null as turn_type,
                     null as service_level,
                 </when>
@@ -286,19 +286,19 @@
                 <when test="objectType==2">
                     t.in_dir+1 as dir_type,
                     t.turn_type,
-                    null as lane_id,
+                    null as lane_no,
                     null as service_level,
                 </when>
                 <!-- 车道级 -->
                 <when test="objectType==3">
-                    t.id as lane_id,
+                    t2.sort as lane_no,
                     t2.dir as dir_type,
                     t2.turn as turn_type,
                     null as service_level,
                 </when>
                 <!-- 路口级 -->
                 <when test="objectType==4">
-                    null as lane_id,
+                    null as lane_no,
                     null as dir_type,
                     null as turn_type,
                     ifnull(service_level,'A') service_level,
@@ -352,7 +352,7 @@
             </when>
             <!-- 车道级 -->
             <when test="objectType==3">
-                GROUP BY t.cross_id,t.lane_id,t.dir_type,t.turn_type,unit_time
+                GROUP BY t.cross_id,t.lane_no,t.dir_type,t.turn_type,unit_time
             </when>
             <!-- 路口级 -->
             <when test="objectType==4">