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 |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 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 44f27f4..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();

--
Gitblit v1.9.3