From 84ed19eb28c37ff281cef8b4b60fcdbc85ee066b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E7=90=B3?= <1911390090@qq.com>
Date: Fri, 26 Apr 2024 09:59:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E6=84=9F=E7=9F=A5?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=20=E9=A6=96=E9=A1=B5=20=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DCPerceivedEventsWarningController.java   |  6 +++
 .../DcMeteorologicalDetectorDataMapper.xml    | 43 +++++++++++++------
 2 files changed, 37 insertions(+), 12 deletions(-)

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..a4378b46 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 AjaxResult getWarningListPage(@RequestBody DcWarning dcWarning){
+        startPage();
+        return  AjaxResult.success(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..58f68be5 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>
 
-    <select id="selectlistVisibility"  parameterType="com.zc.business.domain.DcMeteorologicalDetectorData" resultMap="DcMeteorologicalDetectorDataResult">
-        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
-        WHERE m.visibility_type !=4
+    <select id="selectlistVisibility" parameterType="com.zc.business.domain.DcMeteorologicalDetectorData" resultMap="DcMeteorologicalDetectorDataResult">
+        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
+        <where>
+            m.visibility_type != '4'
+            <if test="visibilityType != null and visibilityType != ''">AND m.visibility_type = #{visibilityType}</if>
+            AND DATE(m.create_time) = CURDATE()
+        </where>
     </select>
 </mapper>
\ No newline at end of file