From cc4c4ac144600d08d53dcbb97d24fc2186c34a50 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 08 十一月 2022 20:29:27 +0800
Subject: [PATCH] 支持配置是否开去推流鉴权
---
src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
index ca7da6f..9853079 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java
@@ -19,6 +19,7 @@
import com.genersoft.iot.vmp.storager.dao.PlatformChannelMapper;
import com.genersoft.iot.vmp.utils.DateUtil;
import com.genersoft.iot.vmp.vmanager.bean.BaseTree;
+import com.genersoft.iot.vmp.vmanager.bean.ResourceBaceInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -118,6 +119,7 @@
}
sync(device);
}else {
+
if(device.getOnline() == 0){
device.setOnline(1);
device.setCreateTime(now);
@@ -132,6 +134,11 @@
sync(device);
// TODO 濡傛灉璁惧涓嬬殑閫氶亾绾ц仈鍒颁簡鍏朵粬骞冲彴锛岄偅涔堥渶瑕佸彂閫佷簨浠舵垨鑰卬otify缁欎笂绾у钩鍙�
}else {
+ if (deviceChannelMapper.queryAllChannels(device.getDeviceId()).size() == 0) {
+ logger.info("[璁惧涓婄嚎]: {}锛岄�氶亾鏁颁负0,鏌ヨ閫氶亾淇℃伅", device.getDeviceId());
+ sync(device);
+ }
+
deviceMapper.update(device);
redisCatchStorage.updateDevice(device);
}
@@ -559,6 +566,9 @@
if (!ObjectUtils.isEmpty(device.getMediaServerId())) {
deviceInStore.setMediaServerId(device.getMediaServerId());
}
+ deviceInStore.setSdpIp(device.getSdpIp());
+ deviceInStore.setCharset(device.getCharset());
+ deviceInStore.setTreeType(device.getTreeType());
// 鐩綍璁㈤槄鐩稿叧鐨勪俊鎭�
if (device.getSubscribeCycleForCatalog() > 0) {
@@ -593,6 +603,8 @@
if (!deviceInStore.getGeoCoordSys().equals(device.getGeoCoordSys())) {
updateDeviceChannelGeoCoordSys(device);
}
+ // 鏇存柊redis
+ redisCatchStorage.updateDevice(device);
deviceMapper.updateCustom(device);
}
@@ -614,4 +626,9 @@
}
return result;
}
+
+ @Override
+ public ResourceBaceInfo getOverview() {
+ return deviceMapper.getOverview();
+ }
}
--
Gitblit v1.8.0