From d9945dca4197d615cdeaff24a521c9c8ca6059f9 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 28 Sep 2021 09:51:38 +0800
Subject: [PATCH] 语音对讲完善
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 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 80e36f1..30d50b7 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
@@ -141,12 +141,16 @@
}
} else if (CSType.equals("HK")) {
+ if (content.substring(25, 26) != "3"){
+ return;
+ }
+
List<String> outData = new ArrayList<>();
switch (content.substring(0, 2)) {
case "BJ":
//报警信息
- String devId = content.substring(12, 24);
+ String devId = content.substring(12, 21);
List<Map<String, Object>> list = serverHandler.equipmentService.selectInfos(devId);
Alarm alarm = new Alarm();
alarm.setWaringType("紧急求救");
@@ -155,6 +159,7 @@
alarm.setAlarmTime(df.format(day));
alarm.setPlace((String) list.get(0).get("streeName"));//事发地址
alarm.setDeviceNumber((String) list.get(0).get("deviceNumber"));//设备编号
+
alarm.setDistrict((String) list.get(0).get("district"));//县区
alarm.setProvince((String) list.get(0).get("province"));//市
alarm.setCity((String) list.get(0).get("city"));
@@ -1686,6 +1691,8 @@
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
alarm.setJjTime(dateFormat.format(date));
+
+
serverHandler.alarmService.updatePoliceStatus(online_police.get(0).getId().toString(), "1");
}
}
@@ -1709,18 +1716,26 @@
map.put("deviceCode", (String) list.get(0).get("serialNumber"));
map.put("chl", (String) list.get(0).get("channelNumber"));
+
//请求视频播放地址
String params = HttpClientUtils.doGet("https://web.byisf.com:18000/GetPlayUrl", map);
- Map<String, Object> data = (Map<String, Object>) JSONObject.parse(params);
- Map<String, Object> datas = (Map<String, Object>) JSONObject.parse(data.get("data").toString());
- String m3u8 = datas.get("m3u8").toString();
+ //如果返回值不为空
+ if (params != ""){
+ Map<String, Object> data = (Map<String, Object>) JSONObject.parse(params);
+ if (!data.get("code").toString().equals("-1")){
+ Map<String, Object> datas = (Map<String, Object>) JSONObject.parse(data.get("data").toString());
+ String m3u8 = datas.get("m3u8").toString();
- Map<String, String> rmap = new HashMap<>();
- rmap.put("url", m3u8);
+ Map<String, String> rmap = new HashMap<>();
+ rmap.put("url", m3u8);
+ rmap.put("jid", alarm.getId().toString());
- //请求视频录制
- String rvideo = HttpClientUtils.doPost("https://web.byisf.com/api/blade-jfpts/rvideo/rVoids", rmap);
+ //请求视频录制
+ String rvideo = HttpClientUtils.doPost("https://web.byisf.com/api/blade-jfpts/rvideo/rVoids", rmap);
+ //String rvideo = HttpClientUtils.doPost("http://localhost:82/blade-jfpts/rvideo/rVoids", rmap);
+ }
+ }
}
outData.add("LEOK#@");
--
Gitblit v1.9.3