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 |   45 +++++++++++++++++++++++++++++++++++----------
 1 files changed, 35 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 abde607..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
@@ -1,7 +1,8 @@
 package com.ycl.platform.controller;
 
 import annotation.Log;
-import com.ycl.platform.entity.TMonitor;
+import com.ycl.platform.domain.entity.TMonitor;
+import com.ycl.platform.domain.vo.TMonitorVO;
 import com.ycl.platform.service.ITMonitorService;
 import com.ycl.system.AjaxResult;
 import com.ycl.system.controller.BaseController;
@@ -31,32 +32,32 @@
     /**
      * 鏌ヨ璁惧璧勪骇鍒楄〃
      */
-    @PreAuthorize("@ss.hasPermi('system:monitor:list')")
+   @PreAuthorize("@ss.hasPermi('system:monitor:list')")
     @GetMapping("/list")
     public TableDataInfo list(TMonitor tMonitor)
     {
         startPage();
-        List<TMonitor> list = tMonitorService.selectTMonitorList(tMonitor);
+        List<TMonitorVO> list = tMonitorService.selectTMonitorList(tMonitor);
         return getDataTable(list);
     }
 
     /**
      * 瀵煎嚭璁惧璧勪骇鍒楄〃
      */
-    @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)
     {
-        List<TMonitor> list = tMonitorService.selectTMonitorList(tMonitor);
-        ExcelUtil<TMonitor> util = new ExcelUtil<TMonitor>(TMonitor.class);
+        List<TMonitorVO> list = tMonitorService.selectTMonitorList(tMonitor);
+        ExcelUtil<TMonitorVO> util = new ExcelUtil<TMonitorVO>(TMonitorVO.class);
         util.exportExcel(response, list, "璁惧璧勪骇鏁版嵁");
     }
 
     /**
      * 鑾峰彇璁惧璧勪骇璇︾粏淇℃伅
      */
-    @PreAuthorize("@ss.hasPermi('system:monitor:query')")
+   @PreAuthorize("@ss.hasPermi('system:monitor:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -66,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)
@@ -77,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)
@@ -88,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