From 7d5a5b6c8fa20720a01986e9498a4cee6ec3674b Mon Sep 17 00:00:00 2001
From: xubinbin <1323875150@qq.com>
Date: 星期二, 30 五月 2023 13:24:46 +0800
Subject: [PATCH] 删除2.6.8升级2.6.9.sql文件中给表gb_stream添加主键sql，保证升级脚本能正常执行。
---
src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisGpsMsgListener.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisGpsMsgListener.java b/src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisGpsMsgListener.java
index b5d02a5..4e81a59 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisGpsMsgListener.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/redisMsg/RedisGpsMsgListener.java
@@ -1,6 +1,6 @@
package com.genersoft.iot.vmp.service.redisMsg;
-import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson2.JSON;
import com.genersoft.iot.vmp.service.bean.GPSMsgInfo;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
@@ -27,8 +27,6 @@
private final static Logger logger = LoggerFactory.getLogger(RedisGpsMsgListener.class);
- private boolean taskQueueHandlerRun = false;
-
@Autowired
private IRedisCatchStorage redisCatchStorage;
@@ -44,17 +42,21 @@
@Override
public void onMessage(@NotNull Message message, byte[] bytes) {
+ boolean isEmpty = taskQueue.isEmpty();
taskQueue.offer(message);
- if (!taskQueueHandlerRun) {
- taskQueueHandlerRun = true;
+ if (isEmpty) {
taskExecutor.execute(() -> {
while (!taskQueue.isEmpty()) {
Message msg = taskQueue.poll();
- GPSMsgInfo gpsMsgInfo = JSON.parseObject(msg.getBody(), GPSMsgInfo.class);
- // 鍙槸鏀惧叆redis缂撳瓨璧锋潵
- redisCatchStorage.updateGpsMsgInfo(gpsMsgInfo);
+ try {
+ GPSMsgInfo gpsMsgInfo = JSON.parseObject(msg.getBody(), GPSMsgInfo.class);
+ // 鍙槸鏀惧叆redis缂撳瓨璧锋潵
+ redisCatchStorage.updateGpsMsgInfo(gpsMsgInfo);
+ }catch (Exception e) {
+ logger.warn("[REDIS鐨凙LARM閫氱煡] 鍙戠幇鏈鐞嗙殑寮傚父, \r\n{}", JSON.toJSONString(message));
+ logger.error("[REDIS鐨凙LARM閫氱煡] 寮傚父鍐呭锛� ", e);
+ }
}
- taskQueueHandlerRun = false;
});
}
}
--
Gitblit v1.8.0