From 6fdb42abb942d258448e009bede60b2d341f5fa4 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 04 一月 2022 16:24:59 +0800
Subject: [PATCH] 功能完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
index 5949671..8aeee27 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
@@ -41,6 +41,9 @@
//鑾峰彇钀ょ煶浜戞憚鍍忓ご鎾斁鍦板潃URL
private static final String GET_VEDIO_URL = "/v2/live/address/get";
+
+ private final PoleBindingService poleBindingService;
+
/**
* 鏌ヨ鍏ㄩ儴鎽勫儚澶�
*/
@@ -80,7 +83,8 @@
bindingState1 = monitorParam.getBindingState();
bindingState2 = monitorParam.getBindingState();
}
- return monitorMapper.listMonitorByKeyword(monitorParam.getKeyword(), equipmentState1, equipmentState2, bindingState1, bindingState2);
+// return monitorMapper.listMonitorByKeyword(monitorParam.getKeyword(), equipmentState1, equipmentState2, bindingState1, bindingState2);
+ return monitorMapper.listMonitorByKeyword1(monitorParam.getKeyword(), bindingState1, bindingState2);
}
/**
@@ -94,6 +98,9 @@
if (monitor == null) {
throw new BusinessException("鎵句笉鍒版憚鍍忓ご");
}
+
+ //鍒犻櫎鎽勫儚澶磋澶囧墠闇�瑕佸厛瑙ｇ粦
+ poleBindingService.unBindPole(monitor.getDeviceSerial());
return removeById(Id);
}
@@ -210,11 +217,15 @@
* @param deviceSerial
* @return
*/
- public String getMonitorVideoUrl(String accessToken, String deviceSerial, int protocol) {
+ public String getMonitorVideoUrl(String accessToken, String deviceSerial, int protocol, int expireTime) {
+ if (expireTime < 30 || expireTime > 62208000) {
+ throw new BusinessException("璁剧疆鐨刄RL鎾斁鍦板潃杩囨湡鏃堕暱鏁版嵁閿欒");
+ }
Map<String, Object> paramMap = new HashMap<>();
paramMap.put("accessToken", accessToken);
paramMap.put("deviceSerial", deviceSerial);
paramMap.put("protocol", protocol);
+ paramMap.put("expireTime", expireTime);
String s = HttpUtil.post(YSY_URL + GET_VEDIO_URL, paramMap);
System.out.println(s);
YSY_MonitorDto monitor = JSON.parseObject(s, YSY_MonitorDto.class);
--
Gitblit v1.9.3