From b2ed35cae393672deb3b19a2720dc781b48f7b47 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期五, 18 八月 2023 10:57:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectTaskController.java |   51 ++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectTaskController.java b/ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectTaskController.java
index ceac81a..fc30265 100644
--- a/ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectTaskController.java
+++ b/ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectTaskController.java
@@ -3,6 +3,7 @@
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.common.utils.uuid.IdUtils;
 import com.ruoyi.common.utils.uuid.UUID;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,14 +26,13 @@
 
 /**
  * 瑙嗛宸℃浠诲姟Controller
- * 
+ *
  * @author ruoyi
  * @date 2023-05-30
  */
 @RestController
 @RequestMapping("/inspect/task")
-public class ArdVideoInspectTaskController extends BaseController
-{
+public class ArdVideoInspectTaskController extends BaseController {
     @Autowired
     private IArdVideoInspectTaskService ardVideoInspectTaskService;
 
@@ -41,8 +41,7 @@
      */
     @PreAuthorize("@ss.hasPermi('inspect:task:list')")
     @GetMapping("/list")
-    public TableDataInfo list(ArdVideoInspectTask ardVideoInspectTask)
-    {
+    public TableDataInfo list(ArdVideoInspectTask ardVideoInspectTask) {
         startPage();
         List<ArdVideoInspectTask> list = ardVideoInspectTaskService.selectArdVideoInspectTaskList(ardVideoInspectTask);
         return getDataTable(list);
@@ -54,8 +53,7 @@
     @PreAuthorize("@ss.hasPermi('inspect:task:export')")
     @Log(title = "瑙嗛宸℃浠诲姟", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, ArdVideoInspectTask ardVideoInspectTask)
-    {
+    public void export(HttpServletResponse response, ArdVideoInspectTask ardVideoInspectTask) {
         List<ArdVideoInspectTask> list = ardVideoInspectTaskService.selectArdVideoInspectTaskList(ardVideoInspectTask);
         ExcelUtil<ArdVideoInspectTask> util = new ExcelUtil<ArdVideoInspectTask>(ArdVideoInspectTask.class);
         util.exportExcel(response, list, "瑙嗛宸℃浠诲姟鏁版嵁");
@@ -66,10 +64,22 @@
      */
     @PreAuthorize("@ss.hasPermi('inspect:task:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") String id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") String id) {
         return success(ardVideoInspectTaskService.selectArdVideoInspectTaskById(id));
     }
+
+/*
+    */
+/**
+     * 鑾峰彇瑙嗛宸℃浠诲姟璇︾粏淇℃伅
+     *//*
+
+    @PreAuthorize("@ss.hasPermi('inspect:task:edit')")
+    @GetMapping(value = "/getTaskUsedCameraPeriods")
+    public AjaxResult getTaskUsedCameraPeriods(String cameraId) {
+        return success(ardVideoInspectTaskService.getTaskUsedCameraPeriods(cameraId));
+    }
+*/
 
     /**
      * 鏂板瑙嗛宸℃浠诲姟
@@ -77,9 +87,8 @@
     @PreAuthorize("@ss.hasPermi('inspect:task:add')")
     @Log(title = "瑙嗛宸℃浠诲姟", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody ArdVideoInspectTask ardVideoInspectTask)
-    {
-        ardVideoInspectTask.setId(UUID.randomUUID().toString());
+    public AjaxResult add(@RequestBody ArdVideoInspectTask ardVideoInspectTask) {
+        ardVideoInspectTask.setId(IdUtils.simpleUUID());
         return toAjax(ardVideoInspectTaskService.insertArdVideoInspectTask(ardVideoInspectTask));
     }
 
@@ -89,9 +98,18 @@
     @PreAuthorize("@ss.hasPermi('inspect:task:edit')")
     @Log(title = "瑙嗛宸℃浠诲姟", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody ArdVideoInspectTask ardVideoInspectTask)
-    {
+    public AjaxResult edit(@RequestBody ArdVideoInspectTask ardVideoInspectTask) {
         return toAjax(ardVideoInspectTaskService.updateArdVideoInspectTask(ardVideoInspectTask));
+    }
+
+    /**
+     * 鍙慨鏀硅棰戝贰妫�浠诲姟,涓嶆洿鏂版楠�
+     */
+    @PreAuthorize("@ss.hasPermi('inspect:task:edit')")
+    @Log(title = "鍙慨鏀硅棰戝贰妫�浠诲姟,涓嶆洿鏂版楠�", businessType = BusinessType.UPDATE)
+    @PostMapping("/update")
+    public AjaxResult updateArdVideoInspectTaskSingle(@RequestBody ArdVideoInspectTask ardVideoInspectTask) {
+        return toAjax(ardVideoInspectTaskService.updateArdVideoInspectTaskSingle(ardVideoInspectTask));
     }
 
     /**
@@ -99,9 +117,8 @@
      */
     @PreAuthorize("@ss.hasPermi('inspect:task:remove')")
     @Log(title = "瑙嗛宸℃浠诲姟", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable String[] ids)
-    {
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable String[] ids) {
         return toAjax(ardVideoInspectTaskService.deleteArdVideoInspectTaskByIds(ids));
     }
 }

--
Gitblit v1.9.3