From f284c5ef6a1aa6e9ba5d4e94e4b2abe83b6ea18c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 31 七月 2024 14:54:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/controller/TMonitorController.java | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 insertions(+), 6 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 7591d6e..f1b7859 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,7 +32,7 @@
/**
* 鏌ヨ璁惧璧勪骇鍒楄〃
*/
-// @PreAuthorize("@ss.hasPermi('system:monitor:list')")
+ @PreAuthorize("@ss.hasPermi('system:monitor:list')")
@GetMapping("/list")
public TableDataInfo list(TMonitor tMonitor)
{
@@ -44,7 +44,7 @@
/**
* 瀵煎嚭璁惧璧勪骇鍒楄〃
*/
-// @PreAuthorize("@ss.hasPermi('system:monitor:export')")
+ @PreAuthorize("@ss.hasPermi('system:monitor:export')")
@Log(title = "璁惧璧勪骇", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, TMonitor tMonitor)
@@ -57,7 +57,7 @@
/**
* 鑾峰彇璁惧璧勪骇璇︾粏淇℃伅
*/
-// @PreAuthorize("@ss.hasPermi('system:monitor:query')")
+ @PreAuthorize("@ss.hasPermi('system:monitor:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
@@ -67,7 +67,7 @@
/**
* 鏂板璁惧璧勪骇
*/
-// @PreAuthorize("@ss.hasPermi('system:monitor:add')")
+ @PreAuthorize("@ss.hasPermi('system:monitor:add')")
@Log(title = "璁惧璧勪骇", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody TMonitor tMonitor)
@@ -78,7 +78,7 @@
/**
* 淇敼璁惧璧勪骇
*/
-// @PreAuthorize("@ss.hasPermi('system:monitor:edit')")
+ @PreAuthorize("@ss.hasPermi('system:monitor:edit')")
@Log(title = "璁惧璧勪骇", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody TMonitor tMonitor)
@@ -89,11 +89,35 @@
/**
* 鍒犻櫎璁惧璧勪骇
*/
-// @PreAuthorize("@ss.hasPermi('system:monitor:remove')")
+ @PreAuthorize("@ss.hasPermi('system:monitor:remove')")
@Log(title = "璁惧璧勪骇", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(tMonitorService.deleteTMonitorByIds(ids));
}
+
+ /**
+ * 鑾峰彇瑙嗛璁惧缁熻鏁�
+ */
+ @PreAuthorize("@ss.hasPermi('system:monitor:list')")
+ @GetMapping("/getVideoCount/{cameraFunType}")
+ public AjaxResult getVideoCount(@PathVariable String cameraFunType)
+ {
+ TMonitor tMonitor = new TMonitor();
+ tMonitor.setCameraFunType(cameraFunType);
+ return success(tMonitorService.getVideoCount(tMonitor));
+ }
+
+ /**
+ * 鑾峰彇寮傚父鎭㈠瑙嗛璁惧缁熻鏁�
+ */
+ @PreAuthorize("@ss.hasPermi('system:monitor:list')")
+ @GetMapping("/recoveryException")
+ public AjaxResult recoveryException()
+ {
+ return success(tMonitorService.recoveryException());
+ }
+
+
}
--
Gitblit v1.8.0