[update] 微观大数据平台-信干线路口评价曲线图数据异常修复

signal-optimize-service/src/main/java/net/wanji/opt/service/impl/MainlineEvaluateServiceImpl.java

@@ -36,6 +36,7 @@ import java.math.RoundingMode;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
@@ -1167,6 +1168,18 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
         String boEndDayStr = dayFormat.format(endDate);
         List<CrossDirDataHistPOExt> crossDirDataHistPOList = crossDirDataHistMapper.selectExtByTimeSection(
                 boStartDayStr, boEndDayStr, startHourMinute, endHourMinute);
+        // 将起始和结束时间解析为LocalTime
+        LocalTime startTime = LocalTime.parse(startHourMinute, safeHourMinuteFormat);
+        LocalTime endTime = LocalTime.parse(endHourMinute, safeHourMinuteFormat);
+        // 过滤列表
+        List<CrossDirDataHistPOExt> filteredList = crossDirDataHistPOList.stream()
+                .filter(item -> {
+                    LocalDateTime batchDateTime = LocalDateTime.ofEpochSecond(item.getBatchTime(), 0, ZoneOffset.ofHours(8));
+                    LocalTime batchTime = batchDateTime.toLocalTime();
+                    return (batchTime.equals(startTime) || batchTime.isAfter(startTime)) &&
+                            (batchTime.equals(endTime) || batchTime.isBefore(endTime));
+                })
+                .collect(Collectors.toList());
 
         List<BaseCrossDirInfoPO> baseCrossDirInfoPOList =
                 baseCrossDirInfoMapper.selectByInOutType(CrossInOutEnum.IN.getCode());
@@ -1226,13 +1239,13 @@ public class MainlineEvaluateServiceImpl implements MainlineEvaluateService {
                 dirCode2 = convertDirCode(dirStr2, crossId, dirCode2);
                 coordDirCodeList.add(dirCode2);
             }
