Merge branch 'master' of http://git.xt.wenhq.top:8083/liwei19941102/cbwqpf

* 'master' of http://git.xt.wenhq.top:8083/liwei19941102/cbwqpf:
  设备列表增加deviceId

ruoyi-system/src/main/java/com/ruoyi/system/domain/DeviceBo.java

@@ -15,6 +15,8 @@ import java.util.Date;
 public class DeviceBo {
     private static final long serialVersionUID = 1L;
 
+    private String deviceId;
+
     // 设备名称
     private String name;
 

ruoyi-system/src/main/resources/mapper/system/AisDatabaseMapper.xml

@@ -18,7 +18,8 @@
     </select>
 
     <select id="queryDeviceList" resultType="com.ruoyi.system.domain.DeviceBo">
-        select concat(Longitude, ',', Latitude) as latilongti,
+        select id                               as deviceId,
+               concat(Longitude, ',', Latitude) as latilongti,
                Remark                           as name,
                Category                         as monitorName,
                case Status

ruoyi-system/src/main/resources/mapper/system/HeiYanMapper.xml

@@ -15,7 +15,8 @@
         from ship_snap_address
     </select>
     <select id="queryDeviceList" resultType="com.ruoyi.system.domain.DeviceBo">
-        select updateTime,
+        select id                               as                                deviceId,
+               updateTime,
                concat(longitude, ',', latitude) as                                latilongti,
                name,
                snapPos                          as                                monitorName,

ruoyi-system/src/main/resources/mapper/system/So2Mapper.xml

@@ -18,7 +18,8 @@
     </select>
 
     <select id="queryDeviceList" resultType="com.ruoyi.system.domain.DeviceBo">
-        select d.name                               as name,
+        select d.id                                 as deviceId,
+               d.name                               as name,
                case d.type
                    when 0 then 'ais设备'
                    when 1 then '遥测设备'