From ab4c8c4de260860c0e3c8c1bf77baba857c836eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E7=90=B3?= <1911390090@qq.com>
Date: Sat, 20 Apr 2024 17:30:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B0=94=E8=B1=A1=E8=AE=BE=E5=A4=87=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/zc-business/src/main/resources/mapper/business/DcMeteorologicalDetectorDataMapper.xml b/zc-business/src/main/resources/mapper/business/DcMeteorologicalDetectorDataMapper.xml
index df208d4b..abc7f38b 100644
--- a/zc-business/src/main/resources/mapper/business/DcMeteorologicalDetectorDataMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcMeteorologicalDetectorDataMapper.xml
@@ -170,38 +170,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectlistAll" parameterType="com.zc.business.domain.DcMeteorologicalDetectorData" resultMap="DcMeteorologicalDetectorDataResult">
         SELECT
-            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
+            d.iot_device_id, d.stake_mark, d.direction, d.device_name, d.device_state,
+            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_device d
                 LEFT JOIN
-            dc_meteorological_detector_data lm
+            dc_meteorological_detector_data m
             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
+                d.iot_device_id = m.iot_device_id
+                    AND m.create_time = (
+                    SELECT MAX(create_time)
+                    FROM dc_meteorological_detector_data m2
+                    WHERE m2.iot_device_id = d.iot_device_id
                 )
         WHERE
-            d.device_type = 3;
-
+            d.device_type = 3
+        ORDER BY d.stake_mark ASC;
     </select>
 </mapper>
\ No newline at end of file