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 | 42 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 39 insertions(+), 3 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 c01ff5e..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;
@@ -38,6 +38,11 @@
private static final String DELETE_DEVICE_URL = "/device/delete";
//鑾峰彇钀ょ煶浜戝崟涓澶囦俊鎭�
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;
/**
* 鏌ヨ鍏ㄩ儴鎽勫儚澶�
@@ -78,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);
}
/**
@@ -92,6 +98,9 @@
if (monitor == null) {
throw new BusinessException("鎵句笉鍒版憚鍍忓ご");
}
+
+ //鍒犻櫎鎽勫儚澶磋澶囧墠闇�瑕佸厛瑙ｇ粦
+ poleBindingService.unBindPole(monitor.getDeviceSerial());
return removeById(Id);
}
@@ -173,6 +182,7 @@
if (one == null) {
return save(monitor);
} else {
+ monitor.setId(one.getId());
return updateById(monitor);
}
}
@@ -200,5 +210,31 @@
return updateById(monitor);
}
+ /**
+ * 杩斿洖鎽勫儚澶村疄鏃剁敾闈㈡挱鏀惧湴鍧�
+ *
+ * @param accessToken
+ * @param deviceSerial
+ * @return
+ */
+ 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);
+ if ("200".equals(monitor.getCode())) {
+ return monitor.getData().getUrl();
+ } else {
+ throw new BusinessException(monitor.getMsg());
+ }
+ }
+
}
--
Gitblit v1.9.3