Commit 6522a857 authored by duwei's avatar duwei

按开始时间查询

parent 8634f16b
...@@ -2638,6 +2638,9 @@ public class TrendServiceImpl implements TrendService { ...@@ -2638,6 +2638,9 @@ public class TrendServiceImpl implements TrendService {
String crossId = lanePeriodVO.getCrossId(); String crossId = lanePeriodVO.getCrossId();
int start = (int) (lanePeriodVO.getStart().getTime() / 1000); int start = (int) (lanePeriodVO.getStart().getTime() / 1000);
int end = (int) (lanePeriodVO.getEnd().getTime() / 1000); int end = (int) (lanePeriodVO.getEnd().getTime() / 1000);
String startTime = DateUtil.format(lanePeriodVO.getStart(), "yyyy-MM-dd HH:mm:ss");
String endTime = DateUtil.format(lanePeriodVO.getEnd(), "yyyy-MM-dd HH:mm:ss");
String ids = lanePeriodVO.getIds(); String ids = lanePeriodVO.getIds();
List<String> idsList = null; List<String> idsList = null;
if (!StringUtils.isBlank(ids)) { if (!StringUtils.isBlank(ids)) {
...@@ -2653,7 +2656,7 @@ public class TrendServiceImpl implements TrendService { ...@@ -2653,7 +2656,7 @@ public class TrendServiceImpl implements TrendService {
} }
// 查询周期数据 // 查询周期数据
List<CrossLaneDataHistVOExt> poExtList = crossLaneDataHistMapper.selectByCrossIdAndTimeIds(crossId, start, end, granularity, idsList); List<CrossLaneDataHistVOExt> poExtList = crossLaneDataHistMapper.selectByCrossIdAndTimeIds(crossId, startTime, endTime, granularity, idsList);
return buildLaneCycleData(crossId, poExtList); return buildLaneCycleData(crossId, poExtList);
} catch (Exception e) { } catch (Exception e) {
log.error("车道数据查询异常:", e); log.error("车道数据查询异常:", e);
...@@ -2675,6 +2678,8 @@ public class TrendServiceImpl implements TrendService { ...@@ -2675,6 +2678,8 @@ public class TrendServiceImpl implements TrendService {
String crossId = turnVO.getCrossId(); String crossId = turnVO.getCrossId();
int start = (int) (turnVO.getStart().getTime() / 1000); int start = (int) (turnVO.getStart().getTime() / 1000);
int end = (int) (turnVO.getEnd().getTime() / 1000); int end = (int) (turnVO.getEnd().getTime() / 1000);
String startTime = DateUtil.format(turnVO.getStart(), "yyyy-MM-dd HH:mm:ss");
String endTime = DateUtil.format(turnVO.getEnd(), "yyyy-MM-dd HH:mm:ss");
//转向 用逗号分隔 //转向 用逗号分隔
String turnType = turnVO.getTurnType(); String turnType = turnVO.getTurnType();
List<String> turnTypeList = null; List<String> turnTypeList = null;
...@@ -2697,7 +2702,7 @@ public class TrendServiceImpl implements TrendService { ...@@ -2697,7 +2702,7 @@ public class TrendServiceImpl implements TrendService {
} }
// 查询周期数据 // 查询周期数据
List<CrossTurnDataHistVO> vo = crossTurnDataHistMapper.selectByCrossIdTurn(crossId, start, end, granularity, turnTypeList, inDirList); List<CrossTurnDataHistVO> vo = crossTurnDataHistMapper.selectByCrossIdTurn(crossId, startTime, endTime, granularity, turnTypeList, inDirList);
return buildCrossingTurnCycleData(crossId, vo); return buildCrossingTurnCycleData(crossId, vo);
} catch (Exception e) { } catch (Exception e) {
log.error("全是周期车道数据方向转向查询异常:", e); log.error("全是周期车道数据方向转向查询异常:", e);
...@@ -2726,6 +2731,8 @@ public class TrendServiceImpl implements TrendService { ...@@ -2726,6 +2731,8 @@ public class TrendServiceImpl implements TrendService {
String crossId = directionVO.getCrossId(); String crossId = directionVO.getCrossId();
int start = (int) (directionVO.getStart().getTime() / 1000); int start = (int) (directionVO.getStart().getTime() / 1000);
int end = (int) (directionVO.getEnd().getTime() / 1000); int end = (int) (directionVO.getEnd().getTime() / 1000);
String startTime = DateUtil.format(directionVO.getStart(), "yyyy-MM-dd HH:mm:ss");
String endTime = DateUtil.format(directionVO.getEnd(), "yyyy-MM-dd HH:mm:ss");
//方向 //方向
String dirType = directionVO.getDirection(); String dirType = directionVO.getDirection();
List<Integer> dirTypeList = null; List<Integer> dirTypeList = null;
...@@ -2741,7 +2748,7 @@ public class TrendServiceImpl implements TrendService { ...@@ -2741,7 +2748,7 @@ public class TrendServiceImpl implements TrendService {
} }
// 查询周期数据 // 查询周期数据
List<CrossDirDataHistVO> vo = crossDirDataHistMapper.selectByCrossIdAndStartEndDir(crossId, start, end, dirTypeList, granularity); List<CrossDirDataHistVO> vo = crossDirDataHistMapper.selectByCrossIdAndStartEndDir(crossId, startTime, endTime, dirTypeList, granularity);
return buildCrossingDirectionCycleData(crossId, vo); return buildCrossingDirectionCycleData(crossId, vo);
} catch (Exception e) { } catch (Exception e) {
log.error("全是周期数据方向级查询异常:", e); log.error("全是周期数据方向级查询异常:", e);
...@@ -2762,6 +2769,8 @@ public class TrendServiceImpl implements TrendService { ...@@ -2762,6 +2769,8 @@ public class TrendServiceImpl implements TrendService {
String crossId = crossingVO.getCrossId(); String crossId = crossingVO.getCrossId();
int start = (int) (crossingVO.getStart().getTime() / 1000); int start = (int) (crossingVO.getStart().getTime() / 1000);
int end = (int) (crossingVO.getEnd().getTime() / 1000); int end = (int) (crossingVO.getEnd().getTime() / 1000);
String startTime = DateUtil.format(crossingVO.getStart(), "yyyy-MM-dd HH:mm:ss");
String endTime = DateUtil.format(crossingVO.getEnd(), "yyyy-MM-dd HH:mm:ss");
//分析粒度【5m:五分钟 10m:10分钟 30m:30分钟 1h:一小时】 //分析粒度【5m:五分钟 10m:10分钟 30m:30分钟 1h:一小时】
String granularity = crossingVO.getGranularity(); String granularity = crossingVO.getGranularity();
if (StringUtils.isBlank(granularity)) { if (StringUtils.isBlank(granularity)) {
...@@ -2771,7 +2780,7 @@ public class TrendServiceImpl implements TrendService { ...@@ -2771,7 +2780,7 @@ public class TrendServiceImpl implements TrendService {
} }
// 查询周期数据 // 查询周期数据
List<CrossDataHistVO> vo = crossDataHistMapper.selectByCrossIdAndStartEndStat(crossId, start, end, granularity); List<CrossDataHistVO> vo = crossDataHistMapper.selectByCrossIdAndStartEndStat(crossId, startTime, endTime, granularity);
return buildCrossingCycleData(crossId, vo); return buildCrossingCycleData(crossId, vo);
} catch (Exception e) { } catch (Exception e) {
log.error("路口周期数据方向级查询异常:", e); log.error("路口周期数据方向级查询异常:", e);
...@@ -2945,6 +2954,8 @@ public class TrendServiceImpl implements TrendService { ...@@ -2945,6 +2954,8 @@ public class TrendServiceImpl implements TrendService {
int end = (int) (lanePeriodVO.getEnd().getTime() / 1000); int end = (int) (lanePeriodVO.getEnd().getTime() / 1000);
String startStr = DateUtil.format(lanePeriodVO.getStart(), DateStyle.YYYY_MM_DD_HH_MM.getValue()); String startStr = DateUtil.format(lanePeriodVO.getStart(), DateStyle.YYYY_MM_DD_HH_MM.getValue());
String endStr = DateUtil.format(lanePeriodVO.getEnd(), DateStyle.MM_DD_HH_MM.getValue()); String endStr = DateUtil.format(lanePeriodVO.getEnd(), DateStyle.MM_DD_HH_MM.getValue());
String startTime = DateUtil.format(lanePeriodVO.getStart(), "yyyy-MM-dd HH:mm:ss");
String endTime = DateUtil.format(lanePeriodVO.getEnd(), "yyyy-MM-dd HH:mm:ss");
String ids = lanePeriodVO.getIds(); String ids = lanePeriodVO.getIds();
List<String> idsList = null; List<String> idsList = null;
if (!StringUtils.isBlank(ids)) { if (!StringUtils.isBlank(ids)) {
...@@ -2960,7 +2971,7 @@ public class TrendServiceImpl implements TrendService { ...@@ -2960,7 +2971,7 @@ public class TrendServiceImpl implements TrendService {
} }
// 查询周期数据 // 查询周期数据
List<CrossLaneDataHistVOExt> poExtList = crossLaneDataHistMapper.selectByCrossIdAndTimeIds(crossId, start, end, granularity, idsList); List<CrossLaneDataHistVOExt> poExtList = crossLaneDataHistMapper.selectByCrossIdAndTimeIds(crossId, startTime, endTime, granularity, idsList);
List<TableQueryVO.CycleDataElement> dataList = buildLaneCycleData(crossId, poExtList); List<TableQueryVO.CycleDataElement> dataList = buildLaneCycleData(crossId, poExtList);
// 判断是否需要导出全部字段 // 判断是否需要导出全部字段
...@@ -3092,6 +3103,8 @@ public class TrendServiceImpl implements TrendService { ...@@ -3092,6 +3103,8 @@ public class TrendServiceImpl implements TrendService {
int end = (int) (turnVO.getEnd().getTime() / 1000); int end = (int) (turnVO.getEnd().getTime() / 1000);
String startStr = DateUtil.format(turnVO.getStart(), DateStyle.YYYY_MM_DD_HH_MM.getValue()); String startStr = DateUtil.format(turnVO.getStart(), DateStyle.YYYY_MM_DD_HH_MM.getValue());
String endStr = DateUtil.format(turnVO.getEnd(), DateStyle.MM_DD_HH_MM.getValue()); String endStr = DateUtil.format(turnVO.getEnd(), DateStyle.MM_DD_HH_MM.getValue());
String startTime = DateUtil.format(turnVO.getStart(), "yyyy-MM-dd HH:mm:ss");
String endTime = DateUtil.format(turnVO.getEnd(), "yyyy-MM-dd HH:mm:ss");
//转向 用逗号分隔 //转向 用逗号分隔
String turnType = turnVO.getTurnType(); String turnType = turnVO.getTurnType();
List<String> turnTypeList = null; List<String> turnTypeList = null;
...@@ -3114,7 +3127,7 @@ public class TrendServiceImpl implements TrendService { ...@@ -3114,7 +3127,7 @@ public class TrendServiceImpl implements TrendService {
} }
// 查询周期数据 // 查询周期数据
List<CrossTurnDataHistVO> vo = crossTurnDataHistMapper.selectByCrossIdTurn(crossId, start, end, granularity, turnTypeList, inDirList); List<CrossTurnDataHistVO> vo = crossTurnDataHistMapper.selectByCrossIdTurn(crossId, startTime, endTime, granularity, turnTypeList, inDirList);
List<CrossingTurnQueryVO.CycleDataElement> result = buildCrossingTurnCycleData(crossId, vo); List<CrossingTurnQueryVO.CycleDataElement> result = buildCrossingTurnCycleData(crossId, vo);
// 判断是否需要导出全部字段 // 判断是否需要导出全部字段
...@@ -3154,6 +3167,8 @@ public class TrendServiceImpl implements TrendService { ...@@ -3154,6 +3167,8 @@ public class TrendServiceImpl implements TrendService {
int end = (int) (directionVO.getEnd().getTime() / 1000); int end = (int) (directionVO.getEnd().getTime() / 1000);
String startStr = DateUtil.format(directionVO.getStart(), DateStyle.YYYY_MM_DD_HH_MM.getValue()); String startStr = DateUtil.format(directionVO.getStart(), DateStyle.YYYY_MM_DD_HH_MM.getValue());
String endStr = DateUtil.format(directionVO.getEnd(), DateStyle.MM_DD_HH_MM.getValue()); String endStr = DateUtil.format(directionVO.getEnd(), DateStyle.MM_DD_HH_MM.getValue());
String startTime = DateUtil.format(directionVO.getStart(), "yyyy-MM-dd HH:mm:ss");
String endTime = DateUtil.format(directionVO.getEnd(), "yyyy-MM-dd HH:mm:ss");
//方向 //方向
String dirType = directionVO.getDirection(); String dirType = directionVO.getDirection();
List<Integer> dirTypeList = null; List<Integer> dirTypeList = null;
...@@ -3169,7 +3184,7 @@ public class TrendServiceImpl implements TrendService { ...@@ -3169,7 +3184,7 @@ public class TrendServiceImpl implements TrendService {
} }
// 查询周期数据 // 查询周期数据
List<CrossDirDataHistVO> vo = crossDirDataHistMapper.selectByCrossIdAndStartEndDir(crossId, start, end, dirTypeList, granularity); List<CrossDirDataHistVO> vo = crossDirDataHistMapper.selectByCrossIdAndStartEndDir(crossId, startTime, endTime, dirTypeList, granularity);
List<CrossingDirectionQueryVO.CycleDataElement> result = buildCrossingDirectionCycleData(crossId, vo); List<CrossingDirectionQueryVO.CycleDataElement> result = buildCrossingDirectionCycleData(crossId, vo);
// 判断是否需要导出全部字段 // 判断是否需要导出全部字段
...@@ -3207,6 +3222,8 @@ public class TrendServiceImpl implements TrendService { ...@@ -3207,6 +3222,8 @@ public class TrendServiceImpl implements TrendService {
int end = (int) (crossingVO.getEnd().getTime() / 1000); int end = (int) (crossingVO.getEnd().getTime() / 1000);
String startStr = DateUtil.format(crossingVO.getStart(), DateStyle.YYYY_MM_DD_HH_MM.getValue()); String startStr = DateUtil.format(crossingVO.getStart(), DateStyle.YYYY_MM_DD_HH_MM.getValue());
String endStr = DateUtil.format(crossingVO.getEnd(), DateStyle.MM_DD_HH_MM.getValue()); String endStr = DateUtil.format(crossingVO.getEnd(), DateStyle.MM_DD_HH_MM.getValue());
String startTime = DateUtil.format(crossingVO.getStart(), "yyyy-MM-dd HH:mm:ss");
String endTime = DateUtil.format(crossingVO.getEnd(), "yyyy-MM-dd HH:mm:ss");
//分析粒度【5m:五分钟 10m:10分钟 30m:30分钟 1h:一小时】 //分析粒度【5m:五分钟 10m:10分钟 30m:30分钟 1h:一小时】
String granularity = crossingVO.getGranularity(); String granularity = crossingVO.getGranularity();
if (StringUtils.isBlank(granularity)) { if (StringUtils.isBlank(granularity)) {
...@@ -3216,7 +3233,7 @@ public class TrendServiceImpl implements TrendService { ...@@ -3216,7 +3233,7 @@ public class TrendServiceImpl implements TrendService {
} }
// 查询周期数据 // 查询周期数据
List<CrossDataHistVO> vo = crossDataHistMapper.selectByCrossIdAndStartEndStat(crossId, start, end, granularity); List<CrossDataHistVO> vo = crossDataHistMapper.selectByCrossIdAndStartEndStat(crossId, startTime, endTime, granularity);
List<CrossingQueryVO.CycleDataElement> result = buildCrossingCycleData(crossId, vo); List<CrossingQueryVO.CycleDataElement> result = buildCrossingCycleData(crossId, vo);
// 判断是否需要导出全部字段 // 判断是否需要导出全部字段
......
...@@ -34,7 +34,7 @@ public interface CrossDataHistMapper extends BaseMapper<CrossDataHistPO> { ...@@ -34,7 +34,7 @@ public interface CrossDataHistMapper extends BaseMapper<CrossDataHistPO> {
*/ */
List<CrossDataHistPO> selectByCrossIdAndStartEnd2(String crossId, String startStamp, String endStamp); List<CrossDataHistPO> selectByCrossIdAndStartEnd2(String crossId, String startStamp, String endStamp);
List<CrossDataHistVO> selectByCrossIdAndStartEndStat(String crossId, int startStamp, int endStamp, String granularity); List<CrossDataHistVO> selectByCrossIdAndStartEndStat(String crossId, String startStamp, String endStamp, String granularity);
List<MetricHistDTO> selectMetricHistDTO(String crossId, int startStamp, int endStamp); List<MetricHistDTO> selectMetricHistDTO(String crossId, int startStamp, int endStamp);
......
...@@ -49,7 +49,7 @@ public interface CrossDirDataHistMapper extends BaseMapper<CrossDirDataHistPO> { ...@@ -49,7 +49,7 @@ public interface CrossDirDataHistMapper extends BaseMapper<CrossDirDataHistPO> {
* @param granularity 时段 * @param granularity 时段
* @return * @return
*/ */
List<CrossDirDataHistVO> selectByCrossIdAndStartEndDir(String crossId, int startStamp, int endStamp, List<Integer> dirTypeList, String granularity); List<CrossDirDataHistVO> selectByCrossIdAndStartEndDir(String crossId, String startStamp, String endStamp, List<Integer> dirTypeList, String granularity);
Integer selectMaxDelayTime(String crossId, Integer dirType, Integer inOutType, int startStamp, int endStamp); Integer selectMaxDelayTime(String crossId, Integer dirType, Integer inOutType, int startStamp, int endStamp);
......
...@@ -36,5 +36,5 @@ public interface CrossLaneDataHistMapper extends BaseMapper<CrossLaneDataHistPO> ...@@ -36,5 +36,5 @@ public interface CrossLaneDataHistMapper extends BaseMapper<CrossLaneDataHistPO>
* @param ids 车道id集合 * @param ids 车道id集合
* @return * @return
*/ */
List<CrossLaneDataHistVOExt> selectByCrossIdAndTimeIds(String crossId, int startStamp, int endStamp, String granularity, List<String> ids); List<CrossLaneDataHistVOExt> selectByCrossIdAndTimeIds(String crossId, String startStamp, String endStamp, String granularity, List<String> ids);
} }
...@@ -34,7 +34,7 @@ public interface CrossTurnDataHistMapper extends BaseMapper<CrossTurnDataHistPO> ...@@ -34,7 +34,7 @@ public interface CrossTurnDataHistMapper extends BaseMapper<CrossTurnDataHistPO>
* @param inDir * @param inDir
* @return * @return
*/ */
List<CrossTurnDataHistVO> selectByCrossIdTurn(String crossId, long startStamp, long endStamp, String granularity, List<String> turnTypeList , List<Integer> inDirList); List<CrossTurnDataHistVO> selectByCrossIdTurn(String crossId, String startStamp, String endStamp, String granularity, List<String> turnTypeList , List<Integer> inDirList);
List<MetricHistDTO> selectMetricHistDTO(String crossId, int startStamp, int endStamp, int dir, String turn); List<MetricHistDTO> selectMetricHistDTO(String crossId, int startStamp, int endStamp, int dir, String turn);
......
...@@ -145,8 +145,8 @@ ...@@ -145,8 +145,8 @@
<if test="crossId != null"> <if test="crossId != null">
AND t2.cross_id = #{crossId} AND t2.cross_id = #{crossId}
</if> </if>
and t2.batch_time <![CDATA[ >= ]]> #{startStamp} and t2.start_time <![CDATA[ >= ]]> #{startStamp}
and t2.batch_time <![CDATA[ <= ]]> #{endStamp} and t2.start_time <![CDATA[ <= ]]> #{endStamp}
GROUP BY GROUP BY
t2.cross_id, t2.cross_id,
startTime startTime
......
<?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> <!-- 方向级查询,条件:路口id、时间、方向 --> <select id="selectByCrossIdAndStartEndDir" resultType="net.wanji.databus.vo.CrossDirDataHistVO"> SELECT t1.cross_id AS crossId, t1.dir_type as dirType, <choose> <!-- 小时 --> <when test="granularity==1"> DATE_FORMAT(t2.start_time, '%Y-%m-%d %H:00:00') AS startTime, </when> <!-- 分钟 --> <otherwise> DATE_FORMAT( CONCAT( DATE ( t2.start_time ), ' ', HOUR ( t2.start_time ), ':', FLOOR( MINUTE ( t2.start_time ) / #{granularity} ) * #{granularity} ), '%Y-%m-%d %H:%i:00' ) AS startTime, </otherwise> </choose> SUM( t2.flow ) AS flow, COALESCE ( sum( t2.traffic_flow_C ), 0 ) AS trafficFlowC, COALESCE ( sum( t2.traffic_flow_B ), 0 ) AS trafficFlowB, COALESCE ( sum( t2.traffic_flow_A ), 0 ) AS trafficFlowA, avg( t2.speed ) AS speed, MAX( t2.queue_length ) AS queueLength, AVG( t2.stop_times ) AS stopTimes, AVG( t2.time_occupancy) as timeOccupancy, AVG( t2.sturation) as sturation, AVG( t2.no_stop_rate) as noStopRate, AVG( t2.one_stop_rate) as oneStopRate, AVG( t2.two_stop_rate) as twoStopRate, AVG( t2.three_stop_rate) as threeStopRate, AVG( t2.non_motor_flow) as nonMotorFlow FROM t_base_cross_dir_info t1 LEFT JOIN t_cross_dir_data_hist t2 ON t1.cross_id = t2.cross_id WHERE 1=1 <if test="crossId != null"> AND t1.cross_id = #{crossId} </if> <if test="dirTypeList != null"> AND t1.dir_type IN <foreach item="dirType" index="index" collection="dirTypeList" open="(" separator="," close=")"> #{dirType} </foreach> </if> and t2.batch_time <![CDATA[ >= ]]> #{startStamp} and t2.batch_time <![CDATA[ <= ]]> #{endStamp} GROUP BY t1.cross_id, t1.dir_type, startTime ORDER BY t2.start_time asc, t1.dir_type </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> <?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> <!-- 方向级查询,条件:路口id、时间、方向 --> <select id="selectByCrossIdAndStartEndDir" resultType="net.wanji.databus.vo.CrossDirDataHistVO"> SELECT t1.cross_id AS crossId, t1.dir_type as dirType, <choose> <!-- 小时 --> <when test="granularity==1"> DATE_FORMAT(t2.start_time, '%Y-%m-%d %H:00:00') AS startTime, </when> <!-- 分钟 --> <otherwise> DATE_FORMAT( CONCAT( DATE ( t2.start_time ), ' ', HOUR ( t2.start_time ), ':', FLOOR( MINUTE ( t2.start_time ) / #{granularity} ) * #{granularity} ), '%Y-%m-%d %H:%i:00' ) AS startTime, </otherwise> </choose> SUM( t2.flow ) AS flow, COALESCE ( sum( t2.traffic_flow_C ), 0 ) AS trafficFlowC, COALESCE ( sum( t2.traffic_flow_B ), 0 ) AS trafficFlowB, COALESCE ( sum( t2.traffic_flow_A ), 0 ) AS trafficFlowA, avg( t2.speed ) AS speed, MAX( t2.queue_length ) AS queueLength, AVG( t2.stop_times ) AS stopTimes, AVG( t2.time_occupancy) as timeOccupancy, AVG( t2.sturation) as sturation, AVG( t2.no_stop_rate) as noStopRate, AVG( t2.one_stop_rate) as oneStopRate, AVG( t2.two_stop_rate) as twoStopRate, AVG( t2.three_stop_rate) as threeStopRate, AVG( t2.non_motor_flow) as nonMotorFlow FROM t_base_cross_dir_info t1 LEFT JOIN t_cross_dir_data_hist t2 ON t1.cross_id = t2.cross_id WHERE 1=1 <if test="crossId != null"> AND t1.cross_id = #{crossId} </if> <if test="dirTypeList != null"> AND t1.dir_type IN <foreach item="dirType" index="index" collection="dirTypeList" open="(" separator="," close=")"> #{dirType} </foreach> </if> and t2.start_time <![CDATA[ >= ]]> #{startStamp} and t2.start_time <![CDATA[ <= ]]> #{endStamp} GROUP BY t1.cross_id, t1.dir_type, startTime ORDER BY t2.start_time asc, t1.dir_type </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 \ No newline at end of file
......
...@@ -177,8 +177,8 @@ ...@@ -177,8 +177,8 @@
#{id} #{id}
</foreach> </foreach>
</if> </if>
and t1.batch_time <![CDATA[ >= ]]> #{startStamp} and t1.start_time <![CDATA[ >= ]]> #{startStamp}
and t1.batch_time <![CDATA[ <= ]]> #{endStamp} and t1.start_time <![CDATA[ <= ]]> #{endStamp}
GROUP BY GROUP BY
t2.dir, t2.dir,
t2.turn, t2.turn,
......
...@@ -136,8 +136,8 @@ ...@@ -136,8 +136,8 @@
#{turnType} #{turnType}
</foreach> </foreach>
</if> </if>
and t2.batch_time <![CDATA[ >= ]]> #{startStamp} and t2.start_time <![CDATA[ >= ]]> #{startStamp}
and t2.batch_time <![CDATA[ <= ]]> #{endStamp} and t2.start_time <![CDATA[ <= ]]> #{endStamp}
GROUP BY GROUP BY
t1.cross_id, t1.cross_id,
t1.in_dir, t1.in_dir,
......
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