[update] 信号评价-优化表结构

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

@@ -160,4 +160,9 @@ public class CrossDataRealtimePO {
      */
     @ApiModelProperty(value = "绿灯有效利用率", notes = "")
     private Double greenLightEfficiency;
+    /**
+     * 溢流率
+     */
+    @ApiModelProperty(value = "溢流率", notes = "")
+    private Double effusionRate;
 }

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

@@ -60,4 +60,6 @@ public class CrossLaneDataRealTimePO {
     private Date gmtCreate ;
     @ApiModelProperty(name = "修改时间",notes = "")
     private Date gmtModified ;
+    @ApiModelProperty(value = "溢流率", notes = "")
+    private Double effusionRate;
 }

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

@@ -32,13 +32,14 @@
         <result column="load_balance" property="loadBalance"></result>
         <result column="not_clear_car_nums" property="notClearCarNums"></result>
         <result column="green_light_efficiency" property="greenLightEfficiency"></result>
+        <result column="effusion_rate" property="effusionRate"></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
+        clear_rate,load_balance,not_clear_car_nums,green_light_efficiency,effusion_rate
     </sql>
 
     <insert id="insertBatch" parameterType="net.wanji.databus.po.CrossDataHistPO">
@@ -49,7 +50,7 @@
             (#{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.clearRate},#{entity.loadBalance},#{entity.notClearCarNums},#{entity.greenLightEfficiency},#{entity.effusionRate})
         </foreach>
     </insert>
 

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

@@ -33,13 +33,14 @@
         <result column="load_balance" property="loadBalance"></result>
         <result column="not_clear_car_nums" property="notClearCarNums"></result>
         <result column="green_light_efficiency" property="greenLightEfficiency"></result>
+        <result column="effusion_rate" property="effusionRate"></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
+            load_balance,not_clear_car_nums,green_light_efficiency,effusion_rate
     </sql>
 
     <insert id="insertBatch" parameterType="net.wanji.databus.po.CrossDataRealtimePO">
@@ -50,7 +51,7 @@
             (#{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.clearRate},#{entity.endTime},#{entity.loadBalance},#{entity.notClearCarNums},#{entity.greenLightEfficiency},#{entity.effusionRate})
         </foreach>
     </insert>
 

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

@@ -23,16 +23,13 @@
         <result column="gmt_create" property="gmtCreate"></result>
         <result column="gmt_modified" property="gmtModified"></result>
         <result column="effusion_rate" property="effusionRate"></result>
-        <result column="clear_rate" property="clearRate"></result>
-        <result column="load_balance" property="loadBalance"></result>
         <result column="green_light_efficiency" property="greenLightEfficiency"></result>
-
     </resultMap>
 
     <sql id="Base_Column_List">
         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_rate,
-        load_balance,clear_rate,green_light_efficiency
+        green_light_efficiency
     </sql>
 
     <insert id="insertBatch" parameterType="net.wanji.databus.po.CrossDirDataHistPO">
@@ -44,7 +41,7 @@
              #{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.effusionRate} )
+            #{entity.gmtCreate}, #{entity.gmtModified},#{entity.effusionRate},#{entity.greenLightEfficiency})
         </foreach>
     </insert>
 

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

@@ -27,16 +27,13 @@
         <result column="gmt_create" property="gmtCreate"></result>
         <result column="gmt_modified" property="gmtModified"></result>
         <result column="effusion_rate" property="effusionRate"></result>
-        <result column="clear_rate" property="clearRate"></result>
-        <result column="load_balance" property="loadBalance"></result>
         <result column="green_light_efficiency" property="greenLightEfficiency"></result>
-
     </resultMap>
 
     <sql id="Base_Column_List">
         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_rate,
-        load_balance,clear_rate,green_light_efficiency
+        green_light_efficiency
     </sql>
 
     <insert id="insertBatch" parameterType="net.wanji.databus.po.CrossDirDataRealtimePO">
@@ -47,7 +44,7 @@
             ( #{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.effusionRate} )
+             #{entity.gmtCreate}, #{entity.gmtModified},#{entity.effusionRate}, #{entity.greenLightEfficiency} )
         </foreach>
     </insert>
 

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

@@ -25,12 +25,14 @@
         <result column="gmt_create" property="gmtCreate"></result>
         <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>
     </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
+            no_stop_rate,one_stop_rate,two_stop_rate,three_stop_rate,start_time,effusion_rate,green_light_efficiency
     </sql>
 
     <insert id="insertBatch" parameterType="net.wanji.databus.po.CrossLaneDataHistPO">
@@ -40,7 +42,8 @@
         <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.noStopRate},#{entity.oneStopRate},#{entity.twoStopRate},#{entity.threeStopRate},#{entity.startTime})
+            #{entity.noStopRate},#{entity.oneStopRate},#{entity.twoStopRate},#{entity.threeStopRate},#{entity.startTime},
+            #{entity.effusionRate},#{entity.greenLightEfficiency})
         </foreach>
     </insert>
 

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

@@ -25,12 +25,14 @@
         <result column="gmt_create" property="gmtCreate"></result>
         <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>
     </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
+            no_stop_rate,one_stop_rate,two_stop_rate,three_stop_rate,start_time,effusion_rate,green_light_efficiency
     </sql>
 
     <insert id="insertBatch" parameterType="net.wanji.databus.po.CrossLaneDataRealTimePO">
@@ -40,7 +42,8 @@
         <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.noStopRate},#{entity.oneStopRate},#{entity.twoStopRate},#{entity.threeStopRate},#{entity.startTime})
+            #{entity.noStopRate},#{entity.oneStopRate},#{entity.twoStopRate},#{entity.threeStopRate},#{entity.startTime},
+            #{entity.effusionRate},#{entity.greenLightEfficiency})
         </foreach>
     </insert>
 

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

@@ -29,18 +29,15 @@
         <result column="gmt_create" property="gmtCreate"></result>
         <result column="gmt_modified" property="gmtModified"></result>
         <result column="start_time" property="startTime"></result>
-        <result column="clear_rate" property="clearRate"></result>
-        <result column="load_balance" property="loadBalance"></result>
         <result column="green_light_efficiency" property="greenLightEfficiency"></result>
         <result column="effusion_rate" property="effusionRate"></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,
         no_stop_rate,one_stop_rate,two_stop_rate,three_stop_rate,start_time,
-        load_balance,clear_rate,green_light_efficiency,effusion_rate
+        green_light_efficiency,effusion_rate
     </sql>
 
     <insert id="insertBatch" parameterType="net.wanji.databus.po.CrossTurnDataRealtimePO">
@@ -52,7 +49,8 @@
             #{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},#{entity.startTime})
+            #{entity.noStopRate},#{entity.oneStopRate},#{entity.twoStopRate},#{entity.threeStopRate},#{entity.startTime},
+            #{entity.greenLightEfficiency},#{entity.effusionRate})
         </foreach>
     </insert>
 

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

@@ -29,8 +29,6 @@
         <result column="gmt_create" property="gmtCreate"></result>
         <result column="gmt_modified" property="gmtModified"></result>
         <result column="start_time" property="startTime"></result>
-        <result column="clear_rate" property="clearRate"></result>
-        <result column="load_balance" property="loadBalance"></result>
         <result column="green_light_efficiency" property="greenLightEfficiency"></result>
         <result column="effusion_rate" property="effusionRate"></result>
 
@@ -40,8 +38,7 @@
         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,
         no_stop_rate,one_stop_rate,two_stop_rate,three_stop_rate,start_time,
-        load_balance,clear_rate,green_light_efficiency,effusion_rate
-
+        green_light_efficiency,effusion_rate
     </sql>
 
     <insert id="insertBatch" parameterType="net.wanji.databus.po.CrossTurnDataRealtimePO">
@@ -53,7 +50,8 @@
              #{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},#{entity.startTime})
+             #{entity.noStopRate},#{entity.oneStopRate},#{entity.twoStopRate},#{entity.threeStopRate},#{entity.startTime},
+            #{entity.greenLightEfficiency},#{entity.effusionRate})
         </foreach>
     </insert>