From 82fc1b0f9d35d7e4510f8af1d27a376bd33b70cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E7=90=B3?= <1911390090@qq.com>
Date: Thu, 28 Mar 2024 15:56:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B0=94=E8=B1=A1=E6=A3=80=E8=AE=BE=E5=A4=87ma?=
 =?UTF-8?q?p?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DcMeteorologicalDetectorDataMapper.xml    | 48 +++++++++++--------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/zc-business/src/main/resources/mapper/business/DcMeteorologicalDetectorDataMapper.xml b/zc-business/src/main/resources/mapper/business/DcMeteorologicalDetectorDataMapper.xml
index 38a3de69..5a30cf63 100644
--- a/zc-business/src/main/resources/mapper/business/DcMeteorologicalDetectorDataMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcMeteorologicalDetectorDataMapper.xml
@@ -173,31 +173,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectlistAll" parameterType="com.zc.business.domain.DcMeteorologicalDetectorData" resultMap="DcMeteorologicalDetectorDataResult">
-        WITH LatestData AS (
-            SELECT
-                m.*
-            FROM
-                dc_meteorological_detector_data m
-            WHERE
-                m.create_time = (
-                    SELECT MAX(m2.create_time)
-                    FROM dc_meteorological_detector_data m2
-                    WHERE m.iot_device_id = m2.iot_device_id
-                )
-        )
         SELECT
-            d.iot_device_id, d.stake_mark, d.direction, d.device_name, d.device_state,
-            ld.create_time AS latest_create_time,
-            ld.rainfall, ld.visibility_type, ld.visibility, ld.atmospheric_pressure,
-            ld.temperature, ld.humidity, ld.wind_direction, ld.wind_speed,
-            ld.precipitation_type, ld.wet_slippery_coefficient,
-            ld.remote_road_surface_temperature, ld.remote_road_surface_status,
-            ld.water_film_ice_snow_value
+            d.iot_device_id,
+            d.stake_mark,
+            d.direction,
+            d.device_name,
+            d.device_state,
+            lm.create_time AS latest_create_time,
+            lm.rainfall,
+            lm.visibility_type,
+            lm.visibility,
+            lm.atmospheric_pressure,
+            lm.temperature,
+            lm.humidity,
+            lm.wind_direction,
+            lm.wind_speed,
+            lm.precipitation_type,
+            lm.wet_slippery_coefficient,
+            lm.remote_road_surface_temperature,
+            lm.remote_road_surface_status,
+            lm.water_film_ice_snow_value
         FROM
             dc_device d
                 LEFT JOIN
-            LatestData ld ON
-                d.iot_device_id = ld.iot_device_id
+            dc_meteorological_detector_data lm
+            ON
+                d.iot_device_id = lm.iot_device_id
+                    AND lm.id IN (
+                    SELECT MAX(id)
+                    FROM dc_meteorological_detector_data
+                    WHERE iot_device_id = d.iot_device_id
+                )
         WHERE
             d.device_type = 3;