Skip to content

T
traffic-signal-platform
Commit 6522a857 authored by duwei's avatar duwei
Browse files
Options

按开始时间查询

parent 8634f16b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 19 deletions
signal-optimize-service/src/main/java/net/wanji/opt/service/impl/TrendServiceImpl.java
View file @ 6522a857
......@@ -2638,6 +2638,9 @@ public class TrendServiceImpl implements TrendService {
String crossId = lanePeriodVO.getCrossId();
int start = (int) (lanePeriodVO.getStart().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();
List<String> idsList = null;
if (!StringUtils.isBlank(ids)) {
......@@ -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);
} catch (Exception e) {
log.error("车道数据查询异常：", e);
......@@ -2675,6 +2678,8 @@ public class TrendServiceImpl implements TrendService {
String crossId = turnVO.getCrossId();
int start = (int) (turnVO.getStart().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();
List<String> turnTypeList = null;
......@@ -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);
} catch (Exception e) {
log.error("全是周期车道数据方向转向查询异常：", e);
......@@ -2726,6 +2731,8 @@ public class TrendServiceImpl implements TrendService {
String crossId = directionVO.getCrossId();
int start = (int) (directionVO.getStart().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();
List<Integer> dirTypeList = null;
......@@ -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);
} catch (Exception e) {
log.error("全是周期数据方向级查询异常：", e);
......@@ -2762,6 +2769,8 @@ public class TrendServiceImpl implements TrendService {
String crossId = crossingVO.getCrossId();
int start = (int) (crossingVO.getStart().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:一小时】
String granularity = crossingVO.getGranularity();
if (StringUtils.isBlank(granularity)) {
......@@ -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);
} catch (Exception e) {
log.error("路口周期数据方向级查询异常：", e);
......@@ -2945,6 +2954,8 @@ public class TrendServiceImpl implements TrendService {
int end = (int) (lanePeriodVO.getEnd().getTime() / 1000);
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 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();
List<String> idsList = null;
if (!StringUtils.isBlank(ids)) {
......@@ -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);
// 判断是否需要导出全部字段
......@@ -3092,6 +3103,8 @@ public class TrendServiceImpl implements TrendService {
int end = (int) (turnVO.getEnd().getTime() / 1000);
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 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();
List<String> turnTypeList = null;
......@@ -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);
// 判断是否需要导出全部字段
......@@ -3154,6 +3167,8 @@ public class TrendServiceImpl implements TrendService {
int end = (int) (directionVO.getEnd().getTime() / 1000);
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 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();
List<Integer> dirTypeList = null;
......@@ -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);
// 判断是否需要导出全部字段
......@@ -3207,6 +3222,8 @@ public class TrendServiceImpl implements TrendService {
int end = (int) (crossingVO.getEnd().getTime() / 1000);
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 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:一小时】
String granularity = crossingVO.getGranularity();
if (StringUtils.isBlank(granularity)) {
......@@ -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);
// 判断是否需要导出全部字段
......
wj-databus/src/main/java/net/wanji/databus/dao/mapper/CrossDataHistMapper.java
View file @ 6522a857
......@@ -34,7 +34,7 @@ public interface CrossDataHistMapper extends BaseMapper<CrossDataHistPO> {
*/
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);
......
wj-databus/src/main/java/net/wanji/databus/dao/mapper/CrossDirDataHistMapper.java
View file @ 6522a857
......@@ -49,7 +49,7 @@ public interface CrossDirDataHistMapper extends BaseMapper<CrossDirDataHistPO> {
* @param granularity 时段
* @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);
......
wj-databus/src/main/java/net/wanji/databus/dao/mapper/CrossLaneDataHistMapper.java
View file @ 6522a857
......@@ -36,5 +36,5 @@ public interface CrossLaneDataHistMapper extends BaseMapper<CrossLaneDataHistPO>
* @param ids 车道id集合
* @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);
}
wj-databus/src/main/java/net/wanji/databus/dao/mapper/CrossTurnDataHistMapper.java
View file @ 6522a857
......@@ -34,7 +34,7 @@ public interface CrossTurnDataHistMapper extends BaseMapper<CrossTurnDataHistPO>
* @param inDir
* @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);
......
wj-databus/src/main/resources/mapper/CrossDataHistMapper.xml
View file @ 6522a857
......@@ -145,8 +145,8 @@
<if test="crossId != null">
AND t2.cross_id = #{crossId}
</if>
and t2.batch_time <![CDATA[ >= ]]> #{startStamp}
and t2.batch_time <![CDATA[ <= ]]> #{endStamp}
and t2.start_time <![CDATA[ >= ]]> #{startStamp}
and t2.start_time <![CDATA[ <= ]]> #{endStamp}
GROUP BY
t2.cross_id,
startTime
......
wj-databus/src/main/resources/mapper/CrossLaneDataHistMapper.xml
View file @ 6522a857
......@@ -177,8 +177,8 @@
#{id}
</foreach>
</if>
and t1.batch_time <![CDATA[ >= ]]> #{startStamp}
and t1.batch_time <![CDATA[ <= ]]> #{endStamp}
and t1.start_time <![CDATA[ >= ]]> #{startStamp}
and t1.start_time <![CDATA[ <= ]]> #{endStamp}
GROUP BY
t2.dir,
t2.turn,
......
wj-databus/src/main/resources/mapper/CrossTurnDataHistMapper.xml
View file @ 6522a857
......@@ -136,8 +136,8 @@
#{turnType}
</foreach>
</if>
and t2.batch_time <![CDATA[ >= ]]> #{startStamp}
and t2.batch_time <![CDATA[ <= ]]> #{endStamp}
and t2.start_time <![CDATA[ >= ]]> #{startStamp}
and t2.start_time <![CDATA[ <= ]]> #{endStamp}
GROUP BY
t1.cross_id,
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