From 57c72c8438ccb461d5d2f751f710d6908f0e0d32 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 04 Nov 2021 14:59:20 +0800
Subject: [PATCH] 版本修复
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java | 81 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 80 insertions(+), 1 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java
index 6e9bcf9..bf08144 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/controller/EquipmentController.java
@@ -16,6 +16,9 @@
*/
package org.springblade.jfpt.equipment.controller;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.*;
@@ -39,6 +42,9 @@
import org.springblade.jfpt.equipment.vo.EquipmentVO;
import org.springblade.jfpt.equipment.vo.EquipmentVOS;
import org.springblade.jfpt.equipment.wrapper.EqWrapper;
+import org.springblade.jfpt.hk.constant.HkConstant;
+import org.springblade.jfpt.hk.constant.ProtocolConstant;
+import org.springblade.jfpt.hk.util.GetCameraPreviewURL;
import org.springblade.system.entity.Region;
import org.springblade.system.user.entity.User;
import org.springframework.web.bind.annotation.*;
@@ -456,6 +462,8 @@
equipmentService.saveImg(equipment);
}
+ equipmentService.updateRW(equipment);
+
return R.status(equipmentService.saveOrUpdate(equipment));
}
@@ -582,7 +590,78 @@
response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
response.setHeader("Access-Control-Allow-Credentials", "true");
//返回
- return R.data(equipmentService.selectEquimentPlayInfo(equipmentPlayInfo));
+// equipmentService.selectEquimentPlayInfo(equipmentPlayInfo)
+
+ JSONObject res = new JSONObject();
+
+ //根据设备id获取设备编号
+ String result1 = GetCameraPreviewURL.QueryCameraPreviewURL(HkConstant.camerasID, equipmentPlayInfo.getNumber(), "encodeDevice", "deviceCode");
+
+ JSONObject jsonObject1 = JSONObject.parseObject(result1);
+ JSONObject res1 = (JSONObject) jsonObject1.get("data");
+ JSONArray arr1 = JSON.parseArray(res1.getString("list"));
+ if (arr1.size() > 0){
+ JSONObject data1 = (JSONObject) arr1.get(0);
+ String code1 = data1.get("indexCode").toString();
+
+ //根据设备编号获取子节点编号
+ String result2 = GetCameraPreviewURL.QueryCameraPreviewURL(HkConstant.camerasID, code1, "camera", "parentIndexCode");
+
+ JSONObject jsonObject2 = JSONObject.parseObject(result2);
+ JSONObject res2 = (JSONObject) jsonObject2.get("data");
+ JSONArray arr2 = JSON.parseArray(res2.getString("list"));
+ JSONObject data2 = (JSONObject) arr2.get(0);
+ String code2 = data2.get("indexCode").toString();
+
+ //根据子节点编号获取设备播放地址
+ String result3 = GetCameraPreviewURL.GetCameraPreviewURL(HkConstant.previewURLshttps, code2, ProtocolConstant.HLSS);
+ res = JSONObject.parseObject(result3);
+ }
+
+ return R.data(res);
+ }
+
+ /**
+ * 获取设备语音对讲的信息
+ * @param equipmentPlayInfo 设备语音对讲对象，只需包含设备编号，以及设备语音对讲格式即可
+ * @param response 响应域，设置跨域
+ * @return
+ */
+ @GetMapping("/EquimentVoice")
+ public R EquimentVoice(EquipmentPlayInfo equipmentPlayInfo,HttpServletResponse response){
+ response.setHeader("Access-Control-Allow-Origin", "*");
+ response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+ response.setHeader("Access-Control-Allow-Credentials", "true");
+ //返回
+// equipmentService.selectEquimentPlayInfo(equipmentPlayInfo)
+
+ JSONObject res = new JSONObject();
+
+ //根据设备id获取设备编号
+ String result1 = GetCameraPreviewURL.QueryCameraPreviewURL(HkConstant.camerasID, equipmentPlayInfo.getNumber(), "encodeDevice", "deviceCode");
+
+ JSONObject jsonObject1 = JSONObject.parseObject(result1);
+ JSONObject res1 = (JSONObject) jsonObject1.get("data");
+ JSONArray arr1 = JSON.parseArray(res1.getString("list"));
+ if (arr1.size() > 0){
+ JSONObject data1 = (JSONObject) arr1.get(0);
+ String code1 = data1.get("indexCode").toString();
+
+ //根据设备编号获取子节点编号
+ String result2 = GetCameraPreviewURL.QueryCameraPreviewURL(HkConstant.camerasID, code1, "camera", "parentIndexCode");
+
+ JSONObject jsonObject2 = JSONObject.parseObject(result2);
+ JSONObject res2 = (JSONObject) jsonObject2.get("data");
+ JSONArray arr2 = JSON.parseArray(res2.getString("list"));
+ JSONObject data2 = (JSONObject) arr2.get(0);
+ String code2 = data2.get("indexCode").toString();
+
+ //根据子节点获取设备语音对讲的信息
+ String result4 = GetCameraPreviewURL.GetTalkURLs(HkConstant.talkURLs, code2);
+ res = JSONObject.parseObject(result4);
+ }
+
+ return R.data(res);
}
--
Gitblit v1.9.3