Merge branch 'master' of http://111.61.77.35:9999/gengdidi/gassafety into master

gassafety-system/src/main/java/com/zehong/system/domain/vo/DeviceAlarmVo.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zehong.common.core.domain.BaseEntity;
 import com.zehong.system.domain.TDeviceReportData;
 
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 
@@ -32,6 +33,15 @@ public class DeviceAlarmVo extends BaseEntity
     /** 设备编号 */
     private String deviceCode;
 
+    /** 经度 */
+    private BigDecimal longitude;
+
+    /** 纬度 */
+    private BigDecimal latitude;
+
+    /** 坐标 */
+    private String coordinates;
+
     /** 物联网编号 */
     private String iotNo;
 
@@ -102,6 +112,30 @@ public class DeviceAlarmVo extends BaseEntity
         this.deviceCode = deviceCode;
     }
 
+    public BigDecimal getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(BigDecimal longitude) {
+        this.longitude = longitude;
+    }
+
+    public BigDecimal getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(BigDecimal latitude) {
+        this.latitude = latitude;
+    }
+
+    public String getCoordinates() {
+        return coordinates;
+    }
+
+    public void setCoordinates(String coordinates) {
+        this.coordinates = coordinates;
+    }
+
     public String getIotNo() {
         return iotNo;
     }

gassafety-system/src/main/java/com/zehong/system/service/impl/TDeviceAlarmServiceImpl.java

@@ -78,11 +78,14 @@ public class TDeviceAlarmServiceImpl implements ITDeviceAlarmService
             TPipe pipe = tPipeMapper.selectTPipeById(tDeviceAlarm.getDeviceId());
             deviceAlarmVo.setDeviceCode(pipe.getPipeCode());
             deviceAlarmVo.setDeviceName(pipe.getPipeName());
+            deviceAlarmVo.setCoordinates(pipe.getCoordinates());
         } else {
             TDeviceInfo deviceInfo = tDeviceInfoMapper.selectTDeviceInfoById(tDeviceAlarm.getDeviceId());
             deviceAlarmVo.setDeviceCode(deviceInfo.getDeviceCode());
             deviceAlarmVo.setDeviceName(deviceInfo.getDeviceName());
             deviceAlarmVo.setIotNo(deviceInfo.getIotNo());
+            deviceAlarmVo.setLongitude(deviceInfo.getLongitude());
+            deviceAlarmVo.setLatitude(deviceInfo.getLatitude());
 
             // 查询当前设备开始报警时间前后一小时的数据
             TDeviceReportData tDeviceReportData = new TDeviceReportData();