From 9d19f6b9d6b361d8b93671a553973289b40d9d33 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 22 一月 2021 09:52:11 +0800
Subject: [PATCH] Merge pull request #46 from lawrencehj/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/vmanager/SseController/SseController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/SEEController/SEEController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/SseController/SseController.java
similarity index 67%
rename from src/main/java/com/genersoft/iot/vmp/vmanager/SEEController/SEEController.java
rename to src/main/java/com/genersoft/iot/vmp/vmanager/SseController/SseController.java
index 689b967..01af4a0 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/SEEController/SEEController.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/SseController/SseController.java
@@ -1,9 +1,10 @@
-package com.genersoft.iot.vmp.vmanager.SEEController;
+package com.genersoft.iot.vmp.vmanager.SseController;
import com.genersoft.iot.vmp.gb28181.event.alarm.AlarmEventListener;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
/**
@@ -14,16 +15,16 @@
@Controller
@RequestMapping("/api")
-public class SEEController {
+public class SseController {
@Autowired
AlarmEventListener alarmEventListener;
//璁剧疆鍝嶅簲
@RequestMapping("/emit")
- public SseEmitter emit() {
- SseEmitter sseEmitter = new SseEmitter(0L);
+ public SseEmitter emit(@RequestParam String browserId) {
+ final SseEmitter sseEmitter = new SseEmitter(0L);
try {
- alarmEventListener.addSseEmitters(sseEmitter);
+ alarmEventListener.addSseEmitters(browserId, sseEmitter);
}catch (Exception e){
sseEmitter.completeWithError(e);
}
--
Gitblit v1.8.0