From 3d6db7478d79b824f93708f936c598cc622221f2 Mon Sep 17 00:00:00 2001
From: mk1990 <153958232@qq.com>
Date: 星期一, 20 六月 2022 15:10:31 +0800
Subject: [PATCH] fix设备状态查询接口
---
src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java | 248 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 239 insertions(+), 9 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 39a59f8..ec30cd4 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
@@ -2,21 +2,32 @@
import com.genersoft.iot.vmp.conf.DynamicTask;
import com.genersoft.iot.vmp.gb28181.bean.Device;
+import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
+import com.genersoft.iot.vmp.gb28181.bean.SsrcTransaction;
+import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
+import com.genersoft.iot.vmp.gb28181.task.ISubscribeTask;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.ISIPCommander;
import com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.response.cmd.CatalogResponseMessageHandler;
+import com.genersoft.iot.vmp.gb28181.utils.Coordtransform;
import com.genersoft.iot.vmp.service.IDeviceService;
import com.genersoft.iot.vmp.gb28181.task.impl.CatalogSubscribeTask;
import com.genersoft.iot.vmp.gb28181.task.impl.MobilePositionSubscribeTask;
import com.genersoft.iot.vmp.gb28181.bean.SyncStatus;
+import com.genersoft.iot.vmp.service.IMediaServerService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
+import com.genersoft.iot.vmp.storager.dao.DeviceChannelMapper;
+import com.genersoft.iot.vmp.storager.dao.DeviceMapper;
+import com.genersoft.iot.vmp.utils.DateUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
-import javax.sip.DialogState;
+import java.time.Instant;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
/**
* 璁惧涓氬姟锛堢洰褰曡闃咃級
@@ -25,6 +36,8 @@
public class DeviceServiceImpl implements IDeviceService {
private final static Logger logger = LoggerFactory.getLogger(DeviceServiceImpl.class);
+
+ private final String registerExpireTaskKeyPrefix = "device-register-expire-";
@Autowired
private DynamicTask dynamicTask;
@@ -38,6 +51,89 @@
@Autowired
private IRedisCatchStorage redisCatchStorage;
+ @Autowired
+ private DeviceMapper deviceMapper;
+
+ @Autowired
+ private DeviceChannelMapper deviceChannelMapper;
+
+ @Autowired
+ private IVideoManagerStorage storage;
+
+ @Autowired
+ private ISIPCommander commander;
+
+ @Autowired
+ private VideoStreamSessionManager streamSession;
+
+ @Autowired
+ private IMediaServerService mediaServerService;
+
+ @Override
+ public void online(Device device) {
+ logger.info("[璁惧涓婄嚎] deviceId锛歿}->{}:{}", device.getDeviceId(), device.getIp(), device.getPort());
+ Device deviceInRedis = redisCatchStorage.getDevice(device.getDeviceId());
+ Device deviceInDb = deviceMapper.getDeviceByDeviceId(device.getDeviceId());
+
+ String now = DateUtil.getNow();
+ if (deviceInRedis != null && deviceInDb == null) {
+ // redis 瀛樺湪鑴忔暟鎹�
+ redisCatchStorage.clearCatchByDeviceId(device.getDeviceId());
+ }
+ device.setUpdateTime(now);
+ device.setOnline(1);
+
+ // 绗竴娆′笂绾�
+ if (device.getCreateTime() == null) {
+ device.setCreateTime(now);
+ logger.info("[璁惧涓婄嚎,棣栨娉ㄥ唽]: {}锛屾煡璇㈣澶囦俊鎭互鍙婇�氶亾淇℃伅", device.getDeviceId());
+ deviceMapper.add(device);
+ redisCatchStorage.updateDevice(device);
+ commander.deviceInfoQuery(device);
+ sync(device);
+ }else {
+ deviceMapper.update(device);
+ redisCatchStorage.updateDevice(device);
+ }
+
+ // 涓婄嚎娣诲姞璁㈤槄
+ if (device.getSubscribeCycleForCatalog() > 0) {
+ // 鏌ヨ鍦ㄧ嚎璁惧閭ｄ簺寮�鍚簡璁㈤槄锛屼负璁惧寮�鍚畾鏃剁殑鐩綍璁㈤槄
+ addCatalogSubscribe(device);
+ }
+ if (device.getSubscribeCycleForMobilePosition() > 0) {
+ addMobilePositionSubscribe(device);
+ }
+ // 鍒锋柊杩囨湡浠诲姟
+ String registerExpireTaskKey = registerExpireTaskKeyPrefix + device.getDeviceId();
+ dynamicTask.startDelay(registerExpireTaskKey, ()-> offline(device.getDeviceId()), device.getExpires() * 1000);
+ }
+
+ @Override
+ public void offline(String deviceId) {
+ Device device = deviceMapper.getDeviceByDeviceId(deviceId);
+ if (device == null) {
+ return;
+ }
+ String registerExpireTaskKey = registerExpireTaskKeyPrefix + deviceId;
+ dynamicTask.stop(registerExpireTaskKey);
+ device.setOnline(0);
+ redisCatchStorage.updateDevice(device);
+ deviceMapper.update(device);
+ // 绂荤嚎閲婃斁鎵�鏈塻src
+ List<SsrcTransaction> ssrcTransactions = streamSession.getSsrcTransactionForAll(deviceId, null, null, null);
+ if (ssrcTransactions != null && ssrcTransactions.size() > 0) {
+ for (SsrcTransaction ssrcTransaction : ssrcTransactions) {
+ mediaServerService.releaseSsrc(ssrcTransaction.getMediaServerId(), ssrcTransaction.getSsrc());
+ mediaServerService.closeRTPServer(deviceId, ssrcTransaction.getChannelId(), ssrcTransaction.getStream());
+ streamSession.remove(deviceId, ssrcTransaction.getChannelId(), ssrcTransaction.getStream());
+ }
+ }
+ // 绉婚櫎璁㈤槄
+ removeCatalogSubscribe(device);
+ removeMobilePositionSubscribe(device);
+ }
+
@Override
public boolean addCatalogSubscribe(Device device) {
if (device == null || device.getSubscribeCycleForCatalog() < 0) {
@@ -49,7 +145,7 @@
// 鎻愬墠寮�濮嬪埛鏂拌闃�
int subscribeCycleForCatalog = Math.max(device.getSubscribeCycleForCatalog(),30);
// 璁剧疆鏈�灏忓�间负30
- dynamicTask.startCron(device.getDeviceId() + "catalog", catalogSubscribeTask, subscribeCycleForCatalog -1);
+ dynamicTask.startCron(device.getDeviceId() + "catalog", catalogSubscribeTask, (subscribeCycleForCatalog -1) * 1000);
return true;
}
@@ -58,8 +154,16 @@
if (device == null || device.getSubscribeCycleForCatalog() < 0) {
return false;
}
- logger.info("绉婚櫎鐩綍璁㈤槄: {}", device.getDeviceId());
- dynamicTask.stop(device.getDeviceId() + "catalog");
+ logger.info("[绉婚櫎鐩綍璁㈤槄]: {}", device.getDeviceId());
+ String taskKey = device.getDeviceId() + "catalog";
+ if (device.getOnline() == 1) {
+ Runnable runnable = dynamicTask.get(taskKey);
+ if (runnable instanceof ISubscribeTask) {
+ ISubscribeTask subscribeTask = (ISubscribeTask) runnable;
+ subscribeTask.stop();
+ }
+ }
+ dynamicTask.stop(taskKey);
return true;
}
@@ -74,7 +178,7 @@
// 璁剧疆鏈�灏忓�间负30
int subscribeCycleForCatalog = Math.max(device.getSubscribeCycleForMobilePosition(),30);
// 鎻愬墠寮�濮嬪埛鏂拌闃�
- dynamicTask.startCron(device.getDeviceId() + "mobile_position" , mobilePositionSubscribeTask, subscribeCycleForCatalog -1 );
+ dynamicTask.startCron(device.getDeviceId() + "mobile_position" , mobilePositionSubscribeTask, (subscribeCycleForCatalog -1 ) * 1000);
return true;
}
@@ -83,8 +187,16 @@
if (device == null || device.getSubscribeCycleForCatalog() < 0) {
return false;
}
- logger.info("绉婚櫎绉诲姩浣嶇疆璁㈤槄: {}", device.getDeviceId());
- dynamicTask.stop(device.getDeviceId() + "mobile_position");
+ logger.info("[绉婚櫎绉诲姩浣嶇疆璁㈤槄]: {}", device.getDeviceId());
+ String taskKey = device.getDeviceId() + "mobile_position";
+ if (device.getOnline() == 1) {
+ Runnable runnable = dynamicTask.get(taskKey);
+ if (runnable instanceof ISubscribeTask) {
+ ISubscribeTask subscribeTask = (ISubscribeTask) runnable;
+ subscribeTask.stop();
+ }
+ }
+ dynamicTask.stop(taskKey);
return true;
}
@@ -111,4 +223,122 @@
catalogResponseMessageHandler.setChannelSyncEnd(device.getDeviceId(), errorMsg);
});
}
+
+ @Override
+ public Device queryDevice(String deviceId) {
+ return deviceMapper.getDeviceByDeviceId(deviceId);
+ }
+
+ @Override
+ public List<Device> getAllOnlineDevice() {
+ return deviceMapper.getOnlineDevices();
+ }
+
+ @Override
+ public boolean expire(Device device) {
+ Instant registerTimeDate = Instant.from(DateUtil.formatter.parse(device.getRegisterTime()));
+ Instant expireInstant = registerTimeDate.plusMillis(TimeUnit.SECONDS.toMillis(device.getExpires()));
+ return expireInstant.isBefore(Instant.now());
+ }
+
+ @Override
+ public void checkDeviceStatus(Device device) {
+ if (device == null || device.getOnline() == 0) {
+ return;
+ }
+ sipCommander.deviceStatusQuery(device, null);
+
+ }
+
+ @Override
+ public Device getDeviceByHostAndPort(String host, int port) {
+ return deviceMapper.getDeviceByHostAndPort(host, port);
+ }
+
+ @Override
+ public void updateDevice(Device device) {
+
+ Device deviceInStore = deviceMapper.getDeviceByDeviceId(device.getDeviceId());
+ if (deviceInStore == null) {
+ logger.warn("鏇存柊璁惧鏃舵湭鎵惧埌璁惧淇℃伅");
+ return;
+ }
+ if (!StringUtils.isEmpty(device.getName())) {
+ deviceInStore.setName(device.getName());
+ }
+ if (!StringUtils.isEmpty(device.getCharset())) {
+ deviceInStore.setCharset(device.getCharset());
+ }
+ if (!StringUtils.isEmpty(device.getMediaServerId())) {
+ deviceInStore.setMediaServerId(device.getMediaServerId());
+ }
+
+ // 鐩綍璁㈤槄鐩稿叧鐨勪俊鎭�
+ if (device.getSubscribeCycleForCatalog() > 0) {
+ if (deviceInStore.getSubscribeCycleForCatalog() == 0 || deviceInStore.getSubscribeCycleForCatalog() != device.getSubscribeCycleForCatalog()) {
+ deviceInStore.setSubscribeCycleForCatalog(device.getSubscribeCycleForCatalog());
+ // 寮�鍚闃�
+ addCatalogSubscribe(deviceInStore);
+ }
+ }else if (device.getSubscribeCycleForCatalog() == 0) {
+ if (deviceInStore.getSubscribeCycleForCatalog() != 0) {
+ deviceInStore.setSubscribeCycleForCatalog(device.getSubscribeCycleForCatalog());
+ // 鍙栨秷璁㈤槄
+ removeCatalogSubscribe(deviceInStore);
+ }
+ }
+
+ // 绉诲姩浣嶇疆璁㈤槄鐩稿叧鐨勪俊鎭�
+ if (device.getSubscribeCycleForMobilePosition() > 0) {
+ if (deviceInStore.getSubscribeCycleForMobilePosition() == 0 || deviceInStore.getSubscribeCycleForMobilePosition() != device.getSubscribeCycleForMobilePosition()) {
+ deviceInStore.setMobilePositionSubmissionInterval(device.getMobilePositionSubmissionInterval());
+ deviceInStore.setSubscribeCycleForMobilePosition(device.getSubscribeCycleForMobilePosition());
+ // 寮�鍚闃�
+ addMobilePositionSubscribe(deviceInStore);
+ }
+ }else if (device.getSubscribeCycleForMobilePosition() == 0) {
+ if (deviceInStore.getSubscribeCycleForMobilePosition() != 0) {
+ // 鍙栨秷璁㈤槄
+ removeMobilePositionSubscribe(deviceInStore);
+ }
+ }
+ // 鍧愭爣绯诲彉鍖栵紝闇�瑕侀噸鏂拌绠桮CJ02鍧愭爣鍜學GS84鍧愭爣
+ if (!deviceInStore.getGeoCoordSys().equals(device.getGeoCoordSys())) {
+ updateDeviceChannelGeoCoordSys(device);
+ }
+
+ String now = DateUtil.getNow();
+ device.setUpdateTime(now);
+ device.setCharset(device.getCharset().toUpperCase());
+ device.setUpdateTime(DateUtil.getNow());
+ if (deviceMapper.update(device) > 0) {
+ redisCatchStorage.updateDevice(device);
+
+ }
+ }
+
+ /**
+ * 鏇存柊閫氶亾鍧愭爣绯�
+ */
+ private void updateDeviceChannelGeoCoordSys(Device device) {
+ List<DeviceChannel> deviceChannels = deviceChannelMapper.getAllChannelWithCoordinate(device.getDeviceId());
+ if (deviceChannels.size() > 0) {
+ for (DeviceChannel deviceChannel : deviceChannels) {
+ if ("WGS84".equals(device.getGeoCoordSys())) {
+ deviceChannel.setLongitudeWgs84(deviceChannel.getLongitude());
+ deviceChannel.setLatitudeWgs84(deviceChannel.getLatitude());
+ Double[] position = Coordtransform.WGS84ToGCJ02(deviceChannel.getLongitude(), deviceChannel.getLatitude());
+ deviceChannel.setLongitudeGcj02(position[0]);
+ deviceChannel.setLatitudeGcj02(position[1]);
+ }else if ("GCJ02".equals(device.getGeoCoordSys())) {
+ deviceChannel.setLongitudeGcj02(deviceChannel.getLongitude());
+ deviceChannel.setLatitudeGcj02(deviceChannel.getLatitude());
+ Double[] position = Coordtransform.GCJ02ToWGS84(deviceChannel.getLongitude(), deviceChannel.getLatitude());
+ deviceChannel.setLongitudeWgs84(position[0]);
+ deviceChannel.setLatitudeWgs84(position[1]);
+ }
+ }
+ }
+ storage.updateChannels(device.getDeviceId(), deviceChannels);
+ }
}
--
Gitblit v1.8.0