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/controller/MonitorController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java
index d04639b..b1a0df5 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java
@@ -6,7 +6,7 @@
import com.sandu.ximon.admin.param.MonitorParam;
import com.sandu.ximon.admin.service.MonitorService;
import com.sandu.ximon.dao.domain.Monitor;
-import com.sandu.ximon.dao.domain.YSY_MonitorDto;
+import com.sandu.ximon.admin.dto.YSY_MonitorDto;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -24,7 +24,7 @@
@GetMapping
public ResponseVO<Object> listMonitor() {
List<Monitor> list = monitorService.listMonitor();
- return ResponseUtil.successPage(list);
+ return ResponseUtil.success(list);
}
/**
@@ -35,7 +35,7 @@
@GetMapping("/listMonitorByKeyword")
public ResponseVO<Object> listMonitorByKeyword(@RequestBody MonitorParam monitorParam) {
List<Monitor> list = monitorService.listMonitorByKeyword(monitorParam);
- return ResponseUtil.successPage(list);
+ return ResponseUtil.success(list);
}
@@ -173,11 +173,12 @@
}
/**
- * 缂栬緫鎽勫儚澶磋澶囦俊鎭�
+ * 鑾峰彇鎽勫儚澶碪RL鎾斁鍦板潃
*/
@GetMapping("/getMonitorVideoUrl")
public ResponseVO<Object> getMonitorVideoUrl(@RequestBody MonitorParam monitorParam) {
- String URL = monitorService.getMonitorVideoUrl(monitorParam.getAccessToken(), monitorParam.getDeviceSerial(), monitorParam.getProtocol());
+ String URL = monitorService.getMonitorVideoUrl(monitorParam.getAccessToken(),
+ monitorParam.getDeviceSerial(), monitorParam.getProtocol(), monitorParam.getExpireTime());
return ResponseUtil.success(URL);
}
--
Gitblit v1.9.3