From dbc525e8fb59f70c474863304e3c580e81dcedf0 Mon Sep 17 00:00:00 2001
From: 648540858 <18010473990@163.com>
Date: 星期一, 09 八月 2021 16:54:36 +0800
Subject: [PATCH] 添加版本信息接口
---
src/main/java/com/genersoft/iot/vmp/storager/impl/VideoManagerStoragerImpl.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 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 4e24753..89c1d6c 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
@@ -109,7 +109,7 @@
*/
@Override
public synchronized boolean updateDevice(Device device) {
- String now = this.format.format(new Date(System.currentTimeMillis()));
+ String now = this.format.format(System.currentTimeMillis());
device.setUpdateTime(now);
Device deviceByDeviceId = deviceMapper.getDeviceByDeviceId(device.getDeviceId());
if (deviceByDeviceId == null) {
@@ -126,7 +126,7 @@
String channelId = channel.getChannelId();
channel.setDeviceId(deviceId);
channel.setStreamId(streamSession.getStreamId(deviceId, channel.getChannelId()));
- String now = this.format.format(new Date(System.currentTimeMillis()));
+ String now = this.format.format(System.currentTimeMillis());
channel.setUpdateTime(now);
DeviceChannel deviceChannel = deviceChannelMapper.queryChannel(deviceId, channelId);
if (deviceChannel == null) {
@@ -463,7 +463,7 @@
boolean result = false;
streamProxyItem.setStreamType("proxy");
streamProxyItem.setStatus(true);
- String now = this.format.format(new Date(System.currentTimeMillis()));
+ String now = this.format.format(System.currentTimeMillis());
streamProxyItem.setCreateTime(now);
try {
if (gbStreamMapper.add(streamProxyItem)<0 || streamProxyMapper.add(streamProxyItem) < 0) {
@@ -609,7 +609,7 @@
@Override
public void updateMediaServer(MediaServerItem mediaServerItem) {
- String now = this.format.format(new Date(System.currentTimeMillis()));
+ String now = this.format.format(System.currentTimeMillis());
mediaServerItem.setUpdateTime(now);
if (mediaServerMapper.queryOne(mediaServerItem.getId()) != null) {
mediaServerMapper.update(mediaServerItem);
@@ -623,4 +623,14 @@
public List<StreamProxyItem> getStreamProxyListForEnableInMediaServer(String id, boolean enable) {
return streamProxyMapper.selectForEnableInMediaServer(id, enable);
}
+
+ @Override
+ public Device queryVideoDeviceByChannelId(String channelId) {
+ Device result = null;
+ List<DeviceChannel> channelList = deviceChannelMapper.queryChannelByChannelId(channelId);
+ if (channelList.size() == 1) {
+ result = deviceMapper.getDeviceByDeviceId(channelList.get(0).getDeviceId());
+ }
+ return result;
+ }
}
--
Gitblit v1.8.0