diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/config/RocketMQClusterConfig.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/config/RocketMQClusterConfig.java deleted file mode 100644 index 3ece5107..00000000 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/config/RocketMQClusterConfig.java +++ /dev/null @@ -1,75 +0,0 @@ -//package org.dromara.sis.config; -// -//import org.apache.rocketmq.client.producer.DefaultMQProducer; -//import org.apache.rocketmq.spring.core.RocketMQTemplate; -//import org.springframework.beans.factory.annotation.Qualifier; -//import org.springframework.beans.factory.annotation.Value; -//import org.springframework.context.annotation.Bean; -//import org.springframework.context.annotation.Configuration; -// -///** -// * @author lsm -// * @apiNote RocketMQClusterConfig -// * @since 2025/8/26 -// */ -//@Configuration -//public class RocketMQClusterConfig { -// -// // 从配置文件中读取 cluster 的配置 -// @Value("${rocketmq.cluster1.name-server}") -// private String nameServer1; -// -// @Value("${rocketmq.cluster1.producer.group}") -// private String producerGroup1; -// -// // 为第一个集群创建生产者实例 -// @Bean({"clusterProducerOne"}) -// public DefaultMQProducer clusterProducerOne() throws Exception { -// DefaultMQProducer producer = new DefaultMQProducer(producerGroup1); -// producer.setNamesrvAddr(nameServer1); -// // 设置发送超时时间 -// producer.setSendMsgTimeout(5000); -// // 设置重试次数 -// producer.setRetryTimesWhenSendFailed(2); -// producer.setRetryTimesWhenSendAsyncFailed(2); -// return producer; -// } -// -// // 使用上面的生产者实例创建 RocketMQTemplate -// @Bean("rocketMQTemplateClusterOne") -// public RocketMQTemplate rocketMQTemplateClusterOne(@Qualifier("clusterProducerOne") DefaultMQProducer producer) { -// RocketMQTemplate template = new RocketMQTemplate(); -// template.setProducer(producer); -// return template; -// } -// -// -// // 从配置文件中读取 cluster 的配置 -//// @Value("${rocketmq.cluster2.name-server}") -//// private String nameServer2; -//// -//// @Value("${rocketmq.cluster2.producer.group}") -//// private String producerGroup2; -//// -//// // 为第二个集群创建生产者实例 -//// @Bean({"clusterProducerTwo"}) -//// public DefaultMQProducer clusterProducerTwo() throws Exception { -//// DefaultMQProducer producer = new DefaultMQProducer(producerGroup2); -//// producer.setNamesrvAddr(nameServer2); -//// // 设置发送超时时间 -//// producer.setSendMsgTimeout(5000); -//// // 设置重试次数 -//// producer.setRetryTimesWhenSendFailed(2); -//// producer.setRetryTimesWhenSendAsyncFailed(2); -//// return producer; -//// } -//// -//// // 使用上面的生产者实例创建 RocketMQTemplate -//// @Bean("rocketMQTemplateClusterTwo") -//// public RocketMQTemplate rocketMQTemplateClusterTwo(@Qualifier("clusterProducerTwo") DefaultMQProducer producer) { -//// RocketMQTemplate template = new RocketMQTemplate(); -//// template.setProducer(producer); -//// return template; -//// } -// -//} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/rocketmq/consumer/MeterRecordConsumer.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/rocketmq/consumer/MeterRecordConsumer.java deleted file mode 100644 index 3a0a80d0..00000000 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/rocketmq/consumer/MeterRecordConsumer.java +++ /dev/null @@ -1,44 +0,0 @@ -//package org.dromara.sis.rocketmq.consumer; -// -//import lombok.RequiredArgsConstructor; -//import lombok.extern.slf4j.Slf4j; -//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.producer.ProducerService; -//import org.springframework.stereotype.Component; -// -///** -// * @author lsm -// * @apiNote MeterRecordConsumer -// * @since 2025/8/25 -// */ -//@Slf4j -//@Component -//@RequiredArgsConstructor -//@RocketMQMessageListener( -// topic = RocketMqConstants.TOPIC, -// consumerGroup = RocketMqConstants.METER_GROUP, -// selectorExpression = RocketMqConstants.METER_RECORD, -// nameServer = "${rocketmq.cluster1.name-server}" -//) -//public class MeterRecordConsumer implements RocketMQListener { -// -// private final ProducerService producerService; -// -// @Override -// public void onMessage(MessageExt ext) { -// try { -// if (ext.getBody() == null) { -// log.info("仪表上报消息数据,不转发!"); -// } else { -// producerService.defaultSend(RocketMqConstants.TOPIC, RocketMqConstants.METER_RECORD, new String(ext.getBody())); -// log.info("转发仪表上报数据处理成功"); -// } -// } catch (Exception e) { -// log.error("转发仪表上报数据处理失败,", e); -// } -// -// } -//} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/rocketmq/producer/ProducerService.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/rocketmq/producer/ProducerService.java deleted file mode 100644 index aa14c739..00000000 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/rocketmq/producer/ProducerService.java +++ /dev/null @@ -1,65 +0,0 @@ -//package org.dromara.sis.rocketmq.producer; -// -//import lombok.extern.slf4j.Slf4j; -//import org.apache.rocketmq.common.message.Message; -//import org.apache.rocketmq.spring.core.RocketMQTemplate; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.beans.factory.annotation.Qualifier; -//import org.springframework.stereotype.Component; -// -///** -// * @author lsm -// * @apiNote ProducerService -// * @since 2025/8/26 -// */ -//@Slf4j -//@Component -//public class ProducerService { -// -// @Autowired -// @Qualifier("rocketMQTemplateClusterOne") -// private RocketMQTemplate rocketMQTemplateClusterOne; -// -//// @Autowired -//// @Qualifier("rocketMQTemplateClusterTwo") -//// private RocketMQTemplate rocketMQTemplateClusterTwo; -// -// /** -// * 向mq写入消息 -// * -// * @param topic 消息topic -// * @param tag 消息tag -// * @param msg 消息 -// */ -// public void defaultSend(String topic, String tag, String msg) { -// try { -// String destination = topic + ":" + tag; -// // 使用 RocketMQTemplate 的同步发送方法 -// rocketMQTemplateClusterOne.syncSend(destination, msg); -// -// log.info("发送RocketMQOne消息成功, nameServer:{}", rocketMQTemplateClusterOne.getProducer().getNamesrvAddr()); -// } catch (Exception e) { -// log.error("发送RocketMQOne消息失败", e); -// } -// } -// -// -// /** -// * 向mq写入消息 -// * -// * @param topic 消息topic -// * @param tag 消息tag -// * @param msg 消息 -// */ -//// public void clusterSend(String topic, String tag, String msg) { -//// try { -//// String destination = topic + ":" + tag; -//// // 使用 RocketMQTemplate 的同步发送方法 -//// rocketMQTemplateClusterTwo.syncSend(destination, msg); -//// -//// log.info("发送RocketMQTwo消息成功, nameServer:{}", rocketMQTemplateClusterTwo.getProducer().getNamesrvAddr()); -//// } catch (Exception e) { -//// log.error("发送RocketMQTwo消息失败", e); -//// } -//// } -//} diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/zkmedia/ZLMediaKitServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/zkmedia/ZLMediaKitServiceImpl.java index 83d4ecf7..b2fd8c46 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/zkmedia/ZLMediaKitServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/zkmedia/ZLMediaKitServiceImpl.java @@ -80,6 +80,8 @@ public class ZLMediaKitServiceImpl implements ZLMediaKitService { if (resp == null) { resp = new AddStreamProxyResp(); } + resp.setApp(app); + resp.setStreamId(streamId); // RTMP 播放地址 resp.setRtmp(String.format(RTMP_PLAY_URL, zlmConfig.getIp(), zlmConfig.getRtmpPort(), app, streamId)); // RTSP 播放地址 @@ -88,9 +90,9 @@ public class ZLMediaKitServiceImpl implements ZLMediaKitService { resp.setFlv(String.format(HTTP_FLV_PLAY_URL, zlmConfig.getIp(), zlmConfig.getHttpPort(), app, streamId)); resp.setWsFlv(String.format(WS_FLV_PLAY_URL, zlmConfig.getIp(), zlmConfig.getHttpPort(), app, streamId)); // HLS 播放地址 - resp.setHls(String.format(HLS_FLV_PLAY_URL, zlmConfig.getIp(), zlmConfig.getHttpPort(), app, streamId)); +// resp.setHls(String.format(HLS_FLV_PLAY_URL, zlmConfig.getIp(), zlmConfig.getHttpPort(), app, streamId)); // MP4 播放地址 - resp.setMp4(String.format(MP4_FLV_PLAY_URL, zlmConfig.getIp(), zlmConfig.getHttpPort(), app, streamId)); +// resp.setMp4(String.format(MP4_FLV_PLAY_URL, zlmConfig.getIp(), zlmConfig.getHttpPort(), app, streamId)); return resp; } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/zkmedia/model/AddStreamProxyResp.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/zkmedia/model/AddStreamProxyResp.java index 051e62a9..dbde518d 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/zkmedia/model/AddStreamProxyResp.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/sdk/zkmedia/model/AddStreamProxyResp.java @@ -9,15 +9,24 @@ public class AddStreamProxyResp implements Serializable { private String key; + /** + * 应用 + */ + private String app; + + /** + * 流id + */ + private String streamId; + private String rtsp; - private String rtmp; - private String flv; private String wsFlv; - private String mp4; - private String hls; + + + } diff --git a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/ZeroSensationPassageServiceImpl.java b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/ZeroSensationPassageServiceImpl.java index aeb09875..7e950b65 100644 --- a/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/ZeroSensationPassageServiceImpl.java +++ b/ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/ZeroSensationPassageServiceImpl.java @@ -79,7 +79,7 @@ public class ZeroSensationPassageServiceImpl implements IZeroSensationPassageSer } else { if (Objects.equals(authRecord.getRosterType(), RosterTypeEnum.BLACK_LIST.getCode())) { log.info("人员[{}]在黑名单中,暂不处理。", person); -// alarmEventsService.createAlarmRecord(deviceIp, 3, 1, "黑名单人员入内", smallImg, bigImg); + alarmEventsService.createAlarmRecord(deviceIp, 3, 1, "黑名单人员入内", smallImg, bigImg); return; } }