From 1fde1270af7b37209a2b51a214229bacf80662f9 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 28 Sep 2020 16:04:29 +0800
Subject: [PATCH] 添加设备状态
---
src/main/resources/mapper/DeviceMapper.xml | 2 +-
src/main/java/com/moral/webSocketServer/BSWebsocketServer.java | 1 +
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/webSocketServer/BSWebsocketServer.java b/src/main/java/com/moral/webSocketServer/BSWebsocketServer.java
index ce40a43..7329c34 100644
--- a/src/main/java/com/moral/webSocketServer/BSWebsocketServer.java
+++ b/src/main/java/com/moral/webSocketServer/BSWebsocketServer.java
@@ -161,6 +161,7 @@
if(mac.equals(device.getMac())){
map.put("������",device.getLatitude());
map.put("������",device.getLongitude());
+ map.put("������",device.getState());
break;
}
}
diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index 092f8ce..0db68b8 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -484,7 +484,7 @@
</select>
<select id="selectDevicesAll" parameterType="java.util.Map" resultType="com.moral.entity.Device">
- SELECT dev.id,dev.mac,dev.longitude,dev.latitude,dev.device_version_id deviceVersionId from device dev
+ SELECT dev.id,dev.state,dev.mac,dev.longitude,dev.latitude,dev.device_version_id deviceVersionId from device dev
left join monitor_point mpt on dev.monitor_point_id = mpt.id
<where>
<if test="@com.moral.common.bean.Constants@isNotSpecialOrgId(orgId)">
--
Gitblit v1.8.0