From ff7ecd270c7d0b2cd1dd2ec078df0dbe62aad08d Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 21 一月 2021 09:24:58 +0800
Subject: [PATCH] Merge pull request #43 from lawrencehj/master
---
web_src/src/main.js | 3
src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceAlarm.java | 10 +-
src/main/java/com/genersoft/iot/vmp/gb28181/event/alarm/AlarmEvent.java | 26 ++++++
src/main/java/com/genersoft/iot/vmp/vmanager/SEEController/SEEController.java | 32 ++++++++
web_src/src/components/UiHeader.vue | 56 +++++++++++++
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java | 39 +++++++--
README.md | 1
src/main/java/com/genersoft/iot/vmp/gb28181/event/EventPublisher.java | 12 +++
src/main/java/com/genersoft/iot/vmp/gb28181/event/alarm/AlarmEventListener.java | 47 +++++++++++
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java | 1
10 files changed, 211 insertions(+), 16 deletions(-)
diff --git a/README.md b/README.md
index 19bcd51..724cfef 100644
--- a/README.md
+++ b/README.md
@@ -41,6 +41,7 @@
11. 鏀寔鍏綉閮ㄧ讲, 鏀寔wvp涓巣lm鍒嗗紑閮ㄧ讲
12. 鏀寔鎾斁h265, g.711鏍煎紡鐨勬祦
13. 鏀寔鍥哄畾娴佸湴鍧�鍜岃嚜鍔ㄧ偣鎾紝鍚屾椂鏀寔鏈偣鎾椂鐩存帴鎾斁娴佸湴鍧�锛屼唬鐮佽嚜鍔ㄥ彂璧风偣鎾�. ( [鏌ョ湅WIKI](https://github.com/648540858/wvp-GB28181-pro/wiki/%E5%A6%82%E4%BD%95%E4%BD%BF%E7%94%A8%E5%9B%BA%E5%AE%9A%E6%92%AD%E6%94%BE%E5%9C%B0%E5%9D%80%E4%B8%8E%E8%87%AA%E5%8A%A8%E7%82%B9%E6%92%AD)锛�
+14. 鎶ヨ淇℃伅澶勭悊锛屾敮鎸佸悜鍓嶇鎺ㄩ�佹姤璀︿俊鎭�
# 寰呭疄鐜帮細
涓婄骇绾ц仈
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceAlarm.java b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceAlarm.java
index d91a1c7..35cb6bf 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceAlarm.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/bean/DeviceAlarm.java
@@ -11,7 +11,7 @@
/**
* 鎶ヨ绾у埆, 1涓轰竴绾ц鎯�, 2涓轰簩绾ц鎯�, 3涓轰笁绾ц鎯�, 4涓哄洓绾� 璀︽儏-
*/
- private String alarmPriorit;
+ private String alarmPriority;
/**
* 鎶ヨ鏂瑰紡 , 1涓虹數璇濇姤璀�, 2涓鸿澶囨姤璀�, 3涓虹煭淇℃姤璀�, 4涓� GPS鎶ヨ, 5涓鸿棰戞姤璀�, 6涓鸿澶囨晠闅滄姤璀�,
@@ -53,12 +53,12 @@
this.deviceId = deviceId;
}
- public String getAlarmPriorit() {
- return alarmPriorit;
+ public String getAlarmPriority() {
+ return alarmPriority;
}
- public void setAlarmPriorit(String alarmPriorit) {
- this.alarmPriorit = alarmPriorit;
+ public void setAlarmPriority(String alarmPriority) {
+ this.alarmPriority = alarmPriority;
}
public String getAlarmMethod() {
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/event/EventPublisher.java b/src/main/java/com/genersoft/iot/vmp/gb28181/event/EventPublisher.java
index ebf0430..50f6bc0 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/event/EventPublisher.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/event/EventPublisher.java
@@ -4,6 +4,8 @@
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.stereotype.Component;
+import com.genersoft.iot.vmp.gb28181.bean.DeviceAlarm;
+import com.genersoft.iot.vmp.gb28181.event.alarm.AlarmEvent;
import com.genersoft.iot.vmp.gb28181.event.offline.OfflineEvent;
import com.genersoft.iot.vmp.gb28181.event.online.OnlineEvent;
@@ -31,4 +33,14 @@
outEvent.setFrom(from);
applicationEventPublisher.publishEvent(outEvent);
}
+
+ /**
+ * 璁惧鎶ヨ浜嬩欢
+ * @param deviceAlarm
+ */
+ public void deviceAlarmEventPublish(DeviceAlarm deviceAlarm) {
+ AlarmEvent alarmEvent = new AlarmEvent(this);
+ alarmEvent.setAlarmInfo(deviceAlarm);
+ applicationEventPublisher.publishEvent(alarmEvent);
+ }
}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/event/alarm/AlarmEvent.java b/src/main/java/com/genersoft/iot/vmp/gb28181/event/alarm/AlarmEvent.java
new file mode 100644
index 0000000..fecc8b1
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/event/alarm/AlarmEvent.java
@@ -0,0 +1,26 @@
+package com.genersoft.iot.vmp.gb28181.event.alarm;
+
+import com.genersoft.iot.vmp.gb28181.bean.DeviceAlarm;
+import org.springframework.context.ApplicationEvent;
+
+/**
+ * @description: 鎶ヨ浜嬩欢
+ * @author: lawrencehj
+ * @data: 2021-01-20
+ */
+
+public class AlarmEvent extends ApplicationEvent {
+ public AlarmEvent(Object source) {
+ super(source);
+ }
+
+ private DeviceAlarm deviceAlarm;
+
+ public DeviceAlarm getAlarmInfo() {
+ return deviceAlarm;
+ }
+
+ public void setAlarmInfo(DeviceAlarm deviceAlarm) {
+ this.deviceAlarm = deviceAlarm;
+ }
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/event/alarm/AlarmEventListener.java b/src/main/java/com/genersoft/iot/vmp/gb28181/event/alarm/AlarmEventListener.java
new file mode 100644
index 0000000..1b2f672
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/event/alarm/AlarmEventListener.java
@@ -0,0 +1,47 @@
+package com.genersoft.iot.vmp.gb28181.event.alarm;
+
+import org.springframework.context.ApplicationListener;
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
+import java.io.IOException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @description: 鎶ヨ浜嬩欢鐩戝惉
+ * @author: lawrencehj
+ * @data: 2021-01-20
+ */
+
+@Component
+public class AlarmEventListener implements ApplicationListener<AlarmEvent> {
+
+ private final static Logger logger = LoggerFactory.getLogger(AlarmEventListener.class);
+
+ private static SseEmitter emitter = new SseEmitter();
+
+ public void addSseEmitters(SseEmitter sseEmitter) {
+ emitter = sseEmitter;
+ }
+
+ @Override
+ public void onApplicationEvent(AlarmEvent event) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("璁惧鎶ヨ浜嬩欢瑙﹀彂锛宒eviceId锛�" + event.getAlarmInfo().getDeviceId() + ", "
+ + event.getAlarmInfo().getAlarmDescription());
+ }
+ try {
+ String msg = "<strong>璁惧缂栫爜锛�</strong> <i>" + event.getAlarmInfo().getDeviceId() + "</i>"
+ + "<br><strong>鎶ヨ鎻忚堪锛�</strong> <i>" + event.getAlarmInfo().getAlarmDescription() + "</i>"
+ + "<br><strong>鎶ヨ鏃堕棿锛�</strong> <i>" + event.getAlarmInfo().getAlarmTime() + "</i>"
+ + "<br><strong>瀹氫綅缁忓害锛�</strong> <i>" + event.getAlarmInfo().getLongitude() + "</i>"
+ + "<br><strong>瀹氫綅绾害锛�</strong> <i>" + event.getAlarmInfo().getLatitude() + "</i>";
+ emitter.send(msg);
+ } catch (IOException e) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("SSE 閫氶亾宸插叧闂�");
+ }
+ // e.printStackTrace();
+ }
+ }
+}
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java
index fbdc7e2..73e67e5 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/MessageRequestProcessor.java
@@ -21,6 +21,7 @@
import com.genersoft.iot.vmp.common.VideoManagerConstants;
import com.genersoft.iot.vmp.gb28181.bean.Device;
+import com.genersoft.iot.vmp.gb28181.bean.DeviceAlarm;
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
import com.genersoft.iot.vmp.gb28181.bean.RecordInfo;
import com.genersoft.iot.vmp.gb28181.bean.RecordItem;
@@ -289,19 +290,41 @@
// storager.queryChannel(deviceId)
return;
}
- device.setName(XmlUtil.getText(rootElement, "DeviceName"));
- device.setManufacturer(XmlUtil.getText(rootElement, "Manufacturer"));
- device.setModel(XmlUtil.getText(rootElement, "Model"));
- device.setFirmware(XmlUtil.getText(rootElement, "Firmware"));
- if (StringUtils.isEmpty(device.getStreamMode())) {
- device.setStreamMode("UDP");
+
+ DeviceAlarm deviceAlarm = new DeviceAlarm();
+ deviceAlarm.setDeviceId(deviceId);
+ deviceAlarm.setAlarmPriority(XmlUtil.getText(rootElement, "AlarmPriority"));
+ deviceAlarm.setAlarmMethod(XmlUtil.getText(rootElement, "AlarmMethod"));
+ deviceAlarm.setAlarmTime(XmlUtil.getText(rootElement, "AlarmTime"));
+ if (XmlUtil.getText(rootElement, "AlarmDescription") == null) {
+ deviceAlarm.setAlarmDescription("");
+ } else {
+ deviceAlarm.setAlarmDescription(XmlUtil.getText(rootElement, "AlarmDescription"));
}
- storager.updateDevice(device);
+ if (XmlUtil.getText(rootElement, "Longitude") == null || XmlUtil.getText(rootElement, "Longitude") == "") {
+ deviceAlarm.setLongitude(0.00);
+ } else {
+ deviceAlarm.setLongitude(Double.parseDouble(XmlUtil.getText(rootElement, "Longitude")));
+ }
+ if (XmlUtil.getText(rootElement, "Latitude") == null || XmlUtil.getText(rootElement, "Latitude") =="") {
+ deviceAlarm.setLatitude(0.00);
+ } else {
+ deviceAlarm.setLatitude(Double.parseDouble(XmlUtil.getText(rootElement, "Latitude")));
+ }
+
+ // device.setName(XmlUtil.getText(rootElement, "DeviceName"));
+ // device.setManufacturer(XmlUtil.getText(rootElement, "Manufacturer"));
+ // device.setModel(XmlUtil.getText(rootElement, "Model"));
+ // device.setFirmware(XmlUtil.getText(rootElement, "Firmware"));
+ // if (StringUtils.isEmpty(device.getStreamMode())) {
+ // device.setStreamMode("UDP");
+ // }
+ // storager.updateDevice(device);
//cmder.catalogQuery(device, null);
// 鍥炲200 OK
responseAck(evt);
if (offLineDetector.isOnline(deviceId)) {
- publisher.onlineEventPublish(deviceId, VideoManagerConstants.EVENT_ONLINE_KEEPLIVE);
+ publisher.deviceAlarmEventPublish(deviceAlarm);
}
} catch (DocumentException | SipException | InvalidArgumentException | ParseException e) {
// } catch (DocumentException e) {
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
index 57dc96d..11b728a 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceChannelMapper.java
@@ -59,6 +59,7 @@
" WHERE 1=1 " +
" <if test=\"hasSubChannel == true\" > AND subCount >0</if>" +
" <if test=\"hasSubChannel == false\" > AND subCount=0</if>" +
+ " ORDER BY channelId ASC" +
" </script>"})
List<DeviceChannel> queryChannelsByDeviceId(String deviceId, String parentChannelId, String query, Boolean hasSubChannel, Boolean online);
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/SEEController/SEEController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/SEEController/SEEController.java
new file mode 100644
index 0000000..689b967
--- /dev/null
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/SEEController/SEEController.java
@@ -0,0 +1,32 @@
+package com.genersoft.iot.vmp.vmanager.SEEController;
+
+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.servlet.mvc.method.annotation.SseEmitter;
+
+/**
+ * @description: SSE鎺ㄩ��
+ * @author: lawrencehj
+ * @data: 2021-01-20
+ */
+
+@Controller
+@RequestMapping("/api")
+public class SEEController {
+ @Autowired
+ AlarmEventListener alarmEventListener;
+
+ //璁剧疆鍝嶅簲
+ @RequestMapping("/emit")
+ public SseEmitter emit() {
+ SseEmitter sseEmitter = new SseEmitter(0L);
+ try {
+ alarmEventListener.addSseEmitters(sseEmitter);
+ }catch (Exception e){
+ sseEmitter.completeWithError(e);
+ }
+ return sseEmitter;
+ }
+}
diff --git a/web_src/src/components/UiHeader.vue b/web_src/src/components/UiHeader.vue
index 832d69e..f16beba 100644
--- a/web_src/src/components/UiHeader.vue
+++ b/web_src/src/components/UiHeader.vue
@@ -4,7 +4,7 @@
<el-menu-item index="/">鎺у埗鍙�</el-menu-item>
<el-menu-item index="/videoList">璁惧鍒楄〃</el-menu-item>
<!-- <el-menu-item index="/videoReplay">褰曞儚鍥炵湅</el-menu-item> -->
- <!-- <el-menu-item index="4">绾ц仈璁剧疆</el-menu-item> -->
+ <el-switch v-model="alarmNotify" active-text="鎶ヨ淇℃伅鎺ㄩ��" style="display: block float: right" @change="sseControl"></el-switch>
<el-menu-item style="float: right;" @click="loginout">閫�鍑�</el-menu-item>
</el-menu>
</div>
@@ -13,14 +13,64 @@
<script>
export default {
name: "UiHeader",
+ components: { Notification },
+ data() {
+ return {
+ alarmNotify: true,
+ sseSource: null,
+ };
+ },
methods:{
loginout(){
// 鍒犻櫎cookie锛屽洖鍒扮櫥褰曢〉闈�
this.$cookies.remove("session");
this.$router.push('/login');
+ this.sseSource.close();
},
- }
-}
+ beforeunloadHandler() {
+ this.sseSource.close();
+ },
+ sseControl() {
+ let that = this;
+ if (this.alarmNotify) {
+ this.sseSource = new EventSource('/api/emit');
+ this.sseSource.addEventListener('message', function(evt) {
+ that.$notify({
+ title: '鏀跺埌鎶ヨ淇℃伅',
+ dangerouslyUseHTMLString: true,
+ message: evt.data,
+ type: 'warning'
+ });
+ console.log("鏀跺埌淇℃伅锛�" + evt.data);
+ });
+ this.sseSource.addEventListener('open', function(e) {
+ console.log("SSE杩炴帴鎵撳紑.");
+ }, false);
+ this.sseSource.addEventListener('error', function(e) {
+ if (e.target.readyState == EventSource.CLOSED) {
+ console.log("SSE杩炴帴鍏抽棴");
+ } else {
+ console.log(e.target.readyState);
+ }
+ }, false);
+ } else {
+ this.sseSource.removeEventListener('open', null);
+ this.sseSource.removeEventListener('message', null);
+ this.sseSource.removeEventListener('error', null);
+ this.sseSource.close();
+ }
+ }
+ },
+ mounted() {
+ window.addEventListener('beforeunload', e => this.beforeunloadHandler(e))
+ // window.addEventListener('unload', e => this.unloadHandler(e))
+ this.sseControl();
+ },
+ destroyed() {
+ window.removeEventListener('beforeunload', e => this.beforeunloadHandler(e))
+ // window.removeEventListener('unload', e => this.unloadHandler(e))
+ },
+ }
</script>
diff --git a/web_src/src/main.js b/web_src/src/main.js
index 6f88c2a..ae2baee 100644
--- a/web_src/src/main.js
+++ b/web_src/src/main.js
@@ -9,10 +9,13 @@
import echarts from 'echarts';
import VueClipboard from 'vue-clipboard2'
+import { Notification } from 'element-ui';
+
Vue.use(VueClipboard)
Vue.use(ElementUI);
Vue.use(VueCookies);
Vue.prototype.$axios = axios;
+Vue.prototype.$notify = Notification;
axios.defaults.baseURL = (process.env.NODE_ENV === 'development') ? process.env.BASE_API : "";
--
Gitblit v1.8.0