优化交通指标

signal-optimize-service/src/main/java/net/wanji/opt/controller/RunningEvaluateController.java

@@ -61,6 +61,7 @@ public class RunningEvaluateController {
         return JsonViewObject.newInstance().success(res);
     }
 
+    //TODO 拥堵指数
     @ApiOperation(value = "拥堵情况", notes = "拥堵情况", response = JsonViewObject.class,
             produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
     @PostMapping(value = "/congestionStatus",
@@ -73,6 +74,7 @@ public class RunningEvaluateController {
         return JsonViewObject.newInstance().success(res);
     }
 
+    //TODO 失衡指数
     @ApiOperation(value = "失衡情况", notes = "失衡情况", response = JsonViewObject.class,
             produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
     @PostMapping(value = "/unbalanceStatus",
@@ -85,6 +87,7 @@ public class RunningEvaluateController {
         return JsonViewObject.newInstance().success(res);
     }
 
+    //TODO 溢出指数
     @ApiOperation(value = "溢出情况", notes = "溢出情况", response = JsonViewObject.class,
             produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
     @PostMapping(value = "/spilloverStatus",

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

@@ -167,7 +167,7 @@ public class TableQueryVO {
 
         @ApiModelProperty(value = "溢出指数")
         @ExcelProperty("溢出指数")
-        private Double overflowIndex;
+        private Double overflowIndex= 0.0d;
 
         @ApiModelProperty(value = "失衡指数")
         @ExcelProperty("失衡指数")

wj-databus/src/main/java/net/wanji/databus/po/CrossDirDataRealtimePO.java

@@ -65,4 +65,8 @@ public class CrossDirDataRealtimePO {
     public Double effusionRate;
     @ApiModelProperty(value = "绿灯有效利用率", notes = "")
     public Double greenLightEfficiency;
+    @ApiModelProperty(value = "时间占用率", notes = "")
+    public Double timeOccupancy;
+    @ApiModelProperty(value = "非机动车流量", notes = "")
+    public Double nonMotorFlow;
 }

wj-databus/src/main/java/net/wanji/databus/po/CrossTurnDataRealtimePO.java

@@ -100,4 +100,8 @@ public class CrossTurnDataRealtimePO {
     private int trafficFlowB;
     @ApiModelProperty(value = "小车流量", notes = "")
     private int trafficFlowC;
+    @ApiModelProperty(value = "时间占有率", notes = "")
+    private double timeOccupancy;
+    @ApiModelProperty(value = "空间占有率", notes = "")
+    private double vehicleLengthRatioMean;
 }

wj-databus/src/main/java/net/wanji/databus/vo/CrossDataHistVO.java

@@ -10,4 +10,9 @@ import net.wanji.databus.po.CrossDataRealtimePO;
 @Data
 @ApiModel(value = "CrossDataHistVO", description = "路口实时数据历史")
 public class CrossDataHistVO extends CrossDataRealtimePO {
+    //非机动车流量
+
+    //行人流量
+
+    //平均车头时距
 }

wj-databus/src/main/java/net/wanji/databus/vo/CrossDirDataHistVO.java

@@ -15,4 +15,16 @@ public class CrossDirDataHistVO extends CrossDirDataRealtimePO {
     public double trafficFlowB;
     public double trafficFlowA;
 
+    //非机动车流量
+
+    //行人数量
+
+    //平均车头时距
+
+    //拥堵指数
+
+    //溢出指数
+
+    //失衡指数
+
 }

wj-databus/src/main/java/net/wanji/databus/vo/CrossLaneDataHistVOExt.java

@@ -15,5 +15,14 @@ public class CrossLaneDataHistVOExt extends CrossLaneDataRealTimePO {
     private Integer sort;
     // 转向
     private Integer turn;
+    //非机动车流量
+
+    //行人数量
+
+    //拥堵指数
+
+    //溢出指数
+
+    //失衡指数
 
 }

wj-databus/src/main/java/net/wanji/databus/vo/CrossTurnDataHistVO.java

@@ -11,4 +11,13 @@ import net.wanji.databus.po.CrossTurnDataRealtimePO;
 @Data
 @ApiModel(value = "CrossTurnDataHistVO", description = "路口转向实时数据历史")
 public class CrossTurnDataHistVO extends CrossTurnDataRealtimePO {
+    //非机动车流量
+
+    //行人数量
+
+    //拥堵指数
+
+    //溢出指数
+
+    //失衡指数
 }

wj-databus/src/main/resources/mapper/CrossDataHistMapper.xml

@@ -118,7 +118,17 @@
             COALESCE ( sum( traffic_flow_A ), 0) AS trafficFlowA,
             avg( t2.speed ) AS speed,
             MAX( t2.queue_length ) AS queueLength,
-            AVG( t2.stop_times ) AS stopTimes
+            AVG( t2.stop_times ) AS stopTimes,
+            avg(t2.time_occupancy) as timeOccupancy,
+            avg(t2.sturation) as sturation,
+            avg(t2.congestion_index) as congestionIndex,
+            avg(t2.spillover_index) as spilloverIndex,
+            avg(t2.unbalance_index) as unbalanceIndex,
+            avg(t2.no_stop_rate) as noStopRate,
+            avg(t2.one_stop_rate) as oneStopRate,
+            avg(t2.two_stop_rate) as twoStopRate,
+            avg(t2.three_stop_rate) as threeStopRate,
+            avg(t2.non_motor_flow) as nonMotorFlow
         FROM
             t_base_cross_info t1
             LEFT JOIN t_cross_data_hist t2 ON t1.id = t2.cross_id

wj-databus/src/main/resources/mapper/CrossLaneDataHistMapper.xml

@@ -142,19 +142,26 @@
             avg( t1.speed ) AS speed,
             avg( t1.vehhead_dist ) AS vehheadDist,
             avg( t1.vehhead_time ) AS vehheadTime,
-            t1.queue_length,
-            t1.delay_time,
-            t1.stop_times,
-            t1.vehhead_time,
-            t1.vehhead_dist,
-            t1.batch_time,
-            t1.time_occupancy,
-            t1.vehicle_nums_ratio_mean,
-            t1.start_time,
-            t1.v_85,
-            t1.non_motor_flow,
-            t1.time_occupancy,
-            t1.vehicle_length_ratio_mean
+
+            avg(t1.queue_length) as queueLength,
+            avg(t1.delay_time) as delayTime,
+            avg(t1.stop_times) as stopTimes,
+            avg(t1.vehhead_time) as vehheadTime,
+            avg(t1.vehhead_dist) as vehheadDist,
+            avg(t1.batch_time) as batchTime,
+            avg(t1.time_occupancy) as timeOccupancy,
+            avg(t1.vehicle_nums_ratio_mean) as vehicleNumsRatioMean,
+            avg(t1.start_time) as startTime,
+            avg(t1.v_85) as v85,
+            avg(t1.non_motor_flow) as nonMotorFlow,
+            avg(t1.time_occupancy) as timeOccupancy,
+            avg(t1.vehicle_length_ratio_mean) as vehicleLengthRatioMean,
+            avg(t1.sturation) as sturation,
+            avg(t1.no_stop_rate) as noStopRate,
+            avg(t1.one_stop_rate) as oneStopRate,
+            avg(t1.two_stop_rate) as twoStopRate,
+            avg(t1.three_stop_rate) as threeStopRate,
+            AVG(t1.non_motor_flow) as nonMotorFlow
         FROM
             t_base_lane_info t2
         LEFT JOIN t_lane_data_hist t1 ON t1.id = t2.id

wj-databus/src/main/resources/mapper/CrossTurnDataHistMapper.xml

@@ -104,7 +104,16 @@
             COALESCE(sum( t2.traffic_flow_A ), 0) AS trafficFlowA,
             avg( t2.speed ) AS speed,
             MAX( t2.queue_length ) AS queueLength,
-            AVG( t2.stop_times ) AS stopTimes
+            AVG( t2.stop_times ) AS stopTimes,
+            AVG( t2.time_occupancy) as timeOccupancy,
+            AVG( t2.vehicle_length_ratio_mean) as vehicleLengthRatioMean,
+            AVG( t2.vehhead_time) as vehheadTime,
+            AVG( t2.sturation) as sturation,
+            AVG( t2.no_stop_rate) as noStopRate,
+            AVG( t2.one_stop_rate) as oneStopRate,
+            AVG( t2.two_stop_rate) as twoStopRate,
+            AVG( t2.three_stop_rate) as threeStopRate,
+            AVG( t2.non_motor_flow) as nonMotorFlow
         FROM
             t_base_cross_turn_info t1
             LEFT JOIN t_cross_turn_data_hist t2 ON t1.id = t2.id