From d9e7d3b630c9d905bc1340fe61740712bb610fde Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 18 九月 2024 17:20:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/controller/TMonitorController.java | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/TMonitorController.java b/ycl-server/src/main/java/com/ycl/platform/controller/TMonitorController.java
index f1b7859..b79c732 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/TMonitorController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/TMonitorController.java
@@ -32,9 +32,9 @@
/**
* 鏌ヨ璁惧璧勪骇鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:monitor:list')")
+ @PreAuthorize("@ss.hasPermi('system:monitor:list')")
@GetMapping("/list")
- public TableDataInfo list(TMonitor tMonitor)
+ public TableDataInfo list(TMonitorVO tMonitor)
{
startPage();
List<TMonitorVO> list = tMonitorService.selectTMonitorList(tMonitor);
@@ -47,7 +47,7 @@
@PreAuthorize("@ss.hasPermi('system:monitor:export')")
@Log(title = "璁惧璧勪骇", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, TMonitor tMonitor)
+ public void export(HttpServletResponse response, TMonitorVO tMonitor)
{
List<TMonitorVO> list = tMonitorService.selectTMonitorList(tMonitor);
ExcelUtil<TMonitorVO> util = new ExcelUtil<TMonitorVO>(TMonitorVO.class);
@@ -101,12 +101,10 @@
* 鑾峰彇瑙嗛璁惧缁熻鏁�
*/
@PreAuthorize("@ss.hasPermi('system:monitor:list')")
- @GetMapping("/getVideoCount/{cameraFunType}")
- public AjaxResult getVideoCount(@PathVariable String cameraFunType)
+ @GetMapping("/getVideoCount")
+ public AjaxResult getVideoCount(TMonitorVO monitor)
{
- TMonitor tMonitor = new TMonitor();
- tMonitor.setCameraFunType(cameraFunType);
- return success(tMonitorService.getVideoCount(tMonitor));
+ return success(tMonitorService.getVideoCount(monitor));
}
/**
@@ -114,9 +112,9 @@
*/
@PreAuthorize("@ss.hasPermi('system:monitor:list')")
@GetMapping("/recoveryException")
- public AjaxResult recoveryException()
+ public AjaxResult recoveryException(TMonitorVO monitor)
{
- return success(tMonitorService.recoveryException());
+ return success(tMonitorService.recoveryException(monitor));
}
--
Gitblit v1.8.0