From 34f2832bef490cdce29ebb60c3bf17c3d9160f8a Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 28 七月 2022 11:22:51 +0800
Subject: [PATCH] 优化gps信息存入数据库
---
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookSubscribe.java | 1
/dev/null | 38 -------------------
src/main/java/com/genersoft/iot/vmp/service/impl/RedisGpsMsgListener.java | 22 +++++++++++
3 files changed, 22 insertions(+), 39 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookSubscribe.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookSubscribe.java
index ffd8ec9..587e7c4 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookSubscribe.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookSubscribe.java
@@ -60,7 +60,6 @@
}
result = result && key.getString(s).equals(hookResponse.getString(s));
}
-
}
if (null != result && result) {
event = eventMap.get(key);
diff --git a/src/main/java/com/genersoft/iot/vmp/service/StreamGPSSubscribeTask.java b/src/main/java/com/genersoft/iot/vmp/service/StreamGPSSubscribeTask.java
deleted file mode 100644
index 9d15c1f..0000000
--- a/src/main/java/com/genersoft/iot/vmp/service/StreamGPSSubscribeTask.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.genersoft.iot.vmp.service;
-
-import com.genersoft.iot.vmp.service.bean.GPSMsgInfo;
-import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-
-/**
- * 瀹氭椂鏌ユ壘redis涓殑GPS鎺ㄩ�佹秷鎭紝骞朵繚瀛樺埌瀵瑰簲鐨勬祦涓�
- */
-@Component
-public class StreamGPSSubscribeTask {
-
- @Autowired
- private IRedisCatchStorage redisCatchStorage;
-
- @Autowired
- private IVideoManagerStorage storager;
-
-
- @Scheduled(fixedRate = 30 * 1000) //姣�30绉掓墽琛屼竴娆�
- public void execute(){
- List<GPSMsgInfo> gpsMsgInfo = redisCatchStorage.getAllGpsMsgInfo();
- if (gpsMsgInfo.size() > 0) {
- storager.updateStreamGPS(gpsMsgInfo);
- for (GPSMsgInfo msgInfo : gpsMsgInfo) {
- msgInfo.setStored(true);
- redisCatchStorage.updateGpsMsgInfo(msgInfo);
- }
- }
-
- }
-}
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/RedisGpsMsgListener.java b/src/main/java/com/genersoft/iot/vmp/service/impl/RedisGpsMsgListener.java
index d5a26e7..4e94d68 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/RedisGpsMsgListener.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/RedisGpsMsgListener.java
@@ -4,6 +4,7 @@
import com.genersoft.iot.vmp.gb28181.bean.HandlerCatchData;
import com.genersoft.iot.vmp.service.bean.GPSMsgInfo;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -11,9 +12,11 @@
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.data.redis.connection.Message;
import org.springframework.data.redis.connection.MessageListener;
+import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Component;
+import java.util.List;
import java.util.concurrent.ConcurrentLinkedQueue;
/**
@@ -29,6 +32,9 @@
@Autowired
private IRedisCatchStorage redisCatchStorage;
+
+ @Autowired
+ private IVideoManagerStorage storager;
private final ConcurrentLinkedQueue<Message> taskQueue = new ConcurrentLinkedQueue<>();
@@ -46,10 +52,26 @@
while (!taskQueue.isEmpty()) {
Message msg = taskQueue.poll();
GPSMsgInfo gpsMsgInfo = JSON.parseObject(msg.getBody(), GPSMsgInfo.class);
+ // 鍙槸鏀惧叆redis缂撳瓨璧锋潵
redisCatchStorage.updateGpsMsgInfo(gpsMsgInfo);
}
taskQueueHandlerRun = false;
});
}
}
+
+ /**
+ * 瀹氭椂灏嗙粡绾害鏇存柊鍒版暟鎹簱
+ */
+ @Scheduled(fixedRate = 2 * 1000) //姣�2绉掓墽琛屼竴娆�
+ public void execute(){
+ List<GPSMsgInfo> gpsMsgInfo = redisCatchStorage.getAllGpsMsgInfo();
+ if (gpsMsgInfo.size() > 0) {
+ storager.updateStreamGPS(gpsMsgInfo);
+ for (GPSMsgInfo msgInfo : gpsMsgInfo) {
+ msgInfo.setStored(true);
+ redisCatchStorage.updateGpsMsgInfo(msgInfo);
+ }
+ }
+ }
}
--
Gitblit v1.8.0