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 @@
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}
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()
+ .eq(CementMixPilePoint::getId, cementMixPileAlarmDto.getPointId()));
+ if (point != null) {
+ cementMixPileAlarmDto.setPilePointName(point.getPilePointName());
+ }
+ }
+
@Override
public void delete(String id) {
CementMixPileAlarm cementMixPileAlarm = baseMapper.selectById(id);