From 7d49eb8ccb878d2bc5ebd1b9f28946736e99ada4 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:03:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B0=94=E8=B1=A1=E6=A3=80=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=20=E6=9F=A5=E8=AF=A2=E5=BD=93=E5=A4=A9=E6=9C=80=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/DcMeteorologicalDetectorData.java  |  5 ++-
 ...MeteorologicalDetectorDataServiceImpl.java |  1 +
 .../DcMeteorologicalDetectorDataMapper.xml    | 40 ++++++++++++++-----
 3 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/zc-business/src/main/java/com/zc/business/domain/DcMeteorologicalDetectorData.java b/zc-business/src/main/java/com/zc/business/domain/DcMeteorologicalDetectorData.java
index e607f38b..2910e341 100644
--- a/zc-business/src/main/java/com/zc/business/domain/DcMeteorologicalDetectorData.java
+++ b/zc-business/src/main/java/com/zc/business/domain/DcMeteorologicalDetectorData.java
@@ -1,5 +1,6 @@
 package com.zc.business.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -117,7 +118,9 @@ public class DcMeteorologicalDetectorData extends BaseEntity
 
     @Excel(name = "方向")
     private String direction;
-
+    @ApiModelProperty("状态")
+    @TableField(exist = false)
+    private String deviceState;
 // "rainfall": 0,
 //    "visibility": "05.000",
 //    "remoteRoadSurfaceTemperature": 11.5,
diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcMeteorologicalDetectorDataServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcMeteorologicalDetectorDataServiceImpl.java
index f63b7667..dd5d6468 100644
--- a/zc-business/src/main/java/com/zc/business/service/impl/DcMeteorologicalDetectorDataServiceImpl.java
+++ b/zc-business/src/main/java/com/zc/business/service/impl/DcMeteorologicalDetectorDataServiceImpl.java
@@ -27,6 +27,7 @@ public class DcMeteorologicalDetectorDataServiceImpl implements IDcMeteorologica
     @Autowired
     private DcMeteorologicalDetectorDataMapper dcMeteorologicalDetectorDataMapper;
 
+
     /**
      * 查询气象检测器数据
      *
diff --git a/zc-business/src/main/resources/mapper/business/DcMeteorologicalDetectorDataMapper.xml b/zc-business/src/main/resources/mapper/business/DcMeteorologicalDetectorDataMapper.xml
index 7a5a75f3..38a3de69 100644
--- a/zc-business/src/main/resources/mapper/business/DcMeteorologicalDetectorDataMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcMeteorologicalDetectorDataMapper.xml
@@ -24,6 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deviceName"    column="device_name"    />
         <result property="stakeMark"    column="stake_mark"    />
         <result property="direction"    column="direction"    />
+        <result property="deviceState"    column="device_state"    />
     </resultMap>
     <resultMap type="map" id="countMap">
         <result property="timeSlot"    column="time_slot"    />
@@ -172,16 +173,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectlistAll" parameterType="com.zc.business.domain.DcMeteorologicalDetectorData" resultMap="DcMeteorologicalDetectorDataResult">
-        SELECT mdd1.id,mdd1.iot_device_id,mdd1.rainfall,mdd1.visibility_type,mdd1. visibility,mdd1.atmospheric_pressure,
-               mdd1. temperature,mdd1. humidity,mdd1.wind_direction, mdd1. wind_speed, mdd1. precipitation_type, mdd1.wet_slippery_coefficient,
-               mdd1.remote_road_surface_temperature, mdd1. remote_road_surface_status, mdd1. water_film_ice_snow_value,mdd1.create_time,
-               mdd1.stake_mark,mdd1.device_name,mdd1.direction
-        FROM dc_meteorological_detector_data mdd1
-                 JOIN (
-            SELECT device_name, MAX(create_time) AS max_create_time
-            FROM dc_meteorological_detector_data
-            GROUP BY device_name
-        ) mdd2
-                      ON mdd1.device_name = mdd2.device_name AND mdd1.create_time = mdd2.max_create_time;
+        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
+        FROM
+            dc_device d
+                LEFT JOIN
+            LatestData ld ON
+                d.iot_device_id = ld.iot_device_id
+        WHERE
+            d.device_type = 3;
+
     </select>
 </mapper>
\ No newline at end of file