From ec7e09e43ea37054903218886b96fde7c3a39fa8 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期四, 06 一月 2022 11:56:18 +0800
Subject: [PATCH] 功能完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 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..96acec7 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
@@ -2,11 +2,13 @@
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.execption.BusinessException;
+import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
+import com.sandu.ximon.admin.dto.YSY_MonitorDto;
import com.sandu.ximon.admin.param.MonitorParam;
import com.sandu.ximon.admin.service.MonitorService;
+import com.sandu.ximon.dao.bo.MonitorBo;
import com.sandu.ximon.dao.domain.Monitor;
-import com.sandu.ximon.admin.dto.YSY_MonitorDto;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -21,20 +23,19 @@
public class MonitorController {
private final MonitorService monitorService;
- @GetMapping
- public ResponseVO<Object> listMonitor() {
- List<Monitor> list = monitorService.listMonitor();
- return ResponseUtil.successPage(list);
- }
-
/**
* 妯＄硦鏌ヨ
*
* @return
*/
- @GetMapping("/listMonitorByKeyword")
- public ResponseVO<Object> listMonitorByKeyword(@RequestBody MonitorParam monitorParam) {
- List<Monitor> list = monitorService.listMonitorByKeyword(monitorParam);
+ @PostMapping("/listMonitor")
+ public ResponseVO<Object> listMonitorByKeyword(BaseConditionVO baseConditionVO, @RequestBody(required = false) MonitorParam monitorParam) {
+ List<MonitorBo> list;
+ if (monitorParam == null) {
+ list = monitorService.listMonitorByKeyword(baseConditionVO, new MonitorParam());
+ } else {
+ list = monitorService.listMonitorByKeyword(baseConditionVO, monitorParam);
+ }
return ResponseUtil.successPage(list);
}
@@ -177,7 +178,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