From 837707991709a4d64d33c65e6e0399428a535953 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Mon, 25 Aug 2025 15:12:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=85=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../environment/mapper/xml/DustNoiseDataMapper.xml   |  3 +--
 .../service/impl/DustNoiseDataServiceImpl.java       | 12 ++++++++++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/DustNoiseDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/DustNoiseDataMapper.xml
index 839d3b2d3..e755f0840 100644
--- a/src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/DustNoiseDataMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/DustNoiseDataMapper.xml
@@ -82,9 +82,8 @@
         limit 1
     </select>
     <select id="selectDustNoisePageList" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
-        SELECT a.*, c.device_name
+        SELECT a.*
         FROM dust_noise_data a
-        LEFT JOIN environment_dev c ON (a.device_id = c.device_id and a.project_sn = c.project_sn)
         where a.project_sn = #{param.projectSn}
         <if test="param.deviceId != null and param.deviceId != ''">
             and a.device_id = #{param.deviceId}
diff --git a/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/DustNoiseDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/DustNoiseDataServiceImpl.java
index b4c6543d6..9c3792a74 100644
--- a/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/DustNoiseDataServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/environment/service/impl/DustNoiseDataServiceImpl.java
@@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.environment.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -17,6 +18,7 @@ import com.zhgd.xmgl.modules.environment.mapper.EnvironmentDevMapper;
 import com.zhgd.xmgl.modules.environment.mapper.EnvironmentWarningMapper;
 import com.zhgd.xmgl.modules.environment.service.IDustNoiseDataService;
 import com.zhgd.xmgl.modules.environment.service.IEnvironmentAlarmService;
+import com.zhgd.xmgl.modules.environment.service.IEnvironmentDevService;
 import com.zhgd.xmgl.util.DateUtils;
 import com.zhgd.xmgl.util.MessageUtil;
 import com.zhgd.xmgl.util.WindDirectionUtils;
@@ -27,6 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.CommandLineRunner;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Service;
 import rk.netDevice.sdk.p2.*;
@@ -62,6 +65,9 @@ public class DustNoiseDataServiceImpl extends ServiceImpl<DustNoiseDataMapper, D
     private ThreadPoolTaskExecutor threadPoolTaskExecutor;
     @Value("${rengzhicekong.hj212.port:}")
     private int rengzhicekongHj212Port;
+    @Lazy
+    @Autowired
+    private IEnvironmentDevService environmentDevService;
 
     private static String getWinddirection(float hum) {
         int v = (int) (hum * 10);
@@ -210,6 +216,12 @@ public class DustNoiseDataServiceImpl extends ServiceImpl<DustNoiseDataMapper, D
         int pageSize = Integer.parseInt(map.getOrDefault("pageSize", 10).toString());
         Page<EntityMap> page = new Page<>(pageNo, pageSize);
         List<EntityMap> list = dustNoiseDataMapper.selectDustNoisePageList(page, map);
+        String projectSn = MapUtils.getString(map, "projectSn");
+        Map<String, EnvironmentDev> devMap = environmentDevService.list(new LambdaQueryWrapper<EnvironmentDev>()
+                .eq(EnvironmentDev::getProjectSn, projectSn)).stream().collect(Collectors.toMap(EnvironmentDev::getDeviceId, Function.identity(), (o1, o2) -> o1));
+        for (EntityMap entityMap : list) {
+            entityMap.put("device_name", Optional.ofNullable(devMap.get(entityMap.get("deviceId"))).map(EnvironmentDev::getDeviceName).orElse(null));
+        }
         return page.setRecords(list);
     }