[update] 表结构-路口表停车率

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

@@ -165,4 +165,12 @@ public class CrossDataRealtimePO {
      */
     @ApiModelProperty(value = "溢流率", notes = "")
     private Double effusionRate;
+    @ApiModelProperty(name = "不停车率",notes = "")
+    public Double noStopRate;
+    @ApiModelProperty(name = "一次停车率",notes = "")
+    public Double oneStopRate;
+    @ApiModelProperty(name = "二次停车率",notes = "")
+    public Double twoStopRate;
+    @ApiModelProperty(name = "三次停车率",notes = "")
+    public Double threeStopRate;
 }

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

@@ -47,7 +47,6 @@ public class CrossDirDataRealtimePO {
     public Integer delayTime;
     @ApiModelProperty(name = "饱和度",notes = "")
     public Double sturation;
-
     @ApiModelProperty(name = "不停车率",notes = "")
     public Double noStopRate;
     @ApiModelProperty(name = "一次停车率",notes = "")
@@ -56,7 +55,6 @@ public class CrossDirDataRealtimePO {
     public Double twoStopRate;
     @ApiModelProperty(name = "三次停车率",notes = "")
     public Double threeStopRate;
-
     @ApiModelProperty(name = "采集时间（10位时间戳）",notes = "")
     public Integer batchTime;
     @ApiModelProperty(name = "创建时间",notes = "")
@@ -65,7 +63,6 @@ public class CrossDirDataRealtimePO {
     public Date gmtModified ;
     @ApiModelProperty(name = "溢流率：交叉口间路段车辆排队长度超出可容纳空间的时长与观测总时长的百分比",notes = "")
     public Double effusionRate;
-
     @ApiModelProperty(value = "绿灯间隔清空率", notes = "")
     public Double clearRate;
     @ApiModelProperty(value = "负载均衡度", notes = "")

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

@@ -33,13 +33,18 @@
         <result column="not_clear_car_nums" property="notClearCarNums"></result>
         <result column="green_light_efficiency" property="greenLightEfficiency"></result>
         <result column="effusion_rate" property="effusionRate"></result>
+        <result column="no_stop_rate" property="noStopRate"></result>
+        <result column="one_stop_rate" property="oneStopRate"></result>
+        <result column="two_stop_rate" property="twoStopRate"></result>
+        <result column="three_stop_rate" property="threeStopRate"></result>
     </resultMap>
 
     <sql id="Base_Column_List">
         cross_id, status, type, traffic_index, start_time, duration, is_unbalance, is_spillover, is_congestion,
         unbalance_index, spillover_index, congestion_index, unbalance_dirs, spillover_dirs, congestion_dirs,
         flow, flow_rate, speed, queue_length, stop_times, delay_time, sturation, batch_time, gmt_create, gmt_modified,
-        clear_rate,load_balance,not_clear_car_nums,green_light_efficiency,effusion_rate
+        clear_rate,load_balance,not_clear_car_nums,green_light_efficiency,effusion_rate,
+        no_stop_rate,one_stop_rate,two_stop_rate,three_stop_rate
     </sql>
 
     <insert id="insertBatch" parameterType="net.wanji.databus.po.CrossDataHistPO">
@@ -50,7 +55,8 @@
             (#{entity.crossId},#{entity.status},#{entity.type},#{entity.trafficIndex},#{entity.startTime},#{entity.duration},#{entity.isUnbalance},#{entity.isSpillover},#{entity.isCongestion},
             #{entity.unbalanceIndex},#{entity.spilloverIndex},#{entity.congestionIndex},#{entity.unbalanceDirs},#{entity.spilloverDirs},#{entity.congestionDirs},
             #{entity.flow},#{entity.flowRate},#{entity.speed},#{entity.queueLength},#{entity.stopTimes},#{entity.delayTime},#{entity.sturation},#{entity.batchTime},#{entity.gmtCreate},#{entity.gmtModified},
-             #{entity.clearRate},#{entity.loadBalance},#{entity.notClearCarNums},#{entity.greenLightEfficiency},#{entity.effusionRate})
+             #{entity.clearRate},#{entity.loadBalance},#{entity.notClearCarNums},#{entity.greenLightEfficiency},#{entity.effusionRate},
+            #{entity.noStopRate},#{entity.oneStopRate},#{entity.twoStopRate},#{entity.threeStopRate})
         </foreach>
     </insert>
 

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

@@ -34,13 +34,18 @@
         <result column="not_clear_car_nums" property="notClearCarNums"></result>
         <result column="green_light_efficiency" property="greenLightEfficiency"></result>
         <result column="effusion_rate" property="effusionRate"></result>
+        <result column="no_stop_rate" property="noStopRate"></result>
+        <result column="one_stop_rate" property="oneStopRate"></result>
+        <result column="two_stop_rate" property="twoStopRate"></result>
+        <result column="three_stop_rate" property="threeStopRate"></result>
     </resultMap>
 
     <sql id="Base_Column_List">
         cross_id,status,type,traffic_index,start_time,duration,is_unbalance,is_spillover,is_congestion,unbalance_index,
             spillover_index,congestion_index,unbalance_dirs,spillover_dirs,congestion_dirs,flow,flow_rate,speed,
             queue_length,stop_times,delay_time,sturation,batch_time,gmt_create,gmt_modified,clear_rate,end_time,
-            load_balance,not_clear_car_nums,green_light_efficiency,effusion_rate
+            load_balance,not_clear_car_nums,green_light_efficiency,effusion_rate,
+            no_stop_rate,one_stop_rate,two_stop_rate,three_stop_rate
     </sql>
 
     <insert id="insertBatch" parameterType="net.wanji.databus.po.CrossDataRealtimePO">
@@ -51,7 +56,8 @@
             (#{entity.crossId},#{entity.status},#{entity.type},#{entity.trafficIndex},#{entity.startTime},#{entity.duration},#{entity.isSpillover},#{entity.isSpillover},#{entity.isCongestion},
             #{entity.unbalanceIndex},#{entity.spilloverIndex},#{entity.congestionIndex},#{entity.unbalanceDirs},#{entity.spilloverDirs},#{entity.congestionDirs},
             #{entity.flow},#{entity.flowRate},#{entity.speed},#{entity.queueLength},#{entity.stopTimes},#{entity.delayTime},#{entity.sturation},#{entity.batchTime},#{entity.gmtCreate},#{entity.gmtModified},
-             #{entity.clearRate},#{entity.endTime},#{entity.loadBalance},#{entity.notClearCarNums},#{entity.greenLightEfficiency},#{entity.effusionRate})
+             #{entity.clearRate},#{entity.endTime},#{entity.loadBalance},#{entity.notClearCarNums},#{entity.greenLightEfficiency},#{entity.effusionRate},
+            #{entity.noStopRate},#{entity.oneStopRate},#{entity.twoStopRate},#{entity.threeStopRate})
         </foreach>
     </insert>