From 5d901b5e3f033e8b04e53420d68626cbd87431c8 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 06 五月 2022 10:12:34 +0800
Subject: [PATCH] 使用阿里代码规范。规范代码写法
---
src/main/java/com/genersoft/iot/vmp/service/impl/DeviceServiceImpl.java | 89 +++++++++++++++++++++++++++++++++++---------
1 files changed, 71 insertions(+), 18 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 595f38c..39a59f8 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
@@ -3,13 +3,24 @@
import com.genersoft.iot.vmp.conf.DynamicTask;
import com.genersoft.iot.vmp.gb28181.bean.Device;
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.service.IDeviceService;
-import com.genersoft.iot.vmp.service.bean.CatalogSubscribeTask;
+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.storager.IRedisCatchStorage;
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 javax.sip.DialogState;
+
+/**
+ * 璁惧涓氬姟锛堢洰褰曡闃咃級
+ */
@Service
public class DeviceServiceImpl implements IDeviceService {
@@ -17,22 +28,28 @@
@Autowired
private DynamicTask dynamicTask;
-;
@Autowired
private ISIPCommander sipCommander;
+
+ @Autowired
+ private CatalogResponseMessageHandler catalogResponseMessageHandler;
+
+ @Autowired
+ private IRedisCatchStorage redisCatchStorage;
@Override
public boolean addCatalogSubscribe(Device device) {
if (device == null || device.getSubscribeCycleForCatalog() < 0) {
return false;
}
+ logger.info("[娣诲姞鐩綍璁㈤槄] 璁惧{}", device.getDeviceId());
// 娣诲姞鐩綍璁㈤槄
- CatalogSubscribeTask catalogSubscribeTask = new CatalogSubscribeTask(device, sipCommander);
- catalogSubscribeTask.run();
+ CatalogSubscribeTask catalogSubscribeTask = new CatalogSubscribeTask(device, sipCommander, dynamicTask);
// 鎻愬墠寮�濮嬪埛鏂拌闃�
- String cron = getCron(device.getSubscribeCycleForCatalog() - 60);
- dynamicTask.startCron(device.getDeviceId(), catalogSubscribeTask, cron);
+ int subscribeCycleForCatalog = Math.max(device.getSubscribeCycleForCatalog(),30);
+ // 璁剧疆鏈�灏忓�间负30
+ dynamicTask.startCron(device.getDeviceId() + "catalog", catalogSubscribeTask, subscribeCycleForCatalog -1);
return true;
}
@@ -41,21 +58,57 @@
if (device == null || device.getSubscribeCycleForCatalog() < 0) {
return false;
}
- dynamicTask.stopCron(device.getDeviceId());
+ logger.info("绉婚櫎鐩綍璁㈤槄: {}", device.getDeviceId());
+ dynamicTask.stop(device.getDeviceId() + "catalog");
return true;
}
- public String getCron(int time) {
- if (time <= 59) {
- return "0/" + time +" * * * * ?";
- }else if (time <= 60* 59) {
- int minute = time/(60);
- return "0 0/" + minute +" * * * ?";
- }else if (time <= 60* 60* 59) {
- int hour = time/(60*60);
- return "0 0 0/" + hour +" * * ?";
- }else {
- return "0 0/10 * * * ?";
+ @Override
+ public boolean addMobilePositionSubscribe(Device device) {
+ if (device == null || device.getSubscribeCycleForMobilePosition() < 0) {
+ return false;
}
+ logger.info("[娣诲姞绉诲姩浣嶇疆璁㈤槄] 璁惧{}", device.getDeviceId());
+ // 娣诲姞鐩綍璁㈤槄
+ MobilePositionSubscribeTask mobilePositionSubscribeTask = new MobilePositionSubscribeTask(device, sipCommander, dynamicTask);
+ // 璁剧疆鏈�灏忓�间负30
+ int subscribeCycleForCatalog = Math.max(device.getSubscribeCycleForMobilePosition(),30);
+ // 鎻愬墠寮�濮嬪埛鏂拌闃�
+ dynamicTask.startCron(device.getDeviceId() + "mobile_position" , mobilePositionSubscribeTask, subscribeCycleForCatalog -1 );
+ return true;
+ }
+
+ @Override
+ public boolean removeMobilePositionSubscribe(Device device) {
+ if (device == null || device.getSubscribeCycleForCatalog() < 0) {
+ return false;
+ }
+ logger.info("绉婚櫎绉诲姩浣嶇疆璁㈤槄: {}", device.getDeviceId());
+ dynamicTask.stop(device.getDeviceId() + "mobile_position");
+ return true;
+ }
+
+ @Override
+ public SyncStatus getChannelSyncStatus(String deviceId) {
+ return catalogResponseMessageHandler.getChannelSyncProgress(deviceId);
+ }
+
+ @Override
+ public Boolean isSyncRunning(String deviceId) {
+ return catalogResponseMessageHandler.isSyncRunning(deviceId);
+ }
+
+ @Override
+ public void sync(Device device) {
+ if (catalogResponseMessageHandler.isSyncRunning(device.getDeviceId())) {
+ logger.info("寮�鍚悓姝ユ椂鍙戠幇鍚屾宸茬粡瀛樺湪");
+ return;
+ }
+ int sn = (int)((Math.random()*9+1)*100000);
+ catalogResponseMessageHandler.setChannelSyncReady(device, sn);
+ sipCommander.catalogQuery(device, sn, event -> {
+ String errorMsg = String.format("鍚屾閫氶亾澶辫触锛岄敊璇爜锛� %s, %s", event.statusCode, event.msg);
+ catalogResponseMessageHandler.setChannelSyncEnd(device.getDeviceId(), errorMsg);
+ });
}
}
--
Gitblit v1.8.0