diff --git a/zc-business/src/main/java/com/zc/business/controller/DCPerceivedEventsWarningController.java b/zc-business/src/main/java/com/zc/business/controller/DCPerceivedEventsWarningController.java index 5ee0a3a3..cd2b47a6 100644 --- a/zc-business/src/main/java/com/zc/business/controller/DCPerceivedEventsWarningController.java +++ b/zc-business/src/main/java/com/zc/business/controller/DCPerceivedEventsWarningController.java @@ -66,6 +66,12 @@ public class DCPerceivedEventsWarningController extends BaseController { public AjaxResult getWarningList(@RequestBody DcWarning dcWarning){ return AjaxResult.success(perceivedEventsWarningService.selectWarningList(dcWarning)); } + //首页感知事件列表分页 + @PostMapping("/warningListPage") + public TableDataInfo getWarningListPage(@RequestBody DcWarning dcWarning){ + startPage(); + return getDataTable(perceivedEventsWarningService.selectWarningList(dcWarning)); + } //查询感知数量按照路段数量进行排名 @PostMapping("/sectionPerceivedList") public AjaxResult getSectionPerceivedEventsList(){ diff --git a/zc-business/src/main/resources/mapper/business/DcMeteorologicalDetectorDataMapper.xml b/zc-business/src/main/resources/mapper/business/DcMeteorologicalDetectorDataMapper.xml index 0e92a0e2..7250028c 100644 --- a/zc-business/src/main/resources/mapper/business/DcMeteorologicalDetectorDataMapper.xml +++ b/zc-business/src/main/resources/mapper/business/DcMeteorologicalDetectorDataMapper.xml @@ -194,17 +194,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ORDER BY d.stake_mark ASC; - + SELECT + d.iot_device_id, + d.stake_mark, + d.direction, + d.device_name, + d.device_state, + d.stake_mark_range, + m.create_time, + m.rainfall, + m.visibility_type, + m.visibility, + m.atmospheric_pressure, + m.temperature, + m.humidity, + m.wind_direction, + m.wind_speed, + m.precipitation_type, + m.wet_slippery_coefficient, + m.remote_road_surface_temperature, + m.remote_road_surface_status, + m.water_film_ice_snow_value + FROM + dc_meteorological_detector_data AS m + LEFT JOIN + dc_device AS d ON d.iot_device_id = m.iot_device_id + + m.visibility_type != 4 + AND m.visibility_type = #{visibilityType} + AND DATE(m.create_time) = CURDATE() + \ No newline at end of file