From 07cac52e0b64a78361ce4a353604c94bd1186a6c Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期四, 07 九月 2023 10:50:00 +0800
Subject: [PATCH] 更新webrtc-streamer版本 为了避免通道数和通道号混淆修改sdk请求参数channelNum为chanNo sdk接口增加聚焦值获取
---
ard-work/src/main/java/com/ruoyi/health/controller/HealthController.java | 65 ++++++++++++++++++++++++++++----
1 files changed, 57 insertions(+), 8 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/health/controller/HealthController.java b/ard-work/src/main/java/com/ruoyi/health/controller/HealthController.java
index fa34022..0bff24a 100644
--- a/ard-work/src/main/java/com/ruoyi/health/controller/HealthController.java
+++ b/ard-work/src/main/java/com/ruoyi/health/controller/HealthController.java
@@ -28,18 +28,17 @@
@Autowired
ISysConfigService configService;
- @PreAuthorize("@ss.hasPermi('sy:syCar:getSDKCarPositionByRight')")
+ @PreAuthorize("@ss.hasPermi('sy:syCar:getEquipmentList')")
@ApiOperation("鑾峰彇璁惧鍒楄〃")
@GetMapping("getEquipmentList")
public Results getEquipmentList(){
String url = configService.getHealth();
JSONObject j = new JSONObject();
-
Map<String, Object> map = new HashMap();
String result = ARDSoapUtil.postSoapResult(url, "GetEquipmentList", map);
if ("".equals(result)) {
//杩斿洖缁撴灉涓虹┖
- return Results.error("鏌ヨ澶辫触锛�");
+ return Results.error("娌℃湁璁惧淇℃伅");
}
Map<String, Object> mapResult = (Map<String, Object>) JSON.parse((String) result);
if ((int) mapResult.get("code") == 200) {
@@ -48,11 +47,6 @@
for (int i = 0; i < listResult.size(); i++) {
Map<String, Object> mapTemp = listResult.get(i);
int id = (Integer) mapTemp.get("id"); //涓婚敭id
- String equipKey = (String) mapTemp.get("EquipKey"); //璁惧Key
- String equipNumber = (String) mapTemp.get("EquipNumber"); //璁惧缂栧彿
- String equipName = (String) mapTemp.get("EquipName"); //璁惧鍚嶇О
- String equipLevel = (String) mapTemp.get("EquipLevel"); //璁惧鎶ヨ绛夌骇 0姝ｅ父 1娉ㄦ剰 2涓ラ噸
- String measureDate = (String) mapTemp.get("MeasureDate"); //鏈�杩戜竴娆℃祴閲忔椂闂�
j.put(id + "", mapTemp);
}
} else {
@@ -62,4 +56,59 @@
}
return Results.succeed(j);
}
+
+ @PreAuthorize("@ss.hasPermi('sy:syCar:getMeasureByEquipName')")
+ @ApiOperation("鑾峰彇鏌愪釜娌逛簳娴嬬偣鍒楄〃")
+ @GetMapping("getMeasureByEquipName")
+ public Results getMeasureByEquipName(String equipNumber){
+ String url = configService.getHealth();
+ JSONObject j = new JSONObject();
+ Map<String, Object> map = new HashMap();
+ String result = ARDSoapUtil.postSoapResult(url, "GetEquipmentList", map);
+ String equipKey = "";
+ if ("".equals(result)) {
+ //杩斿洖缁撴灉涓虹┖
+ return Results.error("娌℃湁璁惧淇℃伅");
+ }
+ Map<String, Object> mapResult = (Map<String, Object>) JSON.parse((String) result);
+ if ((int) mapResult.get("code") == 200) {
+ j.put("code", mapResult.get("code"));
+ List<Map<String, Object>> listResult = (List<Map<String, Object>>) JSON.parse((String) mapResult.get("resdata"));
+ for (int i = 0; i < listResult.size(); i++) {
+ Map<String, Object> mapTemp = listResult.get(i);
+ String equipNumberTemp = (String) mapTemp.get("EquipNumber"); //璁惧鍚嶇О
+ if (equipNumberTemp.equals(equipNumber)) {
+ //鍚嶇О鍖归厤锛屽嵆涓鸿鑾峰彇鐨勮澶囷紱
+ equipKey = (String) mapTemp.get("EquipKey"); //璁惧Key
+ }
+ }
+ if ("".equals(equipKey)) {
+ return Results.error("娌℃湁娴嬬偣淇℃伅");
+ }
+ //鑾峰彇璁惧鐨勬祴鐐瑰垪琛�
+ Map<String, Object> hashMap = new HashMap<String, Object>();
+ hashMap.put("EquipKey", equipKey);
+ String eResult = ARDSoapUtil.postSoapResult(url, "GetMeasureByEquipKey", hashMap);
+ if ("".equals(eResult)) {
+ //杩斿洖缁撴灉涓虹┖
+ return Results.error("娌℃湁娴嬬偣淇℃伅");
+ }
+ Map<String, Object> map1 = (Map<String, Object>) JSON.parse((String) eResult);
+ if ((int) map1.get("code") == 200) {
+ j.put("code", map1.get("code"));
+ List<Map<String, Object>> list = (List<Map<String, Object>>) JSON.parse((String) map1.get("resdata"));
+ j.put("listResult", list);
+ } else {
+ //閿欒鎻愮ず
+ j.put("errmsg", mapResult.get("errmsg"));
+ j.put("code", mapResult.get("code"));
+ }
+ } else {
+ //閿欒鎻愮ず
+ j.put("errmsg", mapResult.get("errmsg"));
+ j.put("code", mapResult.get("code"));
+ }
+ return Results.succeed(j);
+ }
+
}
--
Gitblit v1.9.3