From f502917e38fa5817aee2452fa7b1f9331269f0c8 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 15 Sep 2021 09:55:09 +0800
Subject: [PATCH] 修改device实体类
---
screen-job/src/main/resources/mapper/DeviceMapper.xml | 1 +
screen-api/src/main/java/com/moral/api/entity/Device.java | 5 +++++
screen-job/src/main/java/com/moral/api/entity/Device.java | 5 +++++
screen-api/src/main/java/com/moral/api/websocket/CruiserWebSocketServer.java | 4 ++--
screen-api/src/main/resources/mapper/DeviceMapper.xml | 1 +
5 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/entity/Device.java b/screen-api/src/main/java/com/moral/api/entity/Device.java
index 1e9e286..beec53d 100644
--- a/screen-api/src/main/java/com/moral/api/entity/Device.java
+++ b/screen-api/src/main/java/com/moral/api/entity/Device.java
@@ -78,6 +78,11 @@
private Integer organizationId;
/**
+ * ���������/���������/���������������������gov_monitor_point���guid������
+ */
+ private String guid;
+
+ /**
* ������������id
*/
private Integer deviceVersionId;
diff --git a/screen-api/src/main/java/com/moral/api/websocket/CruiserWebSocketServer.java b/screen-api/src/main/java/com/moral/api/websocket/CruiserWebSocketServer.java
index fd31b01..ebb0ed4 100644
--- a/screen-api/src/main/java/com/moral/api/websocket/CruiserWebSocketServer.java
+++ b/screen-api/src/main/java/com/moral/api/websocket/CruiserWebSocketServer.java
@@ -48,7 +48,7 @@
this.mac = mac;
this.specialDevice = (SpecialDevice) redisTemplate.opsForHash().get(RedisConstants.SPECIAL_DEVICE_INFO, mac);
//���������������������������AQI������������������
- Map<String, Object> deviceInfo = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.DEVICE, mac);
+ /*Map<String, Object> deviceInfo = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.DEVICE, mac);
Map<String, Object> orgInfo = (Map<String, Object>) deviceInfo.get("organization");
String areaCode = String.valueOf(orgInfo.get("areaCode"));
String cityCode = String.valueOf(orgInfo.get("cityCode"));
@@ -58,7 +58,7 @@
this.regionAqi = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, cityCode);
} catch (Exception e) {
e.printStackTrace();
- }
+ }*/
sockets.add(this);
}
diff --git a/screen-api/src/main/resources/mapper/DeviceMapper.xml b/screen-api/src/main/resources/mapper/DeviceMapper.xml
index 5c54941..ce3522f 100644
--- a/screen-api/src/main/resources/mapper/DeviceMapper.xml
+++ b/screen-api/src/main/resources/mapper/DeviceMapper.xml
@@ -14,6 +14,7 @@
<result column="operate_ids" property="operateIds"/>
<result column="monitor_point_id" property="monitorPointId"/>
<result column="organization_id" property="organizationId"/>
+ <result column="guid" property="guid"/>
<result column="device_version_id" property="deviceVersionId"/>
<result column="profession" property="profession"/>
<result column="tech" property="tech"/>
diff --git a/screen-job/src/main/java/com/moral/api/entity/Device.java b/screen-job/src/main/java/com/moral/api/entity/Device.java
index c676a49..f055d6b 100644
--- a/screen-job/src/main/java/com/moral/api/entity/Device.java
+++ b/screen-job/src/main/java/com/moral/api/entity/Device.java
@@ -75,6 +75,11 @@
private Integer organizationId;
/**
+ * ���������/���������/���������������������gov_monitor_point���guid������
+ */
+ private String guid;
+
+ /**
* ������������id
*/
private Integer deviceVersionId;
diff --git a/screen-job/src/main/resources/mapper/DeviceMapper.xml b/screen-job/src/main/resources/mapper/DeviceMapper.xml
index 7831eb5..a44b860 100644
--- a/screen-job/src/main/resources/mapper/DeviceMapper.xml
+++ b/screen-job/src/main/resources/mapper/DeviceMapper.xml
@@ -14,6 +14,7 @@
<result column="operate_ids" property="operateIds"/>
<result column="monitor_point_id" property="monitorPointId"/>
<result column="organization_id" property="organizationId"/>
+ <result column="guid" property="guid"/>
<result column="device_version_id" property="deviceVersionId"/>
<result column="profession" property="profession"/>
<result column="tech" property="tech"/>
--
Gitblit v1.8.0