水泥搅拌桩/旋挖设备bug修复

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  ;
 }

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  ;
 }

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>

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>

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);