From 7e755f405dd1112a201b9dbde7e2d6cff8abc8f4 Mon Sep 17 00:00:00 2001
From: 648540858 <456panlinlin>
Date: 星期五, 01 四月 2022 16:45:29 +0800
Subject: [PATCH] 支持国标移动位置订阅，收到新位置发送redis消息;支持通道redis消息拉起第三方推流;云台控制添加ControlPriority字段;处理sql的bug
---
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java | 25 ++++++++++---------------
1 files changed, 10 insertions(+), 15 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/VideoManagerStorageImpl.java
similarity index 97%
rename from src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
rename to src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
index cd8141f..1665573 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStorageImpl.java
@@ -5,14 +5,12 @@
import com.genersoft.iot.vmp.gb28181.bean.*;
import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
import com.genersoft.iot.vmp.gb28181.event.subscribe.catalog.CatalogEvent;
-import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
-import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
import com.genersoft.iot.vmp.service.IGbStreamService;
import com.genersoft.iot.vmp.service.bean.GPSMsgInfo;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import com.genersoft.iot.vmp.storager.dao.*;
import com.genersoft.iot.vmp.storager.dao.dto.ChannelSourceInfo;
import com.genersoft.iot.vmp.utils.node.ForestNodeMerger;
@@ -40,9 +38,9 @@
*/
@SuppressWarnings("rawtypes")
@Component
-public class VideoManagerStoragerImpl implements IVideoManagerStorager {
+public class VideoManagerStorageImpl implements IVideoManagerStorage {
- private final Logger logger = LoggerFactory.getLogger(VideoManagerStoragerImpl.class);
+ private final Logger logger = LoggerFactory.getLogger(VideoManagerStorageImpl.class);
@Autowired
EventPublisher eventPublisher;
@@ -85,7 +83,6 @@
@Autowired
private PlatformCatalogMapper catalogMapper;
-;
@Autowired
private PlatformGbStreamMapper platformGbStreamMapper;
@@ -96,13 +93,7 @@
@Autowired
private ParentPlatformMapper parentPlatformMapper;
- @Autowired
- private VideoStreamSessionManager streamSession;
-
- @Autowired
- private MediaServerMapper mediaServerMapper;
-
- private SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ private final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
/**
@@ -268,7 +259,7 @@
}
}
}else {
- stringBuilder.append(deviceChannel.getChannelId() + ",");
+ stringBuilder.append(deviceChannel.getChannelId()).append(",");
}
}
if (channels.size() > 0) {
@@ -286,7 +277,6 @@
logger.debug("[鐩綍鏌ヨ]鏀跺埌鐨勬暟鎹瓨鍦ㄩ噸澶嶏細 {}" , stringBuilder);
}
try {
-// int cleanChannelsResult = deviceChannelMapper.cleanChannelsByDeviceId(deviceId);
int cleanChannelsResult = deviceChannelMapper.cleanChannelsNotInList(deviceId, channels);
int limitCount = 300;
boolean result = cleanChannelsResult < 0;
@@ -1133,4 +1123,9 @@
public List<ChannelSourceInfo> getChannelSource(String platformId, String gbId) {
return platformMapper.getChannelSource(platformId, gbId);
}
+
+ @Override
+ public void updateChannelPotion(String deviceId, String channelId, double longitude, double latitude) {
+ deviceChannelMapper.updatePotion(deviceId, channelId, longitude, latitude);
+ }
}
--
Gitblit v1.8.0