[update] 车道实时数据历史数据添加时间占有率空间占有率

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

@@ -9,7 +9,7 @@ import lombok.Data;
  * @date 2023/03/12 20:53
  */
 @Data
-@TableName("t_cross_turn_data_hist")
+@TableName("t_lane_data_hist")
 @ApiModel(value = "CrossLaneDataHistPO", description = "路口车道实时数据历史")
 public class CrossLaneDataHistPO extends CrossLaneDataRealTimePO{
 }

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

@@ -12,7 +12,7 @@ import java.util.Date;
  * @date 2023/03/10 19:36
  */
 @Data
-@TableName("t_cross_turn_data_realtime")
+@TableName("t_lane_data_realtime")
 @ApiModel(value = "CrossLaneDataRealTimePO", description = "路口车道实时数据")
 public class CrossLaneDataRealTimePO {
     @ApiModelProperty(name = "车道编号",notes = "")
@@ -64,4 +64,9 @@ public class CrossLaneDataRealTimePO {
     private Double effusionRate;
     @ApiModelProperty(value = "绿灯有效利用率", notes = "")
     private Double greenLightEfficiency;
+    @ApiModelProperty(value = "车辆负荷比", notes = "")
+    private Double vehicleNumsRatioMean;
+    @ApiModelProperty(value = "时间占有率", notes = "")
+    private Double timeOccupancy;
+
 }

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

@@ -27,12 +27,15 @@
         <result column="start_time" property="startTime"></result>
         <result column="effusion_rate" property="effusionRate"></result>
         <result column="green_light_efficiency" property="greenLightEfficiency"></result>
+        <result column="vehicle_nums_ratio_mean" property="vehicleNumsRatioMean"></result>
+        <result column="time_occupancy" property="timeOccupancy"></result>
     </resultMap>
 
     <sql id="Base_Column_List">
         id, cross_id, flow, speed, in_speed, out_speed, queue_length, stop_times, delay_time, capacity, sturation,
             vehhead_dist, vehhead_time, quality, batch_time, gmt_create, gmt_modified,
-            no_stop_rate,one_stop_rate,two_stop_rate,three_stop_rate,start_time,effusion_rate,green_light_efficiency
+            no_stop_rate,one_stop_rate,two_stop_rate,three_stop_rate,start_time,effusion_rate,green_light_efficiency,
+            vehicle_nums_ratio_mean,time_occupancy
     </sql>
 
     <insert id="insertBatch" parameterType="net.wanji.databus.po.CrossLaneDataHistPO">
@@ -43,7 +46,7 @@
             (#{entity.id},#{entity.crossId},#{entity.flow},#{entity.speed},#{entity.inSpeed},#{entity.outSpeed},#{entity.queueLength},#{entity.stopTimes},#{entity.delayTime},#{entity.capacity},#{entity.sturation},
             #{entity.vehheadDist},#{entity.vehheadTime},#{entity.quality},#{entity.batchTime},#{entity.gmtCreate},#{entity.gmtModified},
             #{entity.noStopRate},#{entity.oneStopRate},#{entity.twoStopRate},#{entity.threeStopRate},#{entity.startTime},
-            #{entity.effusionRate},#{entity.greenLightEfficiency})
+            #{entity.effusionRate},#{entity.greenLightEfficiency},#{entity.vehicleNumsRatioMean},#{entity.timeOccupancy})
         </foreach>
     </insert>
 

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

@@ -26,13 +26,15 @@
         <result column="gmt_modified" property="gmtModified"></result>
         <result column="start_time" property="startTime"></result>
         <result column="effusion_rate" property="effusionRate"></result>
-        <result column="green_light_efficiency" property="greenLightEfficiency"></result>
+        <result column="vehicle_nums_ratio_mean" property="vehicleNumsRatioMean"></result>
+        <result column="time_occupancy" property="timeOccupancy"></result>
     </resultMap>
 
     <sql id="Base_Column_List">
         id, cross_id, flow, speed, in_speed, out_speed, queue_length, stop_times, delay_time, capacity, sturation,
             vehhead_dist, vehhead_time, quality, batch_time, gmt_create, gmt_modified,
-            no_stop_rate,one_stop_rate,two_stop_rate,three_stop_rate,start_time,effusion_rate,green_light_efficiency
+            no_stop_rate,one_stop_rate,two_stop_rate,three_stop_rate,start_time,effusion_rate,green_light_efficiency,
+            vehicle_nums_ratio_mean,time_occupancy
     </sql>
 
     <insert id="insertBatch" parameterType="net.wanji.databus.po.CrossLaneDataRealTimePO">
@@ -43,7 +45,7 @@
             (#{entity.id},#{entity.crossId},#{entity.flow},#{entity.speed},#{entity.inSpeed},#{entity.outSpeed},#{entity.queueLength},#{entity.stopTimes},#{entity.delayTime},#{entity.capacity},#{entity.sturation},
             #{entity.vehheadDist},#{entity.vehheadTime},#{entity.quality},#{entity.batchTime},#{entity.gmtCreate},#{entity.gmtModified},
             #{entity.noStopRate},#{entity.oneStopRate},#{entity.twoStopRate},#{entity.threeStopRate},#{entity.startTime},
-            #{entity.effusionRate},#{entity.greenLightEfficiency})
+            #{entity.effusionRate},#{entity.greenLightEfficiency},#{entity.vehicleNumsRatioMean},#{entity.timeOccupancy})
         </foreach>
     </insert>