From b52564dd905222265c026e3623233d2f49929243 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Thu, 16 Apr 2026 18:10:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E9=95=BF=E8=80=85=E7=AB=AF=E6=98=BE=E7=A4=BA=E6=B8=A9=E6=B9=BF?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../humid/mapper/HumidDeviceMapper.java       |  4 +++
 .../humid/mapper/xml/HumidDeviceMapper.xml    | 36 +++++++++++++++++++
 .../service/impl/HumidDeviceServiceImpl.java  |  9 ++---
 3 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/mapper/HumidDeviceMapper.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/mapper/HumidDeviceMapper.java
index 73c2094..126bfcc 100644
--- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/mapper/HumidDeviceMapper.java
+++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/mapper/HumidDeviceMapper.java
@@ -2,6 +2,10 @@ package com.nu.modules.yiweilian.humid.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.nu.modules.yiweilian.humid.entity.HumidDevice;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface HumidDeviceMapper extends BaseMapper<HumidDevice> {
+    List<HumidDevice> queryByNuIds(@Param("nuIds") String nuIds);
 }
diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/mapper/xml/HumidDeviceMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/mapper/xml/HumidDeviceMapper.xml
index be9a843..14d2b51 100644
--- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/mapper/xml/HumidDeviceMapper.xml
+++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/mapper/xml/HumidDeviceMapper.xml
@@ -2,4 +2,40 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.nu.modules.yiweilian.humid.mapper.HumidDeviceMapper">
 
+    <select id="queryByNuIds" parameterType="string" resultType="com.nu.modules.yiweilian.humid.entity.HumidDevice">
+        select
+            a.id,
+            a.sn,
+            b.device_name as deviceName,
+            b.device_type as deviceTypes,
+            a.reporting_interval as reportingInterval,
+            a.record_interval as recordInterval,
+            a.history_report_time as historyReportTime,
+            a.history_interval as historyInterval,
+            a.temperature_high as temperatureHigh,
+            a.temperature_low as temperatureLow,
+            a.temperature_buffer as temperatureBuffer,
+            a.humidity_high as humidityHigh,
+            a.humidity_low as humidityLow,
+            a.humidity_buffer as humidityBuffer,
+            a.iz_outages as izOutages,
+            a.iz_low_battery as izLowBattery,
+            a.iz_online as izOnline,
+            a.time_code as timeCode,
+            a.temperature,
+            a.humidity,
+            a.status,
+            a.reporting_time as reportingTime,
+            a.electricity,
+            b.nu_id as nuId
+        from nu_iot_yiweilian_humid_device a
+        inner join nu_iot_device_preview b on a.sn = b.sn
+        where b.device_status != '损坏'
+        and b.nu_id in
+              <foreach item="nuId" index="index" collection="nuIds.split(',')"
+                                open="(" separator="," close=")">
+                #{nuId}
+            </foreach>
+    </select>
+
 </mapper>
diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java
index fb47a88..878439f 100644
--- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java
+++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/yiweilian/humid/service/impl/HumidDeviceServiceImpl.java
@@ -20,10 +20,11 @@ public class HumidDeviceServiceImpl extends ServiceImpl<HumidDeviceMapper, Humid
 
     @Override
     public List<HumidDeviceEntity> queryByNuIds(String nuids) {
-        QueryWrapper<HumidDevice> qw = new QueryWrapper<>();
-        qw.in("nu_id",nuids.split(","));
-        qw.orderByDesc("reporting_time");
-        List<HumidDevice> list = baseMapper.selectList(qw);
+//        QueryWrapper<HumidDevice> qw = new QueryWrapper<>();
+//        qw.in("nu_id",nuids.split(","));
+//        qw.orderByDesc("reporting_time");
+//        List<HumidDevice> list = baseMapper.selectList(qw);
+        List<HumidDevice> list = baseMapper.queryByNuIds(nuids);
         return BeanUtil.copyToList(list,HumidDeviceEntity.class);
     }
 }