Commit 3b66f1e9 authored by duanruiming's avatar duanruiming

[add] 绿波周期数据添加行车速度变异系数

parent 4207e326
...@@ -28,6 +28,7 @@ ...@@ -28,6 +28,7 @@
<result column="optimize_seconds" property="optimizeSeconds"></result> <result column="optimize_seconds" property="optimizeSeconds"></result>
<result column="empty_pass" property="emptyPass"></result> <result column="empty_pass" property="emptyPass"></result>
<result column="batch_time" property="batchTime"></result> <result column="batch_time" property="batchTime"></result>
<result column="speed_factor" property="speedFactor"></result>
</resultMap> </resultMap>
...@@ -35,7 +36,7 @@ ...@@ -35,7 +36,7 @@
id, green_id, status,type,traffic_index,speed,trval_time,stop_times,queue_length,cong_rate,delay_time,nopark_pass_rate, id, green_id, status,type,traffic_index,speed,trval_time,stop_times,queue_length,cong_rate,delay_time,nopark_pass_rate,
cord_reliability,cord_queue_ratio,uncoordinate_phase_queue, start_time, gmt_create,gmt_modified, cord_reliability,cord_queue_ratio,uncoordinate_phase_queue, start_time, gmt_create,gmt_modified,
strategy, strategy_duration, optimize_count, optimize_seconds, strategy, strategy_duration, optimize_count, optimize_seconds,
green_wave_width, direction, plan_cycle, speed_high, speed_down, road_direction, sturation, batch_time green_wave_width, direction, plan_cycle, speed_high, speed_down, road_direction, sturation, batch_time, speed_factor
</sql> </sql>
<select id="selectRunMonitor" resultType="net.wanji.databus.dao.entity.GreenwaveHistPOExt"> <select id="selectRunMonitor" resultType="net.wanji.databus.dao.entity.GreenwaveHistPOExt">
...@@ -70,7 +71,8 @@ ...@@ -70,7 +71,8 @@
t1.gmt_modified, t1.gmt_modified,
t2.name as greenwaveName, t2.name as greenwaveName,
t2.dir, t2.dir,
t2.section_id t2.section_id,
t1.speed_factor
from t_greenwave_hist t1 from t_greenwave_hist t1
join t_greenwave_info t2 on t1.green_id = t2.id join t_greenwave_info t2 on t1.green_id = t2.id
where t1.gmt_modified <![CDATA[ <= ]]> #{endTimeStr} where t1.gmt_modified <![CDATA[ <= ]]> #{endTimeStr}
...@@ -91,7 +93,7 @@ ...@@ -91,7 +93,7 @@
(green_id, status,type,traffic_index,speed,trval_time,stop_times,queue_length,cong_rate,delay_time,nopark_pass_rate, (green_id, status,type,traffic_index,speed,trval_time,stop_times,queue_length,cong_rate,delay_time,nopark_pass_rate,
cord_reliability,cord_queue_ratio,uncoordinate_phase_queue, start_time, gmt_create,gmt_modified, cord_reliability,cord_queue_ratio,uncoordinate_phase_queue, start_time, gmt_create,gmt_modified,
strategy, strategy_duration, optimize_count, optimize_seconds, strategy, strategy_duration, optimize_count, optimize_seconds,
green_wave_width, direction, plan_cycle, speed_high, speed_down, road_direction, sturation, batch_time) green_wave_width, direction, plan_cycle, speed_high, speed_down, road_direction, sturation, batch_time, speed_factor)
values values
<foreach collection="list" item="entity" separator=","> <foreach collection="list" item="entity" separator=",">
(#{entity.greenId}, #{entity.status}, #{entity.type}, #{entity.trafficIndex},#{entity.speed}, (#{entity.greenId}, #{entity.status}, #{entity.type}, #{entity.trafficIndex},#{entity.speed},
...@@ -100,7 +102,8 @@ ...@@ -100,7 +102,8 @@
#{entity.uncoordinatePhaseQueue}, #{entity.startTime}, #{entity.gmtCreate}, #{entity.gmtModified}, #{entity.uncoordinatePhaseQueue}, #{entity.startTime}, #{entity.gmtCreate}, #{entity.gmtModified},
#{entity.strategy}, #{entity.strategyDuration}, #{entity.optimizeCount}, #{entity.optimizeSeconds}, #{entity.strategy}, #{entity.strategyDuration}, #{entity.optimizeCount}, #{entity.optimizeSeconds},
#{entity.greenWaveWidth}, #{entity.direction}, #{entity.planCycle}, #{entity.speedHigh}, #{entity.greenWaveWidth}, #{entity.direction}, #{entity.planCycle}, #{entity.speedHigh},
#{entity.speedDown}, #{entity.roadDirection}, #{entity.sturation}, #{entity.batchTime} #{entity.speedDown}, #{entity.roadDirection}, #{entity.sturation}, #{entity.batchTime},
#{entity.speedFactor}
) )
</foreach> </foreach>
ON DUPLICATE KEY UPDATE ON DUPLICATE KEY UPDATE
......
...@@ -35,13 +35,15 @@ ...@@ -35,13 +35,15 @@
<result column="road_direction" property="roadDirection"></result> <result column="road_direction" property="roadDirection"></result>
<result column="sturation" property="sturation"></result> <result column="sturation" property="sturation"></result>
<result column="batch_time" property="batchTime"></result> <result column="batch_time" property="batchTime"></result>
<result column="speed_factor" property="speedFactor"></result>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id, green_id, status,type,traffic_index,speed,trval_time,stop_times,queue_length,cong_rate,delay_time,nopark_pass_rate, id, green_id, status,type,traffic_index,speed,trval_time,stop_times,queue_length,cong_rate,delay_time,nopark_pass_rate,
cord_reliability, cord_queue_ratio, uncoordinate_phase_queue, start_time, gmt_create,gmt_modified, cord_reliability, cord_queue_ratio, uncoordinate_phase_queue, start_time, gmt_create,gmt_modified,
strategy, strategy_duration, optimize_count, optimize_seconds, strategy, strategy_duration, optimize_count, optimize_seconds,
green_wave_width, direction, plan_cycle, speed_high, speed_down, road_direction, sturation, batch_time green_wave_width, direction, plan_cycle, speed_high, speed_down, road_direction, sturation, batch_time, speed_factor
</sql> </sql>
...@@ -57,7 +59,7 @@ ...@@ -57,7 +59,7 @@
(green_id, status,type,traffic_index,speed,trval_time,stop_times,queue_length,cong_rate,delay_time,nopark_pass_rate, (green_id, status,type,traffic_index,speed,trval_time,stop_times,queue_length,cong_rate,delay_time,nopark_pass_rate,
cord_reliability, cord_queue_ratio, uncoordinate_phase_queue, start_time, gmt_create,gmt_modified, cord_reliability, cord_queue_ratio, uncoordinate_phase_queue, start_time, gmt_create,gmt_modified,
strategy, strategy_duration, optimize_count, optimize_seconds, strategy, strategy_duration, optimize_count, optimize_seconds,
green_wave_width, direction, plan_cycle, speed_high, speed_down, road_direction, sturation, batch_time) green_wave_width, direction, plan_cycle, speed_high, speed_down, road_direction, sturation, batch_time, speed_factor)
values values
<foreach collection="list" item="entity" separator=","> <foreach collection="list" item="entity" separator=",">
(#{entity.greenId}, #{entity.status}, #{entity.type}, #{entity.trafficIndex}, #{entity.speed}, (#{entity.greenId}, #{entity.status}, #{entity.type}, #{entity.trafficIndex}, #{entity.speed},
...@@ -66,7 +68,7 @@ ...@@ -66,7 +68,7 @@
#{entity.uncoordinatePhaseQueue}, #{entity.startTime}, #{entity.gmtCreate}, #{entity.gmtModified}, #{entity.uncoordinatePhaseQueue}, #{entity.startTime}, #{entity.gmtCreate}, #{entity.gmtModified},
#{entity.strategy}, #{entity.strategyDuration}, #{entity.optimizeCount}, #{entity.optimizeSeconds}, #{entity.strategy}, #{entity.strategyDuration}, #{entity.optimizeCount}, #{entity.optimizeSeconds},
#{entity.greenWaveWidth}, #{entity.direction}, #{entity.planCycle}, #{entity.speedHigh}, #{entity.greenWaveWidth}, #{entity.direction}, #{entity.planCycle}, #{entity.speedHigh},
#{entity.speedDown}, #{entity.roadDirection}, #{entity.sturation}, #{entity.batchTime} #{entity.speedDown}, #{entity.roadDirection}, #{entity.sturation}, #{entity.batchTime},#{entity.speedFactor}
) )
</foreach> </foreach>
</insert> </insert>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment