From 37e2672f7c9d59621672444b03d3713580dc1364 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 30 Sep 2020 15:25:48 +0800
Subject: [PATCH] 添加名称地址
---
src/main/resources/mapper/DeviceMapper.xml | 2 +-
src/main/java/com/moral/webSocketServer/BSTestWebsocketServer.java | 13 ++++++++++---
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/webSocketServer/BSTestWebsocketServer.java b/src/main/java/com/moral/webSocketServer/BSTestWebsocketServer.java
index 0579cad..44c202a 100644
--- a/src/main/java/com/moral/webSocketServer/BSTestWebsocketServer.java
+++ b/src/main/java/com/moral/webSocketServer/BSTestWebsocketServer.java
@@ -106,6 +106,7 @@
channel.queueBind(queue, exchange, routingKey);
}
+
//������������,���������������������
channel.basicQos(1);//���������������������������
channel.basicConsume(queue, false, new DefaultConsumer(channel) {
@@ -117,7 +118,7 @@
//���������������������������������������mac���������������������������������mac������������
if(mac!=null&&(!mac.equals(0)))
- sendDeviceInfo(message);
+ sendDeviceInfo(message,deviceList);
//������������
channel.basicAck(envelope.getDeliveryTag(), false);
@@ -145,7 +146,6 @@
@OnMessage
public void onMessage(String message, Session session) {
if (!ObjectUtils.isEmpty(message)) {
- System.out.println(message);
Map<String, Object> map = JSON.parseObject(message);
this.mac = (String) map.get("mac");
}
@@ -194,7 +194,7 @@
* @Author: ���������
* @Date: 2020/9/30
*/
- private void sendDeviceInfo(Map<String, Object> param) {
+ private void sendDeviceInfo(Map<String, Object> param,List<Device> deviceList) {
String deviceMac = (String) param.get("mac");
if (mac.equals(deviceMac)) {
try {
@@ -209,6 +209,13 @@
String mac = (String) param.get("mac");
map.put("mac", mac);
map.put("flag",1);
+ for (Device device : deviceList) {
+ if(mac.equals(device.getMac())){
+ map.put("������",device.getName());
+ map.put("������",device.getAddress());
+ break;
+ }
+ }
sendMessage(JSON.toJSONString(map));
} catch (IOException e) {
log.error("������mac������������������������");
diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index 0db68b8..6df8406 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.state,dev.mac,dev.longitude,dev.latitude,dev.device_version_id deviceVersionId from device dev
+ SELECT dev.name,dev.address,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