From 5628d007fc9b58fd22981d626e6f3557d8cdccb3 Mon Sep 17 00:00:00 2001
From: liusuyi <13324259@qq.com>
Date: 星期三, 14 六月 2023 21:20:08 +0800
Subject: [PATCH] 优化线程间录像抢占问题

---
 ard-work/src/main/java/com/ruoyi/inspect/domain/ArdVideoInspectTask.java |  169 ++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 110 insertions(+), 59 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/inspect/domain/ArdVideoInspectTask.java b/ard-work/src/main/java/com/ruoyi/inspect/domain/ArdVideoInspectTask.java
index 1834441..d30d151 100644
--- a/ard-work/src/main/java/com/ruoyi/inspect/domain/ArdVideoInspectTask.java
+++ b/ard-work/src/main/java/com/ruoyi/inspect/domain/ArdVideoInspectTask.java
@@ -10,27 +10,11 @@
  * 瑙嗛宸℃浠诲姟瀵硅薄 ard_video_inspect_task
  * 
  * @author ruoyi
- * @date 2023-05-25
+ * @date 2023-05-30
  */
 public class ArdVideoInspectTask extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
-
-    /** 宸℃妯″紡 */
-    @Excel(name = "宸℃妯″紡")
-    private String inspectMode;
-
-    /** 鎵嬪姩寮�鍏� */
-    @Excel(name = "鎵嬪姩寮�鍏�")
-    private String menualSwitch;
-
-    /** 閮ㄩ棬id */
-    @Excel(name = "閮ㄩ棬id")
-    private String deptId;
-
-    /** 鐢ㄦ埛id */
-    @Excel(name = "鐢ㄦ埛id")
-    private String userId;
 
     /** id */
     private String id;
@@ -48,48 +32,39 @@
     private String endTime;
 
     /** 閲嶅鍛ㄦ湡 */
-    @Excel(name = "閲嶅鍛ㄦ湡")
     private String repeatPeriod;
+
+    /** 宸℃妯″紡 */
+    @Excel(name = "宸℃妯″紡")
+    private String inspectMode;
+
+    /** 鎵嬪姩寮�鍏� */
+    @Excel(name = "鎵嬪姩寮�鍏�")
+    private String menualSwitch;
+
+    /** 鐩告満id */
+    @Excel(name = "鐩告満id")
+    private String cameraId;
+
+    /** 閫氶亾鍙� */
+    @Excel(name = "閫氶亾鍙�")
+    private Integer channel;
+
+    /** 閮ㄩ棬id */
+    private String deptId;
+
+    /** 鐢ㄦ埛id */
+    private String userId;
+
+    /** 褰撳墠姝ラ */
+    private String currentStepId;
+
+    /** 褰撳墠姝ラ寮�濮嬫椂闂� */
+    private String currentStepStartTime;
 
     /** 瑙嗛宸℃姝ラ淇℃伅 */
     private List<ArdVideoInspectTaskStep> ardVideoInspectTaskStepList;
 
-    public void setInspectMode(String inspectMode) 
-    {
-        this.inspectMode = inspectMode;
-    }
-
-    public String getInspectMode() 
-    {
-        return inspectMode;
-    }
-    public void setMenualSwitch(String menualSwitch) 
-    {
-        this.menualSwitch = menualSwitch;
-    }
-
-    public String getMenualSwitch() 
-    {
-        return menualSwitch;
-    }
-    public void setDeptId(String deptId) 
-    {
-        this.deptId = deptId;
-    }
-
-    public String getDeptId() 
-    {
-        return deptId;
-    }
-    public void setUserId(String userId) 
-    {
-        this.userId = userId;
-    }
-
-    public String getUserId() 
-    {
-        return userId;
-    }
     public void setId(String id) 
     {
         this.id = id;
@@ -135,6 +110,78 @@
     {
         return repeatPeriod;
     }
+    public void setInspectMode(String inspectMode) 
+    {
+        this.inspectMode = inspectMode;
+    }
+
+    public String getInspectMode() 
+    {
+        return inspectMode;
+    }
+    public void setMenualSwitch(String menualSwitch) 
+    {
+        this.menualSwitch = menualSwitch;
+    }
+
+    public String getMenualSwitch() 
+    {
+        return menualSwitch;
+    }
+    public void setCameraId(String cameraId) 
+    {
+        this.cameraId = cameraId;
+    }
+
+    public String getCameraId() 
+    {
+        return cameraId;
+    }
+    public void setChannel(Integer channel) 
+    {
+        this.channel = channel;
+    }
+
+    public Integer getChannel() 
+    {
+        return channel;
+    }
+    public void setDeptId(String deptId) 
+    {
+        this.deptId = deptId;
+    }
+
+    public String getDeptId() 
+    {
+        return deptId;
+    }
+    public void setUserId(String userId) 
+    {
+        this.userId = userId;
+    }
+
+    public String getUserId() 
+    {
+        return userId;
+    }
+    public void setCurrentStepId(String currentStepId) 
+    {
+        this.currentStepId = currentStepId;
+    }
+
+    public String getCurrentStepId() 
+    {
+        return currentStepId;
+    }
+    public void setCurrentStepStartTime(String currentStepStartTime) 
+    {
+        this.currentStepStartTime = currentStepStartTime;
+    }
+
+    public String getCurrentStepStartTime() 
+    {
+        return currentStepStartTime;
+    }
 
     public List<ArdVideoInspectTaskStep> getArdVideoInspectTaskStepList()
     {
@@ -149,19 +196,23 @@
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("taskName", getTaskName())
+            .append("startTime", getStartTime())
+            .append("endTime", getEndTime())
+            .append("repeatPeriod", getRepeatPeriod())
             .append("inspectMode", getInspectMode())
             .append("menualSwitch", getMenualSwitch())
             .append("createBy", getCreateBy())
             .append("createTime", getCreateTime())
             .append("updateBy", getUpdateBy())
             .append("updateTime", getUpdateTime())
+            .append("cameraId", getCameraId())
+            .append("channel", getChannel())
             .append("deptId", getDeptId())
             .append("userId", getUserId())
-            .append("id", getId())
-            .append("taskName", getTaskName())
-            .append("startTime", getStartTime())
-            .append("endTime", getEndTime())
-            .append("repeatPeriod", getRepeatPeriod())
+            .append("currentStepId", getCurrentStepId())
+            .append("currentStepStartTime", getCurrentStepStartTime())
             .append("ardVideoInspectTaskStepList", getArdVideoInspectTaskStepList())
             .toString();
     }

--
Gitblit v1.9.3