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/service/IArdVideoInspectTaskService.java |   50 ++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/inspect/service/IArdVideoInspectTaskService.java b/ard-work/src/main/java/com/ruoyi/inspect/service/IArdVideoInspectTaskService.java
index 7f2cbe7..7f63b69 100644
--- a/ard-work/src/main/java/com/ruoyi/inspect/service/IArdVideoInspectTaskService.java
+++ b/ard-work/src/main/java/com/ruoyi/inspect/service/IArdVideoInspectTaskService.java
@@ -1,19 +1,19 @@
 package com.ruoyi.inspect.service;
 
 import java.util.List;
+
 import com.ruoyi.inspect.domain.ArdVideoInspectTask;
 
 /**
  * 瑙嗛宸℃浠诲姟Service鎺ュ彛
- * 
+ *
  * @author ruoyi
- * @date 2023-05-26
+ * @date 2023-05-30
  */
-public interface IArdVideoInspectTaskService 
-{
+public interface IArdVideoInspectTaskService {
     /**
      * 鏌ヨ瑙嗛宸℃浠诲姟
-     * 
+     *
      * @param id 瑙嗛宸℃浠诲姟涓婚敭
      * @return 瑙嗛宸℃浠诲姟
      */
@@ -21,7 +21,7 @@
 
     /**
      * 鏌ヨ瑙嗛宸℃浠诲姟鍒楄〃
-     * 
+     *
      * @param ardVideoInspectTask 瑙嗛宸℃浠诲姟
      * @return 瑙嗛宸℃浠诲姟闆嗗悎
      */
@@ -29,7 +29,7 @@
 
     /**
      * 鏂板瑙嗛宸℃浠诲姟
-     * 
+     *
      * @param ardVideoInspectTask 瑙嗛宸℃浠诲姟
      * @return 缁撴灉
      */
@@ -37,15 +37,24 @@
 
     /**
      * 淇敼瑙嗛宸℃浠诲姟
-     * 
+     *
      * @param ardVideoInspectTask 瑙嗛宸℃浠诲姟
      * @return 缁撴灉
      */
     public int updateArdVideoInspectTask(ArdVideoInspectTask ardVideoInspectTask);
 
     /**
+     * 鍙洿鏂颁换鍔�,涓嶈繛甯︽楠�
+     * @param ardVideoInspectTask
+     * @return
+     */
+    public int updateArdVideoInspectTaskSingle(ArdVideoInspectTask ardVideoInspectTask);
+
+    public int updateArdVideoInspectTaskNoUpdater(ArdVideoInspectTask ardVideoInspectTask);
+
+    /**
      * 鎵归噺鍒犻櫎瑙嗛宸℃浠诲姟
-     * 
+     *
      * @param ids 闇�瑕佸垹闄ょ殑瑙嗛宸℃浠诲姟涓婚敭闆嗗悎
      * @return 缁撴灉
      */
@@ -53,9 +62,30 @@
 
     /**
      * 鍒犻櫎瑙嗛宸℃浠诲姟淇℃伅
-     * 
+     *
      * @param id 瑙嗛宸℃浠诲姟涓婚敭
      * @return 缁撴灉
      */
     public int deleteArdVideoInspectTaskById(String id);
+
+    /**
+     * 鑷姩宸℃浠诲姟
+     */
+    public void autoTaskRun();
+
+    /**
+     * 鎵嬪姩宸℃浠诲姟
+     */
+    public void manualTaskRun(String TaskId);
+    /**
+     * 鍒ゆ柇褰撳墠鐩告満鑳藉惁寮�鍚墜鍔�
+     */
+    public boolean isEnablemanualTask(String TaskId);
+    /**
+     * 宸℃浠诲姟
+     */
+    public void taskRun();
+    //鑾峰彇鐩告満宸蹭娇鐢ㄦ椂娈�
+    public List getTaskUsedCameraPeriods(String cameraId);
+    public List getCameraIdleTimeList(String cameraId);
 }

--
Gitblit v1.9.3