diff --git a/zc-business/src/main/java/com/zc/business/controller/DcTrafficIncidentsController.java b/zc-business/src/main/java/com/zc/business/controller/DcTrafficIncidentsController.java index a2385c06..b4c79c17 100644 --- a/zc-business/src/main/java/com/zc/business/controller/DcTrafficIncidentsController.java +++ b/zc-business/src/main/java/com/zc/business/controller/DcTrafficIncidentsController.java @@ -5,9 +5,11 @@ import com.zc.business.service.IDcTrafficIncidentsService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; +import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.Date; import java.util.Map; /** @@ -127,14 +129,18 @@ public class DcTrafficIncidentsController { * * @author liuwenge * @date 2024/1/15 15:38 - * @param + * @param direction 方向 + * @param direction 类型(1:日, 2:月, 3:季度, 4-年) + * @param direction 时间 * @return com.ruoyi.common.core.domain.AjaxResult */ @ApiOperation("事故车型分析") // @GetMapping("/getAccidentVehicleAnalysis") @PostMapping("/selectAccidentVehicleAnalysis") - public AjaxResult getAccidentVehicleAnalysis(@RequestBody Map params){ - return trafficIncidentsService.getAccidentVehicleAnalysis(params); + public AjaxResult getAccidentVehicleAnalysis(@ApiParam(value="方向", name="direction", required=true) @RequestParam ("direction") String direction, + @ApiParam(value="类型(1:日, 2:月, 3:季度, 4-年)", name="type", required=true) @RequestParam ("type") String type, + @ApiParam(value="时间", name="startTime", required=true) @RequestParam ("startTime") String startTime){ + return trafficIncidentsService.getAccidentVehicleAnalysis(direction,type,startTime); } /** @@ -142,13 +148,17 @@ public class DcTrafficIncidentsController { * * @author liuwenge * @date 2024/1/15 17:31 - * @param params + * @param controlType 类型(1:封闭,2:限行) + * @param startTime 开始时间 + * @param endTime 结束时间 * @return com.ruoyi.common.core.domain.AjaxResult */ @ApiOperation("收费站统计分析table") @PostMapping("/selectTollStationAnalysis") - public AjaxResult selectTollStationAnalysis(@RequestBody Map params){ - return trafficIncidentsService.selectTollStationAnalysis(params); + public AjaxResult selectTollStationAnalysis(@ApiParam(value="类型(1:封闭,2:限行)", name="controlType", required=true) @RequestParam ("controlType") String controlType, + @ApiParam(value="开始时间", name="startTime", required=true) @RequestParam ("startTime") String startTime, + @ApiParam(value="结束时间", name="endTime", required=true) @RequestParam ("endTime") String endTime){ + return trafficIncidentsService.selectTollStationAnalysis(controlType,startTime,endTime); } /** @@ -170,13 +180,17 @@ public class DcTrafficIncidentsController { * * @author liuwenge * @date 2024/1/16 15:52 - * @param params + * @param direction 方向 + * @param direction 类型(1:日, 2:月, 3:季度, 4-年) + * @param direction 时间 * @return com.ruoyi.common.core.domain.AjaxResult */ @ApiOperation("事故多发路段分析") @PostMapping("/selectRoadSectionAnalysis") - public AjaxResult selectRoadSectionAnalysis(@RequestBody Map params){ - return trafficIncidentsService.selectRoadSectionAnalysis(params); + public AjaxResult selectRoadSectionAnalysis(@ApiParam(value="方向", name="direction", required=true) @RequestParam ("direction") String direction, + @ApiParam(value="类型(1:日, 2:月, 3:季度, 4-年)", name="type", required=true) @RequestParam ("type") String type, + @ApiParam(value="时间", name="startTime", required=true) @RequestParam ("startTime") String startTime){ + return trafficIncidentsService.selectRoadSectionAnalysis(direction,type,startTime); } /** @@ -184,12 +198,16 @@ public class DcTrafficIncidentsController { * * @author liuwenge * @date 2024/1/16 15:52 - * @param params + * @param direction 方向 + * @param direction 类型(1:日, 2:月, 3:季度, 4-年) + * @param direction 时间 * @return com.ruoyi.common.core.domain.AjaxResult */ @ApiOperation("事故类型分析") @PostMapping("/selectEventTypeAnalysis") - public AjaxResult selectEventTypeAnalysis(@RequestBody Map params){ - return trafficIncidentsService.selectEventTypeAnalysis(params); + public AjaxResult selectEventTypeAnalysis(@ApiParam(value="方向", name="direction", required=true) @RequestParam ("direction") String direction, + @ApiParam(value="类型(1:日, 2:月, 3:季度, 4-年)", name="type", required=true) @RequestParam ("type") String type, + @ApiParam(value="时间", name="startTime", required=true) @RequestParam ("startTime") String startTime){ + return trafficIncidentsService.selectEventTypeAnalysis(direction,type,startTime); } } diff --git a/zc-business/src/main/java/com/zc/business/mapper/DcTrafficIncidentsMapper.java b/zc-business/src/main/java/com/zc/business/mapper/DcTrafficIncidentsMapper.java index bff8b7ad..601d1176 100644 --- a/zc-business/src/main/java/com/zc/business/mapper/DcTrafficIncidentsMapper.java +++ b/zc-business/src/main/java/com/zc/business/mapper/DcTrafficIncidentsMapper.java @@ -2,6 +2,7 @@ package com.zc.business.mapper; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; import java.util.Map; @@ -168,20 +169,24 @@ public interface DcTrafficIncidentsMapper { * * @author liuwenge * @date 2024/1/15 15:41 - * @param + * @param direction 方向 + * @param type 类型 + * @param startTime 日期 * @return java.util.List> */ - List> getAccidentVehicleAnalysis(Map params); + List> getAccidentVehicleAnalysis(@Param("direction") String direction,@Param("type") String type,@Param("startTime") String startTime); /** * @Description 收费站统计分析table * * @author liuwenge * @date 2024/1/16 14:18 - * @param params + * @param controlType 类型(1:封闭,2:限行) + * @param startTime 开始时间 + * @param endTime 结束时间 * @return java.util.List> */ - List> selectTollStationAnalysis(Map params); + List> selectTollStationAnalysis(@Param("controlType") String controlType,@Param("startTime") String startTime,@Param("endTime") String endTime); /** * @Description 收费站统计分析echarts @@ -198,19 +203,23 @@ public interface DcTrafficIncidentsMapper { * * @author liuwenge * @date 2024/1/17 14:18 - * @param params + * @param direction 方向 + * @param type 类型 + * @param startTime 日期 * @return java.util.List> */ - List> selectRoadSectionAnalysis(Map params); + List> selectRoadSectionAnalysis(@Param("direction") String direction,@Param("type") String type,@Param("startTime") String startTime); /** * @Description 事故类型分析 * * @author liuwenge * @date 2024/1/17 14:18 - * @param params + * @param direction 方向 + * @param type 类型 + * @param startTime 日期 * @return java.util.List> */ - List> selectEventTypeAnalysis(Map params); + List> selectEventTypeAnalysis(@Param("direction") String direction,@Param("type") String type,@Param("startTime") String startTime); } diff --git a/zc-business/src/main/java/com/zc/business/service/IDcTrafficIncidentsService.java b/zc-business/src/main/java/com/zc/business/service/IDcTrafficIncidentsService.java index 3c781c6e..5ecc0e52 100644 --- a/zc-business/src/main/java/com/zc/business/service/IDcTrafficIncidentsService.java +++ b/zc-business/src/main/java/com/zc/business/service/IDcTrafficIncidentsService.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; +import java.util.Date; import java.util.Map; /** @@ -79,22 +80,26 @@ public interface IDcTrafficIncidentsService { AjaxResult getEventTrend(); /** - * @param * @return com.ruoyi.common.core.domain.AjaxResult * @Description 路网管控-事件管控分析-事故车型分析 * @author liuwenge + * @param direction 方向 + * @param type 类型 + * @param startTime 日期 * @date 2024/1/15 15:38 */ - AjaxResult getAccidentVehicleAnalysis(Map params); + AjaxResult getAccidentVehicleAnalysis(String direction, String type, String startTime); /** - * @param params * @return com.ruoyi.common.core.domain.AjaxResult * @Description 路网管控-事件管控分析-收费站统计分析table * @author liuwenge + * @param controlType 类型(1:封闭,2:限行) + * @param startTime 开始时间 + * @param endTime 结束时间 * @date 2024/1/15 17:31 */ - AjaxResult selectTollStationAnalysis(Map params); + AjaxResult selectTollStationAnalysis(String controlType,String startTime,String endTime); /** * @Description 路网管控-事件管控分析-收费站统计分析echarts(当月) @@ -111,18 +116,23 @@ public interface IDcTrafficIncidentsService { * * @author liuwenge * @date 2024/1/16 15:52 - * @param params + * @param direction 方向 + * @param type 类型 + * @param startTime 日期 * @return com.ruoyi.common.core.domain.AjaxResult */ - AjaxResult selectRoadSectionAnalysis(Map params); + AjaxResult selectRoadSectionAnalysis(String direction, String type, String startTime); /** * @Description 路网管控-事件管控分析-事故类型分析 * * @author liuwenge * @date 2024/1/16 15:52 - * @param params + * @param direction 方向 + * @param type 类型 + * @param startTime 日期 * @return com.ruoyi.common.core.domain.AjaxResult */ - AjaxResult selectEventTypeAnalysis(Map params); +// AjaxResult selectEventTypeAnalysis(Map params); + AjaxResult selectEventTypeAnalysis(String direction, String type, String startTime); } diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcTrafficIncidentsServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcTrafficIncidentsServiceImpl.java index 9590f334..4a2a12bd 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcTrafficIncidentsServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcTrafficIncidentsServiceImpl.java @@ -201,13 +201,15 @@ public class DcTrafficIncidentsServiceImpl implements IDcTrafficIncidentsService * * @author liuwenge * @date 2024/1/15 15:38 - * @param + * @param direction 方向 + * @param type 类型 + * @param startTime 日期 * @return com.ruoyi.common.core.domain.AjaxResult */ @Override - public AjaxResult getAccidentVehicleAnalysis(Map params){ + public AjaxResult getAccidentVehicleAnalysis(String direction,String type,String startTime){ - List> list = trafficIncidentsMapper.getAccidentVehicleAnalysis(params); + List> list = trafficIncidentsMapper.getAccidentVehicleAnalysis(direction,type,startTime); Map smallCar = new HashMap<>(); smallCar.put("type","smallCar"); @@ -287,16 +289,18 @@ public class DcTrafficIncidentsServiceImpl implements IDcTrafficIncidentsService /** * @Description 路网管控-事件管控分析-收费站统计分析table - * @param params * @return com.ruoyi.common.core.domain.AjaxResult * @author liuwenge + * @param controlType 类型(1:封闭,2:限行) + * @param startTime 开始时间 + * @param endTime 结束时间 * @date 2024/1/15 17:31 */ @Override - public AjaxResult selectTollStationAnalysis(Map params){ + public AjaxResult selectTollStationAnalysis(String controlType,String startTime,String endTime){ //目标时段 - List> list = trafficIncidentsMapper.selectTollStationAnalysis(params); + List> list = trafficIncidentsMapper.selectTollStationAnalysis(controlType,startTime,endTime); BigDecimal allNum = BigDecimal.ZERO; BigDecimal allTime = BigDecimal.ZERO; for (Map data : list) { @@ -326,20 +330,17 @@ public class DcTrafficIncidentsServiceImpl implements IDcTrafficIncidentsService SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Calendar cal = Calendar.getInstance(); - Date startDate = dateFormat.parse(params.get("startTime").toString()); + Date startDate = dateFormat.parse(startTime); cal.setTime(startDate); cal.add(Calendar.YEAR,-1); String lastStartTime = dateFormat.format(cal.getTime()); - Date endDate = dateFormat.parse(params.get("endTime").toString()); + Date endDate = dateFormat.parse(endTime); cal.setTime(endDate); cal.add(Calendar.YEAR,-1); String lastEndTime = dateFormat.format(cal.getTime()); - params.put("startTime",lastStartTime); - params.put("endTime",lastEndTime); - - List> lastList = trafficIncidentsMapper.selectTollStationAnalysis(params); + List> lastList = trafficIncidentsMapper.selectTollStationAnalysis(controlType,lastStartTime,lastEndTime); BigDecimal lastAllNum = BigDecimal.ZERO; BigDecimal lastAllTime = BigDecimal.ZERO; @@ -416,13 +417,15 @@ public class DcTrafficIncidentsServiceImpl implements IDcTrafficIncidentsService * * @author liuwenge * @date 2024/1/16 15:52 - * @param params + * @param direction 方向 + * @param type 类型 + * @param startTime 日期 * @return com.ruoyi.common.core.domain.AjaxResult */ @Override - public AjaxResult selectRoadSectionAnalysis(Map params){ + public AjaxResult selectRoadSectionAnalysis(String direction,String type,String startTime){ - List> list = trafficIncidentsMapper.selectRoadSectionAnalysis(params); + List> list = trafficIncidentsMapper.selectRoadSectionAnalysis(direction,type,startTime); return AjaxResult.success(list); } @@ -431,13 +434,15 @@ public class DcTrafficIncidentsServiceImpl implements IDcTrafficIncidentsService * * @author liuwenge * @date 2024/1/16 15:52 - * @param params + * @param direction 方向 + * @param type 类型 + * @param startTime 时间 * @return com.ruoyi.common.core.domain.AjaxResult */ @Override - public AjaxResult selectEventTypeAnalysis(Map params){ + public AjaxResult selectEventTypeAnalysis(String direction, String type, String startTime){ - List> list = trafficIncidentsMapper.selectEventTypeAnalysis(params); + List> list = trafficIncidentsMapper.selectEventTypeAnalysis(direction,type,startTime); return AjaxResult.success(list); } }