From 57f6611fe7a750c76fa6d766b4b67c699e479154 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Thu, 25 Dec 2025 14:42:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B0=B4=E6=B3=A5=E6=90=85=E6=8B=8C=E6=A1=A9/?=
 =?UTF-8?q?=E6=97=8B=E6=8C=96=E8=AE=BE=E5=A4=87bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bigdevice/entity/vo/CementMixPileRealtimeVo.java   |  5 ++++-
 .../bigdevice/entity/vo/CementMixPileTaskVo.java       |  3 +++
 .../mapper/xml/CementMixPileRealtimeMapper.xml         |  2 ++
 .../bigdevice/mapper/xml/CementMixPileTaskMapper.xml   |  2 ++
 .../service/impl/CementMixPileAlarmServiceImpl.java    | 10 ++++++++++
 5 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/vo/CementMixPileRealtimeVo.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/vo/CementMixPileRealtimeVo.java
index e03bc49df..78d908485 100644
--- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/vo/CementMixPileRealtimeVo.java
+++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/vo/CementMixPileRealtimeVo.java
@@ -2,10 +2,13 @@ package com.zhgd.xmgl.modules.bigdevice.entity.vo;
 
 import com.zhgd.xmgl.modules.bigdevice.entity.CementMixPileRealtime;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 @ApiModel(value="CementMixPileRealtimeVo实体类",description="CementMixPileRealtimeVo实体类")
 public class CementMixPileRealtimeVo extends CementMixPileRealtime {
-
+    /**设备名称*/
+    @ApiModelProperty(value="设备名称")
+    private String devName  ;
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/vo/CementMixPileTaskVo.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/vo/CementMixPileTaskVo.java
index 06e20a99e..9e6f9dc2e 100644
--- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/vo/CementMixPileTaskVo.java
+++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/entity/vo/CementMixPileTaskVo.java
@@ -14,4 +14,7 @@ public class CementMixPileTaskVo extends CementMixPileTask {
     /**作业车辆*/
     @ApiModelProperty(value="作业车辆")
     private String workVehicle  ;
+    /**设备名称*/
+    @ApiModelProperty(value="设备名称")
+    private String devName  ;
 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/CementMixPileRealtimeMapper.xml b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/CementMixPileRealtimeMapper.xml
index 8ba968185..a75daade0 100644
--- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/CementMixPileRealtimeMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/CementMixPileRealtimeMapper.xml
@@ -4,7 +4,9 @@
     <select id="queryList" resultType="com.zhgd.xmgl.modules.bigdevice.entity.vo.CementMixPileRealtimeVo">
         select * from (
         select t.*
+        ,cmpd.dev_name
         from cement_mix_pile_realtime t
+        left join cement_mix_pile_dev cmpd on cmpd.dev_sn=t.dev_sn
         )t
         ${ew.customSqlSegment}
     </select>
diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/CementMixPileTaskMapper.xml b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/CementMixPileTaskMapper.xml
index e29c483f7..9701fc489 100644
--- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/CementMixPileTaskMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/CementMixPileTaskMapper.xml
@@ -5,8 +5,10 @@
         select * from (
         select t.*
             ,vpd.number_plate as workVehicle
+            ,cmpd.dev_name
         from cement_mix_pile_task t
         left join vehicle_position_dev vpd on vpd.dev_sn=t.dev_sn
+        left join cement_mix_pile_dev cmpd on cmpd.dev_sn=t.dev_sn
         )t
         ${ew.customSqlSegment}
     </select>
diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/CementMixPileAlarmServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/CementMixPileAlarmServiceImpl.java
index 809d91e25..39d0c657a 100644
--- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/CementMixPileAlarmServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/CementMixPileAlarmServiceImpl.java
@@ -77,6 +77,7 @@ public class CementMixPileAlarmServiceImpl extends ServiceImpl<CementMixPileAlar
     @Override
     public void add(CementMixPileAlarmDto cementMixPileAlarmDto) {
         cementMixPileAlarmDto.setId(null);
+        setPilePointName(cementMixPileAlarmDto);
         baseMapper.insert(cementMixPileAlarmDto);
         sendAlarm(cementMixPileAlarmDto);
     }
@@ -109,10 +110,19 @@ public class CementMixPileAlarmServiceImpl extends ServiceImpl<CementMixPileAlar
         if (oldCementMixPileAlarm == null) {
             throw new OpenAlertException("未找到对应实体");
         }
+        setPilePointName(cementMixPileAlarmDto);
         baseMapper.updateById(cementMixPileAlarmDto);
         sendAlarm(cementMixPileAlarmDto);
     }
 
+    private void setPilePointName(CementMixPileAlarmDto cementMixPileAlarmDto) {
+        CementMixPilePoint point = cementMixPilePointService.getOne(new LambdaQueryWrapper<CementMixPilePoint>()
+                .eq(CementMixPilePoint::getId, cementMixPileAlarmDto.getPointId()));
+        if (point != null) {
+            cementMixPileAlarmDto.setPilePointName(point.getPilePointName());
+        }
+    }
+
     @Override
     public void delete(String id) {
         CementMixPileAlarm cementMixPileAlarm = baseMapper.selectById(id);