diff --git a/zc-business/src/main/java/com/zc/business/controller/DcTrafficStatisticsController.java b/zc-business/src/main/java/com/zc/business/controller/DcTrafficStatisticsController.java index 5c68fba6..2aad94fd 100644 --- a/zc-business/src/main/java/com/zc/business/controller/DcTrafficStatisticsController.java +++ b/zc-business/src/main/java/com/zc/business/controller/DcTrafficStatisticsController.java @@ -259,9 +259,9 @@ public class DcTrafficStatisticsController extends BaseController { */ @ApiOperation("交通流统计") @GetMapping("/history/trafficFlowStatistics") - public TableDataInfo trafficFlowStatistics(String startDate, String endDate, String direction, String periodType) { + public TableDataInfo trafficFlowStatistics(String startDate, String endDate, String direction, String periodType, String facilityName) { startPage(); - List> mapList = dcGantryStatisticsDataService.trafficFlowStatistics(startDate, endDate, direction, periodType); + List> mapList = dcGantryStatisticsDataService.trafficFlowStatistics(startDate, endDate, direction, periodType,facilityName); // 将查询结果封装为成功响应并返回 return getDataTable(mapList); } diff --git a/zc-business/src/main/java/com/zc/business/mapper/DcGantryStatisticsDataMapper.java b/zc-business/src/main/java/com/zc/business/mapper/DcGantryStatisticsDataMapper.java index 9395dee0..a30899dc 100644 --- a/zc-business/src/main/java/com/zc/business/mapper/DcGantryStatisticsDataMapper.java +++ b/zc-business/src/main/java/com/zc/business/mapper/DcGantryStatisticsDataMapper.java @@ -57,7 +57,7 @@ public interface DcGantryStatisticsDataMapper extends BaseMapper> trafficFlowStatistics(@Param("startDate")String startDate, @Param("endDate")String endDate, @Param("direction")String direction, @Param("periodType")String periodType); + List> trafficFlowStatistics(@Param("startDate")String startDate, @Param("endDate")String endDate, @Param("direction")String direction, @Param("periodType")String periodType, @Param("facilityName")String facilityName); //桩号升序排列 List trafficFlowStatisticsAsc(@Param("startDate")String startDate, @Param("endDate")String endDate, @Param("direction")String direction, @Param("periodType")String periodType); diff --git a/zc-business/src/main/java/com/zc/business/service/IDcGantryStatisticsDataService.java b/zc-business/src/main/java/com/zc/business/service/IDcGantryStatisticsDataService.java index 35db947e..a1cec95f 100644 --- a/zc-business/src/main/java/com/zc/business/service/IDcGantryStatisticsDataService.java +++ b/zc-business/src/main/java/com/zc/business/service/IDcGantryStatisticsDataService.java @@ -54,7 +54,7 @@ public interface IDcGantryStatisticsDataService extends IService> trafficPeriodAnalysis(String startDate, String direction, String periodType); - List> trafficFlowStatistics(String startDate, String endDate, String direction, String periodType); + List> trafficFlowStatistics(String startDate, String endDate, String direction, String periodType,String facilityName); //桩号升序排列 List trafficFlowStatisticsAsc(String startDate, String endDate, String direction, String periodType); diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcGantryStatisticsDataImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcGantryStatisticsDataImpl.java index 2c9fe878..56e3e400 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcGantryStatisticsDataImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcGantryStatisticsDataImpl.java @@ -214,12 +214,12 @@ public class DcGantryStatisticsDataImpl extends ServiceImpl> realTimeTrafficFlow(String startDate, String direction, String periodType ) { List> mapList = dcGantryStatisticsDataMapper.realTimeTrafficFlow(startDate, direction, periodType); - +/* // 过滤孝里虚-平阴北虚 和 平阴北虚-孝里虚的数据 List> filteredList = mapList.stream() .filter(map -> !"孝里虚-平阴北虚".equals(map.get("name")) && !"平阴北虚-孝里虚".equals(map.get("name"))) - .collect(Collectors.toList()); - return filteredList; + .collect(Collectors.toList());*/ + return mapList; } /** * 车流量时段分析 @@ -233,9 +233,9 @@ public class DcGantryStatisticsDataImpl extends ServiceImpl> trafficFlowStatistics(String startDate, String endDate, String direction, String periodType) { + public List> trafficFlowStatistics(String startDate, String endDate, String direction, String periodType,String facilityName) { - return dcGantryStatisticsDataMapper.trafficFlowStatistics(startDate,endDate,direction,periodType); + return dcGantryStatisticsDataMapper.trafficFlowStatistics(startDate,endDate,direction,periodType,facilityName); } //桩号升序排列 @Override @@ -247,12 +247,12 @@ public class DcGantryStatisticsDataImpl extends ServiceImpl> sectionTrafficRanking(String startDate, String direction, String periodType) { List> mapList = dcGantryStatisticsDataMapper.sectionTrafficRanking(startDate, direction, periodType); - +/* // 孝里虚-平阴北虚 或 平阴北虚-孝里虚的数据 List> filteredList = mapList.stream() .filter(map ->! "孝里虚-平阴北虚".equals(map.get("facilityName")) && !"平阴北虚-孝里虚".equals(map.get("facilityName"))) - .collect(Collectors.toList()); - return filteredList; + .collect(Collectors.toList());*/ + return mapList; } public List> aggregateTrafficVolume(List> dataList) { diff --git a/zc-business/src/main/resources/mapper/business/DcGantryStatisticsDataMapper.xml b/zc-business/src/main/resources/mapper/business/DcGantryStatisticsDataMapper.xml index ecba750a..33ed518a 100644 --- a/zc-business/src/main/resources/mapper/business/DcGantryStatisticsDataMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcGantryStatisticsDataMapper.xml @@ -27,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -280,15 +281,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"