修复工作

rtsp-vue/nginx.conf

@@ -56,10 +56,10 @@ server {
         proxy_request_buffering off;
         chunked_transfer_encoding on;
         
-        # 设置超时时间（视频流长连接）
-        proxy_connect_timeout 60s;
-        proxy_send_timeout 3600s;
-        proxy_read_timeout 3600s;
+        # 设置超时时间（视频流长连接）- 增加到2小时
+        proxy_connect_timeout 120s;
+        proxy_send_timeout 7200s;
+        proxy_read_timeout 7200s;
         
         # 请求头
         proxy_set_header Host $host;
@@ -71,6 +71,9 @@ server {
         add_header Access-Control-Allow-Origin *;
         add_header Access-Control-Allow-Methods 'GET, POST, OPTIONS';
         add_header Access-Control-Allow-Headers '*';
+        
+        # 禁用限速
+        proxy_limit_rate 0;
     }
 
     # 视频流代理（HLS）

ruoyi-video/src/main/java/com/ruoyi/video/domain/InspectionTask.java

@@ -1,133 +1,158 @@
 package com.ruoyi.video.domain;
 
+import com.ruoyi.common.core.domain.BaseEntity;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
- * 巡检任务实体类
+ * 巡检任务对象 v_inspection_task
+ * 
+ * @author ruoyi
+ * @date 2025-09-27
  */
-public class InspectionTask {
+public class InspectionTask extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
     /** 巡检任务ID */
     private Long taskId;
-    
+
+    /** 任务名称 */
+    private String taskName;
+
     /** 设备ID */
     private Long deviceId;
-    
+
+    /** 设备名称 */
+    private String deviceName;
+
+    /** Cron表达式 */
+    private String cronExpression;
+
     /** 巡检时长(秒) */
     private Integer duration;
-    
-    /** 视频对象存储ID */
-    private Long videoOssId;
-    
-    /** 处理后视频对象存储ID */
-    private Long processedVideoOssId;
-    
-    /** 视频状态(0-未录制,1-已录制未分析,2-已分析) */
-    private Integer videoStatus;
-    
-    /** 任务状态(0-待执行,1-执行中,2-已完成) */
-    private Integer status;
-    
-    /** 创建时间 */
-    private Date createTime;
-    
-    /** 更新时间 */
-    private Date updateTime;
-    
-    /** 备注 */
-    private String remark;
-    
-    public Long getTaskId() {
-        return taskId;
-    }
-    
+
+    /** 任务状态(0=启用,1=停用) */
+    private String status;
+
+    /** 是否启用检测(0=启用,1=停用) */
+    private String enableDetection;
+
+    /** 检测阈值 */
+    private BigDecimal threshold;
+
+    /** 最后执行时间 */
+    private Date lastExecuteTime;
+
+    /** 下次执行时间 */
+    private Date nextExecuteTime;
+
+    /** 执行次数 */
+    private Long executeCount;
+
+    /** 报警次数 */
+    private Long alarmCount;
+
     public void setTaskId(Long taskId) {
         this.taskId = taskId;
     }
 
-    
-    public Long getDeviceId() {
-        return deviceId;
+    public Long getTaskId() {
+        return taskId;
     }
-    
+
+    public void setTaskName(String taskName) {
+        this.taskName = taskName;
+    }
+
+    public String getTaskName() {
+        return taskName;
+    }
+
     public void setDeviceId(Long deviceId) {
         this.deviceId = deviceId;
     }
-    
-    public Integer getDuration() {
-        return duration;
+
+    public Long getDeviceId() {
+        return deviceId;
     }
-    
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setCronExpression(String cronExpression) {
+        this.cronExpression = cronExpression;
+    }
+
+    public String getCronExpression() {
+        return cronExpression;
+    }
+
     public void setDuration(Integer duration) {
         this.duration = duration;
     }
-    
-    public Long getVideoOssId() {
-        return videoOssId;
+
+    public Integer getDuration() {
+        return duration;
     }
-    
-    public void setVideoOssId(Long videoOssId) {
-        this.videoOssId = videoOssId;
-    }
-    
-    public Long getProcessedVideoOssId() {
-        return processedVideoOssId;
-    }
-    
-    public void setProcessedVideoOssId(Long processedVideoOssId) {
-        this.processedVideoOssId = processedVideoOssId;
-    }
-    
-    public Integer getVideoStatus() {
-        return videoStatus;
-    }
-    
-    public void setVideoStatus(Integer videoStatus) {
-        this.videoStatus = videoStatus;
-    }
-    
-    public Integer getStatus() {
-        return status;
-    }
-    
-    public void setStatus(Integer status) {
+
+    public void setStatus(String status) {
         this.status = status;
     }
-    
-    public Date getCreateTime() {
-        return createTime;
+
+    public String getStatus() {
+        return status;
     }
-    
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
+
+    public void setEnableDetection(String enableDetection) {
+        this.enableDetection = enableDetection;
     }
-    
-    public Date getUpdateTime() {
-        return updateTime;
+
+    public String getEnableDetection() {
+        return enableDetection;
     }
-    
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
+
+    public void setThreshold(BigDecimal threshold) {
+        this.threshold = threshold;
     }
-    
-    public String getRemark() {
-        return remark;
+
+    public BigDecimal getThreshold() {
+        return threshold;
     }
-    
-    public void setRemark(String remark) {
-        this.remark = remark;
+
+    public void setLastExecuteTime(Date lastExecuteTime) {
+        this.lastExecuteTime = lastExecuteTime;
     }
-    
-    /**
-     * 获取ID的兼容方法，保持与原有代码兼容
-     */
-    public Long getId() {
-        return taskId;
+
+    public Date getLastExecuteTime() {
+        return lastExecuteTime;
     }
-    
-    /**
-     * 设置ID的兼容方法，保持与原有代码兼容
-     */
-    public void setId(Long id) {
-        this.taskId = id;
+
+    public void setNextExecuteTime(Date nextExecuteTime) {
+        this.nextExecuteTime = nextExecuteTime;
+    }
+
+    public Date getNextExecuteTime() {
+        return nextExecuteTime;
+    }
+
+    public void setExecuteCount(Long executeCount) {
+        this.executeCount = executeCount;
+    }
+
+    public Long getExecuteCount() {
+        return executeCount;
+    }
+
+    public void setAlarmCount(Long alarmCount) {
+        this.alarmCount = alarmCount;
+    }
+
+    public Long getAlarmCount() {
+        return alarmCount;
     }
 }