From 1947edb69af115eed2cbb4b2b9f60075fce18cbb Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 16 十月 2020 11:24:36 +0800
Subject: [PATCH] 引入lombok框架 优化redis存储结构
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java | 45 +++++++++++++++++++++++++--------------------
1 files changed, 25 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java
index 7038590..73f2dc5 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java
@@ -76,8 +76,6 @@
* 澶勭悊MESSAGE璇锋眰
*
* @param evt
- * @param layer
- * @param transaction
*/
@Override
public void process(RequestEvent evt) {
@@ -127,7 +125,7 @@
device.setManufacturer(XmlUtil.getText(rootElement,"Manufacturer"));
device.setModel(XmlUtil.getText(rootElement,"Model"));
device.setFirmware(XmlUtil.getText(rootElement,"Firmware"));
- storager.update(device);
+ storager.updateDevice(device);
RequestMessage msg = new RequestMessage();
msg.setDeviceId(deviceId);
@@ -147,7 +145,7 @@
try {
Element rootElement = getRootElement(evt);
Element deviceIdElement = rootElement.element("DeviceID");
- String deviceId = deviceIdElement.getText().toString();
+ String deviceId = deviceIdElement.getText();
Element deviceListElement = rootElement.element("DeviceList");
if (deviceListElement == null) {
return;
@@ -158,11 +156,6 @@
if (device == null) {
return;
}
- Map<String, DeviceChannel> channelMap = device.getChannelMap();
- if (channelMap == null) {
- channelMap = new HashMap<String, DeviceChannel>(5);
- device.setChannelMap(channelMap);
- }
// 閬嶅巻DeviceList
while (deviceListIterator.hasNext()) {
Element itemDevice = deviceListIterator.next();
@@ -170,18 +163,18 @@
if (channelDeviceElement == null) {
continue;
}
- String channelDeviceId = channelDeviceElement.getText().toString();
+ String channelDeviceId = channelDeviceElement.getText();
Element channdelNameElement = itemDevice.element("Name");
- String channelName = channdelNameElement != null ? channdelNameElement.getText().toString() : "";
+ String channelName = channdelNameElement != null ? channdelNameElement.getTextTrim().toString() : "";
Element statusElement = itemDevice.element("Status");
String status = statusElement != null ? statusElement.getText().toString() : "ON";
- DeviceChannel deviceChannel = channelMap.containsKey(channelDeviceId) ? channelMap.get(channelDeviceId) : new DeviceChannel();
+ DeviceChannel deviceChannel = new DeviceChannel();
deviceChannel.setName(channelName);
deviceChannel.setChannelId(channelDeviceId);
- if(status.equals("ON")) {
+ if(status.equals("ON") || status.equals("On")) {
deviceChannel.setStatus(1);
}
- if(status.equals("OFF")) {
+ if(status.equals("OFF") || status.equals("Off")) {
deviceChannel.setStatus(0);
}
@@ -192,7 +185,7 @@
deviceChannel.setBlock(XmlUtil.getText(itemDevice,"Block"));
deviceChannel.setAddress(XmlUtil.getText(itemDevice,"Address"));
deviceChannel.setParental(itemDevice.element("Parental") == null? 0:Integer.parseInt(XmlUtil.getText(itemDevice,"Parental")));
- deviceChannel.setParentId(XmlUtil.getText(itemDevice,"ParentId"));
+ deviceChannel.setParentId(XmlUtil.getText(itemDevice,"ParentID"));
deviceChannel.setSafetyWay(itemDevice.element("SafetyWay") == null? 0:Integer.parseInt(XmlUtil.getText(itemDevice,"SafetyWay")));
deviceChannel.setRegisterWay(itemDevice.element("RegisterWay") == null? 1:Integer.parseInt(XmlUtil.getText(itemDevice,"RegisterWay")));
deviceChannel.setCertNum(XmlUtil.getText(itemDevice,"CertNum"));
@@ -205,17 +198,27 @@
deviceChannel.setPassword(XmlUtil.getText(itemDevice,"Password"));
deviceChannel.setLongitude(itemDevice.element("Longitude") == null? 0.00:Double.parseDouble(XmlUtil.getText(itemDevice,"Longitude")));
deviceChannel.setLatitude(itemDevice.element("Latitude") == null? 0.00:Double.parseDouble(XmlUtil.getText(itemDevice,"Latitude")));
- channelMap.put(channelDeviceId, deviceChannel);
+ deviceChannel.setPTZType(itemDevice.element("PTZType") == null? 0:Integer.parseInt(XmlUtil.getText(itemDevice,"PTZType")));
+ deviceChannel.setHasAudio(false); // 榛樿鍚湁闊抽涓篺alse
+ storager.updateChannel(device.getDeviceId(), deviceChannel);
}
// 鏇存柊
- storager.update(device);
+ storager.updateDevice(device);
+
RequestMessage msg = new RequestMessage();
msg.setDeviceId(deviceId);
msg.setType(DeferredResultHolder.CALLBACK_CMD_CATALOG);
msg.setData(device);
deferredResultHolder.invokeResult(msg);
+
+ // 鍥炲200
+ if (offLineDetector.isOnline(deviceId)) {
+ responseAck(evt);
+ publisher.onlineEventPublish(deviceId, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);
+ }
+
}
- } catch (DocumentException e) {
+ } catch (DocumentException | SipException | InvalidArgumentException | ParseException e) {
e.printStackTrace();
}
}
@@ -232,13 +235,15 @@
Device device = storager.queryVideoDevice(deviceId);
if (device == null) {
+ // TODO 涔熷彲鑳芥槸閫氶亾
+// storager.queryChannel(deviceId)
return;
}
device.setName(XmlUtil.getText(rootElement,"DeviceName"));
device.setManufacturer(XmlUtil.getText(rootElement,"Manufacturer"));
device.setModel(XmlUtil.getText(rootElement,"Model"));
device.setFirmware(XmlUtil.getText(rootElement,"Firmware"));
- storager.update(device);
+ storager.updateDevice(device);
cmder.catalogQuery(device);
} catch (DocumentException e) {
e.printStackTrace();
@@ -303,7 +308,7 @@
record.setEndTime(DateUtil.ISO8601Toyyyy_MM_dd_HH_mm_ss(XmlUtil.getText(itemRecord,"EndTime")));
record.setSecrecy(itemRecord.element("Secrecy") == null? 0:Integer.parseInt(XmlUtil.getText(itemRecord,"Secrecy")));
record.setType(XmlUtil.getText(itemRecord,"Type"));
- record.setRecordId(XmlUtil.getText(itemRecord,"RecorderID"));
+ record.setRecorderId(XmlUtil.getText(itemRecord,"RecorderID"));
recordList.add(record);
}
recordInfo.setRecordList(recordList);
--
Gitblit v1.8.0