From ba1482bb35c4f44deb069eb086acd7ec3b536548 Mon Sep 17 00:00:00 2001
From: chenjiantian <214228265@qq.com>
Date: 星期五, 31 十二月 2021 17:51:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 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 30dbb63..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
@@ -9,8 +9,8 @@
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.param.MonitorParam;
import com.sandu.ximon.dao.domain.Monitor;
-import com.sandu.ximon.dao.domain.YSY_AccessTokenDto;
-import com.sandu.ximon.dao.domain.YSY_MonitorDto;
+import com.sandu.ximon.admin.dto.YSY_AccessTokenDto;
+import com.sandu.ximon.admin.dto.YSY_MonitorDto;
import com.sandu.ximon.dao.mapper.MonitorMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
@@ -40,6 +40,9 @@
private static final String GET_DEVICE_URL = "/device/info";
//鑾峰彇钀ょ煶浜戞憚鍍忓ご鎾斁鍦板潃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