-            mainlineCrossEvaluateVO.setCoordValue(calcCoordValue(coordDirCodeList, crossId, crossDirDataHistPOList));
-            fillNonCoordValue(mainlineCrossEvaluateVO, coordDirCodeList, crossId, crossDirDataHistPOList,
+            mainlineCrossEvaluateVO.setCoordValue(calcCoordValue(coordDirCodeList, crossId, filteredList));
+            fillNonCoordValue(mainlineCrossEvaluateVO, coordDirCodeList, crossId, filteredList,
                     baseCrossDirInfoPOList);
             mainlineCrossEvaluateVO.setDirElementList(buildDirElementList(
-                    crossId, metricName, baseCrossDirInfoPOList, crossDirDataHistPOList, crossEmptyPhaseList));
+                    crossId, metricName, baseCrossDirInfoPOList, filteredList, crossEmptyPhaseList));
             mainlineCrossEvaluateVO.setCrossEvaluateList(buildCrossEvaluateList(
-                    crossId, baseCrossDirInfoPOList, crossDirDataHistPOList));
+                    crossId, baseCrossDirInfoPOList, filteredList));
             res.add(mainlineCrossEvaluateVO);
         }
         return res;

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

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"><mapper namespace="net.wanji.databus.dao.mapper.CrossDirDataHistMapper">

    <resultMap id="BaseResultMap" type="net.wanji.databus.po.CrossDirDataHistPO">
        <result column="id" property="id"></result>
        <result column="dir_type" property="dirType"></result>
        <result column="in_out_type" property="inOutType"></result>
        <result column="cross_id" property="crossId"></result>
        <result column="length" property="length"></result>
        <result column="status" property="status"></result>
        <result column="traffic_index" property="trafficIndex"></result>
        <result column="start_time" property="startTime"></result>
        <result column="capacity" property="capacity"></result>
        <result column="duration" property="duration"></result>
        <result column="flow" property="flow"></result>
        <result column="speed" property="speed"></result>
        <result column="queue_length" property="queueLength"></result>
        <result column="stop_times" property="stopTimes"></result>
        <result column="delay_time" property="delayTime"></result>
        <result column="sturation" property="sturation"></result>
        <result column="batch_time" property="batchTime"></result>
        <result column="gmt_create" property="gmtCreate"></result>
        <result column="gmt_modified" property="gmtModified"></result>
        <result column="effusion_rate" property="effusionRate"></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,
        green_light_efficiency
    </sql>

    <insert id="insertBatch" parameterType="net.wanji.databus.po.CrossDirDataHistPO">
        insert ignore into t_cross_dir_data_hist
            (<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.noStopRate},#{entity.oneStopRate},#{entity.twoStopRate},#{entity.threeStopRate},#{entity.batchTime},
            #{entity.gmtCreate}, #{entity.gmtModified},#{entity.effusionRate},#{entity.greenLightEfficiency})
        </foreach>
    </insert>

    <delete id="deleteBatch" parameterType="String">
        delete from t_cross_dir_data_hist
        where cross_id in
        <foreach collection="list" item="crossId" separator="," open="(" close=")">
            #{crossId}
        </foreach>
    </delete>

    <select id="selectByCrossIdAndTimestamp" resultType="net.wanji.databus.po.CrossDirDataHistPO">
        select <include refid="Base_Column_List"/>
        from t_cross_dir_data_hist
        where cross_id = #{crossId} and in_out_type = 1
        and batch_time <![CDATA[ >= ]]> #{preSeconds}
        order by batch_time
    </select>

    <select id="selectByCrossIdDirAndTimestamp" resultType="net.wanji.databus.po.CrossDirDataHistPO">
        select <include refid="Base_Column_List"/>
        from t_cross_dir_data_hist
        where cross_id = #{crossId} and in_out_type = 1 and dir_type = #{dir}
        and batch_time <![CDATA[ >= ]]> #{preSeconds}
        order by batch_time
    </select>

    <select id="selectByCrossIdInOutTimestamp" resultType="net.wanji.databus.bo.CrossDirDataHistAvgBO">
        SELECT dir_type as dirType, avg(capacity) as avgCapacity, avg(flow) as avgFlow,
               avg(queue_length) as avgQueueLength, avg(traffic_index) as avgIndex,
               avg(effusion_rate) as avgeffusionRate
        FROM t_cross_dir_data_hist
        WHERE cross_id = #{crossId}
          AND in_out_type = #{inOutType}
          AND batch_time <![CDATA[ >= ]]> #{preSeconds}
          AND batch_time <![CDATA[ < ]]> #{endSeconds}
        GROUP BY dir_type
    </select>

    <select id="selectNoPark" resultType="net.wanji.databus.po.CrossDirDataHistPO">
        select <include refid="Base_Column_List"/>
        from t_cross_dir_data_hist
        where cross_id = #{crossId} and in_out_type = 2 and dir_type = #{dir}
            and batch_time <![CDATA[ <= ]]> #{currentSeconds}
            and batch_time <![CDATA[ >= ]]> #{preSeconds}
    </select>

    <select id="selectPhaseQueue" resultType="net.wanji.databus.po.CrossDirDataHistPO">
        select <include refid="Base_Column_List"/>
        from t_cross_dir_data_hist
        where cross_id = #{crossId} and in_out_type = 2 and dir_type != #{dir}
        and batch_time <![CDATA[ <= ]]> #{currentSeconds}
        and batch_time <![CDATA[ >= ]]> #{preSeconds}
    </select>

    <select id="selectNoParkEnd" resultType="net.wanji.databus.po.CrossDirDataHistPO">
        select <include refid="Base_Column_List"/>
        from t_cross_dir_data_hist
        where cross_id = #{crossId} and in_out_type = 1 and dir_type = #{dir}
        and batch_time <![CDATA[ <= ]]> #{currentSeconds}
        and batch_time <![CDATA[ >= ]]> #{preSeconds}
    </select>

    <select id="selectPhaseQueueEnd" resultType="net.wanji.databus.po.CrossDirDataHistPO">
        select <include refid="Base_Column_List"/>
        from t_cross_dir_data_hist
        where cross_id = #{crossId} and in_out_type = 1 and dir_type != #{dir}
        and batch_time <![CDATA[ <= ]]> #{currentSeconds}
        and batch_time <![CDATA[ >= ]]> #{preSeconds}
    </select>

    <select id="selectMetricHistDTO" resultType="net.wanji.databus.dto.MetricHistDTO">
        select status, start_time, duration, flow, speed, sturation, capacity, stop_times, delay_time, batch_time, one_stop_rate, queue_length, effusion_rate, no_stop_rate, green_light_efficiency
        from t_cross_dir_data_hist
        where cross_id = #{crossId} and in_out_type = 1 and dir_type = #{dir}
          and batch_time <![CDATA[ >= ]]> #{startStamp}
          and batch_time <![CDATA[ <= ]]> #{endStamp}
        order by batch_time
    </select>

    <select id="selectByCrossIdAndStartEnd" resultType="net.wanji.databus.po.CrossDirDataHistPO">
        select <include refid="Base_Column_List"/>
        from t_cross_dir_data_hist
        where cross_id = #{crossId}
          and batch_time <![CDATA[ >= ]]> #{startStamp}
          and batch_time <![CDATA[ <= ]]> #{endStamp}
    </select>

    <select id="selectMaxDelayTime" resultType="java.lang.Integer">
        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="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}
          and batch_time <![CDATA[ <= ]]> #{endStamp}
    </select>

    <select id="selectMaxGreenLightEfficiency" resultType="java.lang.Double">
        select max(green_light_efficiency)
        from t_cross_dir_data_hist
        where cross_id = #{crossId} and dir_type = #{dirCode} and in_out_type = #{code}
          and batch_time <![CDATA[ >= ]]> #{startTimeStamp}
          and batch_time <![CDATA[ <= ]]> #{endTimeStamp}
    </select>

    <select id="selectByMetrics" resultType="net.wanji.databus.po.CrossDirDataHistPOExt">
        SELECT <include refid="Base_Column_List"/>
        FROM t_cross_dir_data_hist
        WHERE cross_id = #{crossId}
        AND in_out_type = 1
        AND dir_type = #{dirInt}
        AND batch_time <![CDATA[ <= ]]> #{endTimeStamp}
        AND batch_time <![CDATA[ >= ]]> #{startTimeStamp}
    </select>

    <select id="selectByCrossIdsDirsAndTimestamp" resultType="net.wanji.databus.po.CrossDirDataHistPO">
        select <include refid="Base_Column_List"></include>
        from t_cross_dir_data_hist
        where cross_id in
                <foreach collection="crossIdList" item="crossId" separator="," open="(" close=")">
                    #{crossId}
                </foreach>
            and dir_type in
                <foreach collection="dirCodeList" item="dirCode" separator="," open="(" close=")">
                    #{dirCode}
                </foreach>
            and in_out_type = 1
            and batch_time <![CDATA[ >= ]]> #{startTimeStamp}
            and batch_time <![CDATA[ <= ]]> #{endTimeStamp}
        order by batch_time
    </select>

    <select id="selectByCrossDirAndTimeSection" resultType="net.wanji.databus.po.CrossDirDataHistPO">
        SELECT <include refid="Base_Column_List"></include>
        FROM t_cross_dir_data_hist
        WHERE cross_id = #{crossId}
          AND dir_type = #{dirCode}
          AND in_out_type = 1
          AND DATE_FORMAT(FROM_UNIXTIME(batch_time), '%Y-%m-%d') BETWEEN #{boStartDayStr} AND #{boEndDayStr}
          AND DATE_FORMAT(FROM_UNIXTIME(batch_time), '%H:%i') BETWEEN #{startHourMinuteStr} AND #{endHourMinuteStr}
    </select>

    <select id="selectByCrossIdDirsAndTimestamp" resultType="net.wanji.databus.po.CrossDirDataHistPO">
        select <include refid="Base_Column_List"></include>
        from t_cross_dir_data_hist
        where cross_id = #{crossId}
            and dir_type in
                <foreach collection="dirCodeList" item="dirCode" separator="," open="(" close=")">
                    #{dirCode}
                </foreach>
            and in_out_type = 1
            and batch_time <![CDATA[ >= ]]> #{startTimeStamp}
            and batch_time <![CDATA[ <= ]]> #{endTimeStamp}
        order by batch_time
    </select>

    <select id="selectByCrossDirsAndTimeSection" resultType="net.wanji.databus.po.CrossDirDataHistPO">
        SELECT <include refid="Base_Column_List"></include>
        FROM t_cross_dir_data_hist
        WHERE cross_id = #{crossId}
            AND dir_type in
                <foreach collection="dirCodeList" item="dirCode" separator="," open="(" close=")">
                    #{dirCode}
                </foreach>
            AND in_out_type = 1
            AND DATE_FORMAT(FROM_UNIXTIME(batch_time), '%Y-%m-%d') BETWEEN #{boStartDayStr} AND #{boEndDayStr}
            AND DATE_FORMAT(FROM_UNIXTIME(batch_time), '%H:%i') BETWEEN #{startHourMinuteStr} AND #{endHourMinuteStr}
    </select>

    <select id="selectByTimeSection" resultType="net.wanji.databus.po.CrossDirDataHistPO"><!--        SELECT <include refid="Base_Column_List"></include>--><!--        FROM t_cross_dir_data_hist--><!--        WHERE in_out_type = 1--><!--            AND DATE_FORMAT(FROM_UNIXTIME(batch_time), '%Y-%m-%d') BETWEEN #{boStartDayStr} AND #{boEndDayStr}--><!--            AND DATE_FORMAT(FROM_UNIXTIME(batch_time), '%H:%i') BETWEEN #{startHourMinuteStr} AND #{endHourMinuteStr}-->

        SELECT <include refid="Base_Column_List"></include>
        FROM t_cross_dir_data_hist
        WHERE batch_time BETWEEN UNIX_TIMESTAMP(STR_TO_DATE(concat(#{boStartDayStr}, #{startHourMinuteStr}), '%Y-%m-%d%H:%i'))
        AND UNIX_TIMESTAMP(STR_TO_DATE(concat(#{boEndDayStr}, #{endHourMinuteStr}), '%Y-%m-%d%H:%i'))
        AND in_out_type = 1
    </select>

    <select id="selectExtByTimeSection" resultType="net.wanji.databus.po.CrossDirDataHistPOExt">
        SELECT <include refid="Base_Column_List"></include>
        FROM t_cross_dir_data_hist
        WHERE batch_time BETWEEN UNIX_TIMESTAMP(STR_TO_DATE(concat(#{boStartDayStr}, #{startHourMinuteStr}), '%Y-%m-%d%H:%i'))
        AND UNIX_TIMESTAMP(STR_TO_DATE(concat(#{boEndDayStr}, #{endHourMinuteStr}), '%Y-%m-%d%H:%i'))
        AND in_out_type = 1
    </select>
</mapper>
\ No newline at end of file
-<mapper namespace="net.wanji.databus.dao.mapper.CrossDirDataHistMapper">
-
-    <resultMap id="BaseResultMap" type="net.wanji.databus.po.CrossDirDataHistPO">
-        <result column="id" property="id"></result>
-        <result column="dir_type" property="dirType"></result>
-        <result column="in_out_type" property="inOutType"></result>
-        <result column="cross_id" property="crossId"></result>
-        <result column="length" property="length"></result>
-        <result column="status" property="status"></result>
-        <result column="traffic_index" property="trafficIndex"></result>
-        <result column="start_time" property="startTime"></result>
-        <result column="capacity" property="capacity"></result>
-        <result column="duration" property="duration"></result>
-        <result column="flow" property="flow"></result>
-        <result column="speed" property="speed"></result>
-        <result column="queue_length" property="queueLength"></result>
-        <result column="stop_times" property="stopTimes"></result>
-        <result column="delay_time" property="delayTime"></result>
-        <result column="sturation" property="sturation"></result>
-        <result column="batch_time" property="batchTime"></result>
-        <result column="gmt_create" property="gmtCreate"></result>
-        <result column="gmt_modified" property="gmtModified"></result>
-        <result column="effusion_rate" property="effusionRate"></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,
-        green_light_efficiency
-    </sql>
-
-    <insert id="insertBatch" parameterType="net.wanji.databus.po.CrossDirDataHistPO">
-        insert ignore into t_cross_dir_data_hist
-            (<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.noStopRate},#{entity.oneStopRate},#{entity.twoStopRate},#{entity.threeStopRate},#{entity.batchTime},
-            #{entity.gmtCreate}, #{entity.gmtModified},#{entity.effusionRate},#{entity.greenLightEfficiency})
-        </foreach>
-    </insert>
-
-    <delete id="deleteBatch" parameterType="String">
-        delete from t_cross_dir_data_hist
-        where cross_id in
-        <foreach collection="list" item="crossId" separator="," open="(" close=")">
-            #{crossId}
-        </foreach>
-    </delete>
-
-    <select id="selectByCrossIdAndTimestamp" resultType="net.wanji.databus.po.CrossDirDataHistPO">
-        select <include refid="Base_Column_List"/>
-        from t_cross_dir_data_hist
-        where cross_id = #{crossId} and in_out_type = 1
-        and batch_time <![CDATA[ >= ]]> #{preSeconds}
-        order by batch_time
-    </select>
-
-    <select id="selectByCrossIdDirAndTimestamp" resultType="net.wanji.databus.po.CrossDirDataHistPO">
-        select <include refid="Base_Column_List"/>
-        from t_cross_dir_data_hist
-        where cross_id = #{crossId} and in_out_type = 1 and dir_type = #{dir}
-        and batch_time <![CDATA[ >= ]]> #{preSeconds}
-        order by batch_time
-    </select>
-
-    <select id="selectByCrossIdInOutTimestamp" resultType="net.wanji.databus.bo.CrossDirDataHistAvgBO">
-        SELECT dir_type as dirType, avg(capacity) as avgCapacity, avg(flow) as avgFlow,
-               avg(queue_length) as avgQueueLength, avg(traffic_index) as avgIndex,
-               avg(effusion_rate) as avgeffusionRate
-        FROM t_cross_dir_data_hist
-        WHERE cross_id = #{crossId}
-          AND in_out_type = #{inOutType}
-          AND batch_time <![CDATA[ >= ]]> #{preSeconds}
-          AND batch_time <![CDATA[ < ]]> #{endSeconds}
-        GROUP BY dir_type
-    </select>
-
-    <select id="selectNoPark" resultType="net.wanji.databus.po.CrossDirDataHistPO">
-        select <include refid="Base_Column_List"/>
-        from t_cross_dir_data_hist
-        where cross_id = #{crossId} and in_out_type = 2 and dir_type = #{dir}
-            and batch_time <![CDATA[ <= ]]> #{currentSeconds}
-            and batch_time <![CDATA[ >= ]]> #{preSeconds}
-    </select>
-
-    <select id="selectPhaseQueue" resultType="net.wanji.databus.po.CrossDirDataHistPO">
-        select <include refid="Base_Column_List"/>
-        from t_cross_dir_data_hist
-        where cross_id = #{crossId} and in_out_type = 2 and dir_type != #{dir}
-        and batch_time <![CDATA[ <= ]]> #{currentSeconds}
-        and batch_time <![CDATA[ >= ]]> #{preSeconds}
-    </select>
-
-    <select id="selectNoParkEnd" resultType="net.wanji.databus.po.CrossDirDataHistPO">
-        select <include refid="Base_Column_List"/>
-        from t_cross_dir_data_hist
-        where cross_id = #{crossId} and in_out_type = 1 and dir_type = #{dir}
-        and batch_time <![CDATA[ <= ]]> #{currentSeconds}
-        and batch_time <![CDATA[ >= ]]> #{preSeconds}
-    </select>
-
-    <select id="selectPhaseQueueEnd" resultType="net.wanji.databus.po.CrossDirDataHistPO">
-        select <include refid="Base_Column_List"/>
-        from t_cross_dir_data_hist
-        where cross_id = #{crossId} and in_out_type = 1 and dir_type != #{dir}
-        and batch_time <![CDATA[ <= ]]> #{currentSeconds}
-        and batch_time <![CDATA[ >= ]]> #{preSeconds}
-    </select>
-
-    <select id="selectMetricHistDTO" resultType="net.wanji.databus.dto.MetricHistDTO">
-        select status, start_time, duration, flow, speed, sturation, capacity, stop_times, delay_time, batch_time, one_stop_rate, queue_length, effusion_rate, no_stop_rate, green_light_efficiency
-        from t_cross_dir_data_hist
-        where cross_id = #{crossId} and in_out_type = 1 and dir_type = #{dir}
-          and batch_time <![CDATA[ >= ]]> #{startStamp}
-          and batch_time <![CDATA[ <= ]]> #{endStamp}
-        order by batch_time
-    </select>
-
-    <select id="selectByCrossIdAndStartEnd" resultType="net.wanji.databus.po.CrossDirDataHistPO">
-        select <include refid="Base_Column_List"/>
-        from t_cross_dir_data_hist
-        where cross_id = #{crossId}
-          and batch_time <![CDATA[ >= ]]> #{startStamp}
-          and batch_time <![CDATA[ <= ]]> #{endStamp}
-    </select>
-
-    <select id="selectMaxDelayTime" resultType="java.lang.Integer">
-        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="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}
-          and batch_time <![CDATA[ <= ]]> #{endStamp}
-    </select>
-
-    <select id="selectMaxGreenLightEfficiency" resultType="java.lang.Double">
-        select max(green_light_efficiency)
-        from t_cross_dir_data_hist
-        where cross_id = #{crossId} and dir_type = #{dirCode} and in_out_type = #{code}
-          and batch_time <![CDATA[ >= ]]> #{startTimeStamp}
-          and batch_time <![CDATA[ <= ]]> #{endTimeStamp}
-    </select>
-
-    <select id="selectByMetrics" resultType="net.wanji.databus.po.CrossDirDataHistPOExt">
-        SELECT <include refid="Base_Column_List"/>
-        FROM t_cross_dir_data_hist
-        WHERE cross_id = #{crossId}
-        AND in_out_type = 1
-        AND dir_type = #{dirInt}
-        AND batch_time <![CDATA[ <= ]]> #{endTimeStamp}
-        AND batch_time <![CDATA[ >= ]]> #{startTimeStamp}
-    </select>
-
-    <select id="selectByCrossIdsDirsAndTimestamp" resultType="net.wanji.databus.po.CrossDirDataHistPO">
-        select <include refid="Base_Column_List"></include>
-        from t_cross_dir_data_hist
-        where cross_id in
-                <foreach collection="crossIdList" item="crossId" separator="," open="(" close=")">
-                    #{crossId}
-                </foreach>
-            and dir_type in
-                <foreach collection="dirCodeList" item="dirCode" separator="," open="(" close=")">
-                    #{dirCode}
-                </foreach>
-            and in_out_type = 1
-            and batch_time <![CDATA[ >= ]]> #{startTimeStamp}
-            and batch_time <![CDATA[ <= ]]> #{endTimeStamp}
-        order by batch_time
-    </select>
-
-    <select id="selectByCrossDirAndTimeSection" resultType="net.wanji.databus.po.CrossDirDataHistPO">
-        SELECT <include refid="Base_Column_List"></include>
-        FROM t_cross_dir_data_hist
-        WHERE cross_id = #{crossId}
-          AND dir_type = #{dirCode}
-          AND in_out_type = 1
-          AND DATE_FORMAT(FROM_UNIXTIME(batch_time), '%Y-%m-%d') BETWEEN #{boStartDayStr} AND #{boEndDayStr}
-          AND DATE_FORMAT(FROM_UNIXTIME(batch_time), '%H:%i') BETWEEN #{startHourMinuteStr} AND #{endHourMinuteStr}
-    </select>
-
-    <select id="selectByCrossIdDirsAndTimestamp" resultType="net.wanji.databus.po.CrossDirDataHistPO">
-        select <include refid="Base_Column_List"></include>
-        from t_cross_dir_data_hist
-        where cross_id = #{crossId}
-            and dir_type in
-                <foreach collection="dirCodeList" item="dirCode" separator="," open="(" close=")">
-                    #{dirCode}
-                </foreach>
-            and in_out_type = 1
-            and batch_time <![CDATA[ >= ]]> #{startTimeStamp}
-            and batch_time <![CDATA[ <= ]]> #{endTimeStamp}
-        order by batch_time
-    </select>
-
-    <select id="selectByCrossDirsAndTimeSection" resultType="net.wanji.databus.po.CrossDirDataHistPO">
-        SELECT <include refid="Base_Column_List"></include>
-        FROM t_cross_dir_data_hist
-        WHERE cross_id = #{crossId}
-            AND dir_type in
-                <foreach collection="dirCodeList" item="dirCode" separator="," open="(" close=")">
-                    #{dirCode}
-                </foreach>
-            AND in_out_type = 1
-            AND DATE_FORMAT(FROM_UNIXTIME(batch_time), '%Y-%m-%d') BETWEEN #{boStartDayStr} AND #{boEndDayStr}
-            AND DATE_FORMAT(FROM_UNIXTIME(batch_time), '%H:%i') BETWEEN #{startHourMinuteStr} AND #{endHourMinuteStr}
-    </select>
-
-    <select id="selectByTimeSection" resultType="net.wanji.databus.po.CrossDirDataHistPO">
-<!--        SELECT <include refid="Base_Column_List"></include>-->
-<!--        FROM t_cross_dir_data_hist-->
-<!--        WHERE in_out_type = 1-->
-<!--            AND DATE_FORMAT(FROM_UNIXTIME(batch_time), '%Y-%m-%d') BETWEEN #{boStartDayStr} AND #{boEndDayStr}-->
-<!--            AND DATE_FORMAT(FROM_UNIXTIME(batch_time), '%H:%i') BETWEEN #{startHourMinuteStr} AND #{endHourMinuteStr}-->
-
-        SELECT <include refid="Base_Column_List"></include>
-        FROM t_cross_dir_data_hist
-        WHERE batch_time BETWEEN UNIX_TIMESTAMP(STR_TO_DATE(concat(#{boStartDayStr}, #{startHourMinuteStr}), '%Y-%m-%d%H:%i'))
-        AND UNIX_TIMESTAMP(STR_TO_DATE(concat(#{boEndDayStr}, #{endHourMinuteStr}), '%Y-%m-%d%H:%i'))
-        AND in_out_type = 1
-    </select>
-
-    <select id="selectExtByTimeSection" resultType="net.wanji.databus.po.CrossDirDataHistPOExt">
-        SELECT <include refid="Base_Column_List"></include>
-        FROM t_cross_dir_data_hist
-        WHERE batch_time BETWEEN UNIX_TIMESTAMP(STR_TO_DATE(concat(#{boStartDayStr}, #{startHourMinuteStr}), '%Y-%m-%d%H:%i'))
-        AND UNIX_TIMESTAMP(STR_TO_DATE(concat(#{boEndDayStr}, #{endHourMinuteStr}), '%Y-%m-%d%H:%i'))
-        AND in_out_type = 1
-    </select>
-
-</mapper>
\ No newline at end of file