From 44f2a0a32c096bdb05d4cc0ac162cdc1eb14c3ed Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期四, 10 八月 2023 13:14:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectRecordController.java |   50 ++++++++++++++++++++++++++------------------------
 1 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectRecordController.java b/ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectRecordController.java
index 71d660e..fbd225b 100644
--- a/ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectRecordController.java
+++ b/ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectRecordController.java
@@ -2,16 +2,10 @@
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -23,14 +17,13 @@
 
 /**
  * 瑙嗛宸℃璁板綍Controller
- * 
+ *
  * @author ruoyi
  * @date 2023-05-30
  */
 @RestController
 @RequestMapping("/inspect/record")
-public class ArdVideoInspectRecordController extends BaseController
-{
+public class ArdVideoInspectRecordController extends BaseController {
     @Autowired
     private IArdVideoInspectRecordService ardVideoInspectRecordService;
 
@@ -39,11 +32,25 @@
      */
     @PreAuthorize("@ss.hasPermi('inspect:record:list')")
     @GetMapping("/list")
-    public TableDataInfo list(ArdVideoInspectRecord ardVideoInspectRecord)
-    {
+    public TableDataInfo list(ArdVideoInspectRecord ardVideoInspectRecord) {
         startPage();
         List<ArdVideoInspectRecord> list = ardVideoInspectRecordService.selectArdVideoInspectRecordList(ardVideoInspectRecord);
         return getDataTable(list);
+    }
+
+    @PreAuthorize("@ss.hasPermi('inspect:record:list')")
+    @GetMapping("/listByStartTime")
+    public TableDataInfo listByStartTime(ArdVideoInspectRecord ardVideoInspectRecord) {
+        startPage();
+        List list = ardVideoInspectRecordService.selectArdVideoInspectRecordListByStartTime(ardVideoInspectRecord);
+        return getDataTable(list);
+    }
+
+    @PreAuthorize("@ss.hasPermi('inspect:record:list')")
+    @GetMapping("/getFileCountByStartMonth")
+    public List getFileCountByStartMonth(@RequestParam("startMonth") String startMonth) {
+        List list = ardVideoInspectRecordService.selectArdVideoInspectRecordCountByStartMonth(startMonth);
+        return list;
     }
 
     /**
@@ -52,8 +59,7 @@
     @PreAuthorize("@ss.hasPermi('inspect:record:export')")
     @Log(title = "瑙嗛宸℃璁板綍", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, ArdVideoInspectRecord ardVideoInspectRecord)
-    {
+    public void export(HttpServletResponse response, ArdVideoInspectRecord ardVideoInspectRecord) {
         List<ArdVideoInspectRecord> list = ardVideoInspectRecordService.selectArdVideoInspectRecordList(ardVideoInspectRecord);
         ExcelUtil<ArdVideoInspectRecord> util = new ExcelUtil<ArdVideoInspectRecord>(ArdVideoInspectRecord.class);
         util.exportExcel(response, list, "瑙嗛宸℃璁板綍鏁版嵁");
@@ -64,8 +70,7 @@
      */
     @PreAuthorize("@ss.hasPermi('inspect:record:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") String id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") String id) {
         return success(ardVideoInspectRecordService.selectArdVideoInspectRecordById(id));
     }
 
@@ -75,8 +80,7 @@
     @PreAuthorize("@ss.hasPermi('inspect:record:add')")
     @Log(title = "瑙嗛宸℃璁板綍", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody ArdVideoInspectRecord ardVideoInspectRecord)
-    {
+    public AjaxResult add(@RequestBody ArdVideoInspectRecord ardVideoInspectRecord) {
         return toAjax(ardVideoInspectRecordService.insertArdVideoInspectRecord(ardVideoInspectRecord));
     }
 
@@ -86,8 +90,7 @@
     @PreAuthorize("@ss.hasPermi('inspect:record:edit')")
     @Log(title = "瑙嗛宸℃璁板綍", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody ArdVideoInspectRecord ardVideoInspectRecord)
-    {
+    public AjaxResult edit(@RequestBody ArdVideoInspectRecord ardVideoInspectRecord) {
         return toAjax(ardVideoInspectRecordService.updateArdVideoInspectRecord(ardVideoInspectRecord));
     }
 
@@ -96,9 +99,8 @@
      */
     @PreAuthorize("@ss.hasPermi('inspect:record:remove')")
     @Log(title = "瑙嗛宸℃璁板綍", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable String[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids) {
         return toAjax(ardVideoInspectRecordService.deleteArdVideoInspectRecordByIds(ids));
     }
 }

--
Gitblit v1.9.3