[update] 优化数据库表字段

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

@@ -43,6 +43,15 @@ public class CrossLaneDataRealTimePO {
     private Double vehheadTime;
     @ApiModelProperty(name = "可信度（0-1）",notes = "")
     private Double quality;
+
+    @ApiModelProperty(name = "不停车率",notes = "")
+    private Double noStopRate;
+    @ApiModelProperty(name = "一次停车率",notes = "")
+    private Double oneStopRate;
+    @ApiModelProperty(name = "二次停车率",notes = "")
+    private Double twoStopRate;
+    @ApiModelProperty(name = "三次停车率",notes = "")
+    private Double threeStopRate;
     @ApiModelProperty(name = "采集时间（10位时间戳）",notes = "")
     private Integer batchTime;
     @ApiModelProperty(name = "创建时间",notes = "")

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

@@ -26,7 +26,7 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        id,dir_type,in_out_type,cross_id,length,status,traffic_index,start_time,capacity,flow,speed,queue_length,stop_times,
+        id,dir_type,in_out_type,cross_id,length,status,traffic_index,start_time,capacity,duration,flow,speed,queue_length,stop_times,
         delay_time,sturation,no_stop_rate,one_stop_rate,two_stop_rate,three_stop_rate,batch_time,gmt_create,gmt_modified,effusion_time
     </sql>
 
@@ -35,8 +35,11 @@
             (<include refid="Base_Column_List"></include>)
         values
         <foreach collection="list" item="entity" separator=",">
-            ( #{entity.id}, #{entity.dirType}, #{entity.inOutType}, #{entity.crossId}, #{entity.length}, #{entity.status}, #{entity.trafficIndex}, #{entity.startTime}, #{entity.capacity}, #{entity.duration}, #{entity.flow},
-            #{entity.speed}, #{entity.queueLength}, #{entity.stopTimes}, #{entity.delayTime}, #{entity.sturation}, #{entity.batchTime}, #{entity.gmtCreate}, #{entity.gmtModified}, #{entity.effusionTime} )
+            ( #{entity.id}, #{entity.dirType}, #{entity.inOutType}, #{entity.crossId}, #{entity.length}, #{entity.status},
+             #{entity.trafficIndex}, #{entity.startTime}, #{entity.capacity}, #{entity.duration}, #{entity.flow},
+            #{entity.speed}, #{entity.queueLength}, #{entity.stopTimes}, #{entity.delayTime}, #{entity.sturation},
+            #{entity.noStopRate},#{entity.oneStopRate},#{entity.twoStopRate},#{entity.threeStopRate},#{entity.batchTime},
+            #{entity.gmtCreate}, #{entity.gmtModified}, #{entity.effusionTime} )
         </foreach>
     </insert>
 

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

@@ -17,6 +17,10 @@
         <result column="vehhead_dist" property="vehheadDist"></result>
         <result column="vehhead_time" property="vehheadTime"></result>
         <result column="quality" property="quality"></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>
         <result column="batch_time" property="batchTime"></result>
         <result column="gmt_create" property="gmtCreate"></result>
         <result column="gmt_modified" property="gmtModified"></result>
@@ -24,7 +28,8 @@
 
     <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
+            vehhead_dist, vehhead_time, quality, batch_time, gmt_create, gmt_modified,
+            no_stop_rate,one_stop_rate,two_stop_rate,three_stop_rate
     </sql>
 
     <insert id="insertBatch" parameterType="net.wanji.databus.po.CrossLaneDataHistPO">
@@ -33,7 +38,8 @@
         values
         <foreach collection="list" item="entity" separator=",">
             (#{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.vehheadDist},#{entity.vehheadTime},#{entity.quality},#{entity.batchTime},#{entity.gmtCreate},#{entity.gmtModified},
+            #{entity.noStopRate},#{entity.oneStopRate},#{entity.twoStopRate},#{entity.threeStopRate})
         </foreach>
     </insert>
 

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

@@ -17,6 +17,10 @@
         <result column="vehhead_dist" property="vehheadDist"></result>
         <result column="vehhead_time" property="vehheadTime"></result>
         <result column="quality" property="quality"></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>
         <result column="batch_time" property="batchTime"></result>
         <result column="gmt_create" property="gmtCreate"></result>
         <result column="gmt_modified" property="gmtModified"></result>
@@ -24,7 +28,8 @@
 
     <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
+            vehhead_dist, vehhead_time, quality, batch_time, gmt_create, gmt_modified,
+            no_stop_rate,one_stop_rate,two_stop_rate,three_stop_rate
     </sql>
 
     <insert id="insertBatch" parameterType="net.wanji.databus.po.CrossLaneDataRealTimePO">
@@ -33,7 +38,8 @@
         values
         <foreach collection="list" item="entity" separator=",">
             (#{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.vehheadDist},#{entity.vehheadTime},#{entity.quality},#{entity.batchTime},#{entity.gmtCreate},#{entity.gmtModified},
+            #{entity.noStopRate},#{entity.oneStopRate},#{entity.twoStopRate},#{entity.threeStopRate})
         </foreach>
     </insert>
 

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

@@ -21,6 +21,10 @@
         <result column="vehhead_dist" property="vehheadDist"></result>
         <result column="vehhead_time" property="vehheadTime"></result>
         <result column="quality" property="quality"></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>
         <result column="batch_time" property="batchTime"></result>
         <result column="gmt_create" property="gmtCreate"></result>
         <result column="gmt_modified" property="gmtModified"></result>
@@ -28,8 +32,8 @@
 
     <sql id="Base_Column_List">
         id, turn_type, in_dir, out_dir, cross_id, flow, status, traffic_index, speed, in_speed, out_speed, queue_length,
-        stop_times, delay_time, sturation, vehhead_dist, vehhead_time, quality,no_stop_rate,one_stop_rate,two_stop_rate,
-        three_stop_rate, batch_time, gmt_create, gmt_modified
+        stop_times, delay_time, sturation, vehhead_dist, vehhead_time, quality, batch_time, gmt_create, gmt_modified,
+        no_stop_rate,one_stop_rate,two_stop_rate,three_stop_rate
     </sql>
 
     <insert id="insertBatch" parameterType="net.wanji.databus.po.CrossTurnDataRealtimePO">
@@ -37,8 +41,11 @@
         (<include refid="Base_Column_List"></include>)
         values
         <foreach collection="list" item="entity" separator=",">
-            (#{entity.id},#{entity.turnType},#{entity.inDir},#{entity.outDir},#{entity.crossId},#{entity.flow},#{entity.status},#{entity.trafficIndex},#{entity.speed},#{entity.inSpeed},#{entity.outSpeed},#{entity.queueLength},
-            #{entity.stopTimes},#{entity.delayTime},#{entity.sturation},#{entity.vehheadDist},#{entity.vehheadTime},#{entity.quality},#{entity.batchTime},#{entity.gmtCreate},#{entity.gmtModified})
+            (#{entity.id},#{entity.turnType},#{entity.inDir},#{entity.outDir},#{entity.crossId},#{entity.flow},
+            #{entity.status},#{entity.trafficIndex},#{entity.speed},#{entity.inSpeed},#{entity.outSpeed},
+            #{entity.queueLength},#{entity.stopTimes},#{entity.delayTime},#{entity.sturation},#{entity.vehheadDist},#{entity.vehheadTime},
+            #{entity.quality},#{entity.batchTime},#{entity.gmtCreate},#{entity.gmtModified},
+            #{entity.noStopRate},#{entity.oneStopRate},#{entity.twoStopRate},#{entity.threeStopRate})
         </foreach>
     </insert>
 

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

@@ -22,13 +22,18 @@
         <result column="vehhead_time" property="vehheadTime"></result>
         <result column="quality" property="quality"></result>
         <result column="batch_time" property="batchTime"></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>
         <result column="gmt_create" property="gmtCreate"></result>
         <result column="gmt_modified" property="gmtModified"></result>
     </resultMap>
 
     <sql id="Base_Column_List">
         id, turn_type, in_dir, out_dir, cross_id, flow, status, traffic_index, speed, in_speed, out_speed, queue_length,
-        stop_times, delay_time, sturation, vehhead_dist, vehhead_time, quality, batch_time, gmt_create, gmt_modified
+        stop_times, delay_time, sturation, vehhead_dist, vehhead_time, quality, batch_time, gmt_create, gmt_modified,
+            no_stop_rate,one_stop_rate,two_stop_rate,three_stop_rate
     </sql>
 
     <insert id="insertBatch" parameterType="net.wanji.databus.po.CrossTurnDataRealtimePO">
@@ -36,8 +41,11 @@
         (<include refid="Base_Column_List"></include>)
         values
         <foreach collection="list" item="entity" separator=",">
-            (#{entity.id},#{entity.turnType},#{entity.inDir},#{entity.outDir},#{entity.crossId},#{entity.flow},#{entity.status},#{entity.trafficIndex},#{entity.speed},#{entity.inSpeed},#{entity.outSpeed},#{entity.queueLength},
-            #{entity.stopTimes},#{entity.delayTime},#{entity.sturation},#{entity.vehheadDist},#{entity.vehheadTime},#{entity.quality},#{entity.batchTime},#{entity.gmtCreate},#{entity.gmtModified})
+            (#{entity.id},#{entity.turnType},#{entity.inDir},#{entity.outDir},#{entity.crossId},#{entity.flow},
+             #{entity.status},#{entity.trafficIndex},#{entity.speed},#{entity.inSpeed},#{entity.outSpeed},
+             #{entity.queueLength},#{entity.stopTimes},#{entity.delayTime},#{entity.sturation},#{entity.vehheadDist},#{entity.vehheadTime},
+             #{entity.quality},#{entity.batchTime},#{entity.gmtCreate},#{entity.gmtModified},
+             #{entity.noStopRate},#{entity.oneStopRate},#{entity.twoStopRate},#{entity.threeStopRate})
         </foreach>
     </insert>