From cb8011909063b330f5da6cdb03c2e329b97b18a2 Mon Sep 17 00:00:00 2001
From: 朱俊杰 <502612493@qq.com>
Date: 星期四, 31 三月 2022 09:19:45 +0800
Subject: [PATCH] 订阅查询错误和空指针
---
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
index 687b10a..cd8141f 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
@@ -141,6 +141,7 @@
String now = this.format.format(System.currentTimeMillis());
device.setUpdateTime(now);
Device deviceByDeviceId = deviceMapper.getDeviceByDeviceId(device.getDeviceId());
+ device.setCharset(device.getCharset().toUpperCase());
if (deviceByDeviceId == null) {
device.setCreateTime(now);
redisCatchStorage.updateDevice(device);
@@ -611,9 +612,9 @@
}
@Override
- public List<ChannelReduce> queryChannelListInParentPlatform(String platformId) {
+ public List<DeviceChannelInPlatform> queryChannelListInParentPlatform(String platformId) {
- return deviceChannelMapper.queryChannelListInAll(null, null, null, platformId, platformId);
+ return deviceChannelMapper.queryChannelByPlatformId(platformId);
}
@Override
@@ -1082,7 +1083,7 @@
deviceChannel.setParentId(catalog.getParentId());
deviceChannel.setRegisterWay(1);
// 琛屾斂鍖哄垝搴旇鏄疍omain鐨勫墠鍏綅
- deviceChannel.setCivilCode(sipConfig.getDomain().substring(0, sipConfig.getDomain().length() - 2));
+ deviceChannel.setCivilCode(parentPlatByServerGBId.getDeviceGBId().substring(0,6));
deviceChannel.setModel("live");
deviceChannel.setOwner("wvp-pro");
deviceChannel.setSecrecy("0");
--
Gitblit v1.8.0