From 9a46347d03f06ca89e0d12f0dcc10ade753d5b40 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期二, 04 一月 2022 14:10:49 +0800
Subject: [PATCH] 大气数据查询

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 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 657fed3..1bc0d87 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
@@ -24,7 +24,7 @@
     @GetMapping
     public ResponseVO<Object> listMonitor() {
         List<Monitor> list = monitorService.listMonitor();
-        return ResponseUtil.successPage(list);
+        return ResponseUtil.success(list);
     }
 
     /**
@@ -32,10 +32,10 @@
      *
      * @return
      */
-    @GetMapping("/listMonitorByKeyword")
+    @PostMapping("/listMonitorByKeyword")
     public ResponseVO<Object> listMonitorByKeyword(@RequestBody MonitorParam monitorParam) {
         List<Monitor> list = monitorService.listMonitorByKeyword(monitorParam);
-        return ResponseUtil.successPage(list);
+        return ResponseUtil.success(list);
     }
 
 
@@ -177,7 +177,8 @@
      */
     @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