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 { - 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 { - 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); }