From 3fa847083d45461b4e5ee7ec3dbd9247e8a5047c Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 12 一月 2022 10:28:05 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 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 1bc0d87..5a864ef 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,21 +23,20 @@
public class MonitorController {
private final MonitorService monitorService;
- @GetMapping
- public ResponseVO<Object> listMonitor() {
- List<Monitor> list = monitorService.listMonitor();
- return ResponseUtil.success(list);
- }
-
/**
* 妯＄硦鏌ヨ
*
* @return
*/
- @PostMapping("/listMonitorByKeyword")
- public ResponseVO<Object> listMonitorByKeyword(@RequestBody MonitorParam monitorParam) {
- List<Monitor> list = monitorService.listMonitorByKeyword(monitorParam);
- return ResponseUtil.success(list);
+ @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);
}
@@ -71,7 +72,7 @@
* @param monitorParam 娣诲姞鎽勫儚澶寸粨鏋�
* @return
*/
- @GetMapping("/addYSYMonitor")
+ @PostMapping("/addYSYMonitor")
public ResponseVO<Object> addYSYMonitor(@RequestBody MonitorParam monitorParam) {
YSY_MonitorDto addMonitorDto = monitorService.addYSYMonitor(monitorParam.getAccessToken(), monitorParam.getDeviceSerial(), monitorParam.getValidateCode());
@@ -98,7 +99,7 @@
* @param monitorParam 娣诲姞鎽勫儚澶寸粨鏋�
* @return
*/
- @GetMapping("/deleteYSYMonitor")
+ @PostMapping("/deleteYSYMonitor")
public ResponseVO<Object> deleteYSYMonitor(@RequestBody MonitorParam monitorParam) {
YSY_MonitorDto addMonitorDto = monitorService.deleteYSYMonitor(monitorParam.getAccessToken(), monitorParam.getDeviceSerial());
@@ -130,7 +131,7 @@
* @param monitorParam
* @return
*/
- @GetMapping("/getYSYMonitorInfoAndaddMonitorToTable")
+ @PostMapping("/getYSYMonitorInfoAndaddMonitorToTable")
public boolean getYSYMonitorInfoAndaddMonitorToTable(@RequestBody MonitorParam monitorParam) {
YSY_MonitorDto getMonitorDto = monitorService.getYSYMonitorInfo(monitorParam.getAccessToken(), monitorParam.getDeviceSerial());
@@ -175,7 +176,7 @@
/**
* 鑾峰彇鎽勫儚澶碪RL鎾斁鍦板潃
*/
- @GetMapping("/getMonitorVideoUrl")
+ @PostMapping("/getMonitorVideoUrl")
public ResponseVO<Object> getMonitorVideoUrl(@RequestBody MonitorParam monitorParam) {
String URL = monitorService.getMonitorVideoUrl(monitorParam.getAccessToken(),
monitorParam.getDeviceSerial(), monitorParam.getProtocol(), monitorParam.getExpireTime());
--
Gitblit v1.9.3