From 046e9d925a12fe3ac06ff892a81ad4efce1093aa Mon Sep 17 00:00:00 2001
From: 15683799673 <liao@1234567>
Date: Sun, 31 Aug 2025 22:40:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=BA=E5=91=98=E8=81=9A?=
 =?UTF-8?q?=E9=9B=86=EF=BC=8C=E5=81=9C=E8=BD=A6=E6=B6=88=E8=B4=B9=E8=80=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/dromara/sis/rocketmq/RocketMqConstants.java    |  5 +++++
 .../sis/rocketmq/consumer/HighDensityConsumer.java     |  8 ++++----
 .../sis/rocketmq/consumer/ParkingDelayConsumer.java    | 10 +++++-----
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/rocketmq/RocketMqConstants.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/rocketmq/RocketMqConstants.java
index d4f0306d..8d055e38 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/rocketmq/RocketMqConstants.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/rocketmq/RocketMqConstants.java
@@ -9,10 +9,15 @@ public interface RocketMqConstants {
     // mq topic
     String TOPIC = "SmartParks";
 
+    /*-----------------------------------消息group------------------------------------*/
     // 人比比对消费者组
     String COMPAREGROUP = "SmartParks-compare";
     // 人脸抓拍消费者组
     String CAPTUREGROUP = "SmartParks-capture";
+    // 人员聚集消费组
+    String HIGH_DENSITY_GROUP = "SmartParks-highDensity";
+    // 停车消费组
+    String PARKING_GROUP = "SmartParks-parking";
 
     /*-----------------------------------消息tag------------------------------------*/
     String HIKADD = "ADD_HIK_DEVICE_TAG";
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/rocketmq/consumer/HighDensityConsumer.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/rocketmq/consumer/HighDensityConsumer.java
index ea75098f..677f876a 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/rocketmq/consumer/HighDensityConsumer.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/rocketmq/consumer/HighDensityConsumer.java
@@ -7,8 +7,8 @@ import org.apache.rocketmq.common.message.MessageExt;
 import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
 import org.apache.rocketmq.spring.core.RocketMQListener;
 import org.dromara.sis.rocketmq.RocketMqConstants;
-import org.dromara.sis.rocketmq.domain.FaceCapture;
 import org.dromara.sis.rocketmq.domain.HighDensity;
+import org.dromara.sis.service.IEventAlarmReportService;
 import org.dromara.sis.service.IZeroSensationPassageService;
 import org.springframework.stereotype.Component;
 
@@ -23,19 +23,19 @@ import org.springframework.stereotype.Component;
 @RequiredArgsConstructor
 @RocketMQMessageListener(
     topic = RocketMqConstants.TOPIC,
-    consumerGroup = RocketMqConstants.CAPTUREGROUP,
+    consumerGroup = RocketMqConstants.HIGH_DENSITY,
     selectorExpression = RocketMqConstants.HIGH_DENSITY
 )
 public class HighDensityConsumer implements RocketMQListener<MessageExt> {
 
-    private final IZeroSensationPassageService zeroSensationPassageService;
+    private final IEventAlarmReportService eventAlarmReportService;
 
     @Override
     public void onMessage(MessageExt ext) {
         log.info("消费人员聚集数据，数据长度={}", ext.getBody().length);
         try {
             HighDensity f = JSONObject.parseObject(ext.getBody(), HighDensity.class);
-
+            eventAlarmReportService.handleHighDensity(f);
         } catch (Exception e) {
             log.error("消费人脸抓拍数据处理失败，", e);
         }
diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/rocketmq/consumer/ParkingDelayConsumer.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/rocketmq/consumer/ParkingDelayConsumer.java
index 2d56261d..718a505a 100644
--- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/rocketmq/consumer/ParkingDelayConsumer.java
+++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/rocketmq/consumer/ParkingDelayConsumer.java
@@ -8,7 +8,7 @@ import org.apache.rocketmq.spring.annotation.RocketMQMessageListener;
 import org.apache.rocketmq.spring.core.RocketMQListener;
 import org.dromara.sis.rocketmq.RocketMqConstants;
 import org.dromara.sis.rocketmq.domain.ParkingReport;
-import org.dromara.sis.service.IZeroSensationPassageService;
+import org.dromara.sis.service.IEventAlarmReportService;
 import org.springframework.stereotype.Component;
 
 /**
@@ -22,19 +22,19 @@ import org.springframework.stereotype.Component;
 @RequiredArgsConstructor
 @RocketMQMessageListener(
     topic = RocketMqConstants.TOPIC,
-    consumerGroup = RocketMqConstants.CAPTUREGROUP,
-    selectorExpression = RocketMqConstants.HIGH_DENSITY
+    consumerGroup = RocketMqConstants.PARKING_GROUP,
+    selectorExpression = RocketMqConstants.PARKING_ALARM
 )
 public class ParkingDelayConsumer implements RocketMQListener<MessageExt> {
 
-    private final IZeroSensationPassageService zeroSensationPassageService;
+    private final IEventAlarmReportService eventAlarmReportService;
 
     @Override
     public void onMessage(MessageExt ext) {
         log.info("消费停车检测数据，数据长度={}", ext.getBody().length);
         try {
             ParkingReport report = JSONObject.parseObject(ext.getBody(), ParkingReport.class);
-
+            eventAlarmReportService.handleParking(report);
         } catch (Exception e) {
             log.error("消费人脸抓拍数据处理失败，", e);
         }