[update] 新信号评价-方案评价-均衡调控策略总体评价

wj-databus/src/main/java/net/wanji/databus/dao/mapper/CrossDirDataHistMapper.java

@@ -37,7 +37,9 @@ public interface CrossDirDataHistMapper extends BaseMapper<CrossDirDataHistPO> {
 
     List<CrossDirDataHistPO> selectByCrossIdAndStartEnd(String crossId, int startStamp, int endStamp);
 
-    Double selectAvgDelayTime(String crossId, Integer dirType, Integer inOutType, int startStamp, int endStamp);
+    Double selectMaxDelayTime(String crossId, Integer dirType, Integer inOutType, int startStamp, int endStamp);
 
-    Double selectAvgQueueLength(String crossId, Integer dirType, Integer inOutType, int startStamp, int endStamp);
+    Double selectMaxQueueLength(String crossId, Integer dirType, Integer inOutType, int startStamp, int endStamp);
+
+    Double selectMaxSaturation(String crossId, Integer dirType, Integer inOutType, int startStamp, int endStamp);
 }

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

@@ -127,16 +127,24 @@
           and batch_time <![CDATA[ <= ]]> #{endStamp}
     </select>
 
-    <select id="selectAvgDelayTime" resultType="java.lang.Double">
-        select avg(delay_time)
+    <select id="selectMaxDelayTime" resultType="java.lang.Double">
+        select max(delay_time)
         from t_cross_dir_data_hist
         where cross_id = #{crossId} and dir_type = #{dirType} and in_out_type = #{inOutType}
         and batch_time <![CDATA[ >= ]]> #{startStamp}
         and batch_time <![CDATA[ <= ]]> #{endStamp}
     </select>
 
-    <select id="selectAvgQueueLength" resultType="java.lang.Double">
-        select avg(queue_length)
+    <select id="selectMaxQueueLength" resultType="java.lang.Double">
+        select max(queue_length)
+        from t_cross_dir_data_hist
+        where cross_id = #{crossId} and dir_type = #{dirType} and in_out_type = #{inOutType}
+          and batch_time <![CDATA[ >= ]]> #{startStamp}
+          and batch_time <![CDATA[ <= ]]> #{endStamp}
+    </select>
+
+    <select id="selectMaxSaturation" resultType="java.lang.Double">
+        select max(sturation)
         from t_cross_dir_data_hist
         where cross_id = #{crossId} and dir_type = #{dirType} and in_out_type = #{inOutType}
           and batch_time <![CDATA[ >= ]]> #{startStamp}