From 410d60a969a73d4d71b6747f01b9f683669465b8 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 14 May 2021 16:42:26 +0800
Subject: [PATCH] 海康报文保存
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java
index 18ca512..a7fc985 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java
@@ -157,6 +157,19 @@
}
List<String> outData = new ArrayList<>();
+
+ switch (content.substring(0, 4)) {
+ //海康设备报文记录
+ case "HK": {
+ //报文内容保存
+ Message message = new Message();
+ message.setEnumber(ChannelName);
+ message.setContent(body);
+ message.setTime(df.format(day));
+ serverHandler.messageService.save(message);
+ }
+ }
+
switch (content.substring(0, 2)) {
case "LA": {
System.out.println("按下按钮+++++++++++++++++++++++++++++++++");
@@ -180,8 +193,6 @@
alarm.setWd((String) list.get(0).get("wd"));//纬度
alarm.setCid(String.valueOf(a));//警情代码
alarm.setJtype("0");
- //修改设备状态
- serverHandler.equipmentService.updateExstate("一键报警",null,(String) list.get(0).get("deviceNumber"));
switch (num) {
case "00":
if (fqbm.equals("0")) {
@@ -1735,6 +1746,10 @@
serverHandler.messageService.save(message);
if(alarm.getWaringType().equals("紧急求救")){
+
+ //修改设备状态
+ serverHandler.equipmentService.updateExstate("一键报警",null,(String) list.get(0).get("deviceNumber"));
+
//警情分发测试代码
//查询所有闲置的接警员
List<User> policeList = serverHandler.alarmService.queryPolice();
@@ -1742,14 +1757,17 @@
List<User> zx_police = new ArrayList<>();
for (int i = 0; i < policeList.size(); i++) {
//System.out.println(policeList.get(i).get("real_name"));
- if(policeList.get(i).getOnline_status().equals("1")){
+ if (null!=policeList.get(i).getOnline_status()){
+ if(policeList.get(i).getOnline_status().equals("1")){
zx_police.add(policeList.get(i));
- if (policeList.get(i).getWork_status().equals("0")){
- online_police.add(policeList.get(i));
+ if(null!=policeList.get(i).getWork_status()){
+ if (policeList.get(i).getWork_status().equals("0")){
+ online_police.add(policeList.get(i));
+ }
+ }
}
}
}
-
//如果无在线闲置人员
if (online_police.size() == 0){
--
Gitblit v1.9.3