将检测任务迁移python

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

@@ -1,196 +1,133 @@
 package com.ruoyi.video.domain;
 
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
 import java.util.Date;
 
 /**
- * 巡检任务对象 v_inspection_task
- *
- * @Author: orange
- * @CreateTime: 2025-01-16
+ * 巡检任务实体类
  */
-public class InspectionTask extends BaseEntity {
-    private static final long serialVersionUID = 1L;
-
+public class InspectionTask {
     /** 巡检任务ID */
     private Long taskId;
-
-    /** 任务名称 */
-    @Excel(name = "任务名称")
-    private String taskName;
-
+    
     /** 设备ID */
-    @Excel(name = "设备ID")
     private Long deviceId;
-
-    /** 设备名称 */
-    @Excel(name = "设备名称")
-    private String deviceName;
-
-    /** Cron表达式 */
-    @Excel(name = "Cron表达式")
-    private String cronExpression;
-
+    
     /** 巡检时长(秒) */
-    @Excel(name = "巡检时长")
     private Integer duration;
-
-    /** 任务状态(0=启用,1=停用) */
-    @Excel(name = "任务状态", readConverterExp = "0=启用,1=停用")
-    private String status;
-
-    /** 是否启用检测(0=启用,1=停用) */
-    @Excel(name = "启用检测", readConverterExp = "0=启用,1=停用")
-    private String enableDetection;
-
-    /** 检测阈值 */
-    @Excel(name = "检测阈值")
-    private Double threshold;
-
-    /** 最后执行时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "最后执行时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-    private Date lastExecuteTime;
-
-    /** 下次执行时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "下次执行时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-    private Date nextExecuteTime;
-
-    /** 执行次数 */
-    @Excel(name = "执行次数")
-    private Long executeCount;
-
-    /** 报警次数 */
-    @Excel(name = "报警次数")
-    private Long alarmCount;
-
-    public InspectionTask() {}
-
+    
+    /** 视频对象存储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;
     }
-
+    
     public void setTaskId(Long taskId) {
         this.taskId = taskId;
     }
 
-
-    public String getTaskName() {
-        return taskName;
-    }
-
-    public void setTaskName(String taskName) {
-        this.taskName = taskName;
-    }
-
+    
     public Long getDeviceId() {
         return deviceId;
     }
-
+    
     public void setDeviceId(Long deviceId) {
         this.deviceId = deviceId;
     }
-
-    public String getDeviceName() {
-        return deviceName;
-    }
-
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
-    }
-
-    public String getCronExpression() {
-        return cronExpression;
-    }
-
-    public void setCronExpression(String cronExpression) {
-        this.cronExpression = cronExpression;
-    }
-
+    
     public Integer getDuration() {
         return duration;
     }
-
+    
     public void setDuration(Integer duration) {
         this.duration = duration;
     }
-
-    public String getStatus() {
+    
+    public Long getVideoOssId() {
+        return videoOssId;
+    }
+    
+    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(String status) {
+    
+    public void setStatus(Integer status) {
         this.status = status;
     }
-
-    public String getEnableDetection() {
-        return enableDetection;
+    
+    public Date getCreateTime() {
+        return createTime;
     }
-
-    public void setEnableDetection(String enableDetection) {
-        this.enableDetection = enableDetection;
+    
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
     }
-
-    public Double getThreshold() {
-        return threshold;
+    
+    public Date getUpdateTime() {
+        return updateTime;
     }
-
-    public void setThreshold(Double threshold) {
-        this.threshold = threshold;
+    
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
     }
-
-    public Date getLastExecuteTime() {
-        return lastExecuteTime;
+    
+    public String getRemark() {
+        return remark;
     }
-
-    public void setLastExecuteTime(Date lastExecuteTime) {
-        this.lastExecuteTime = lastExecuteTime;
+    
+    public void setRemark(String remark) {
+        this.remark = remark;
     }
-
-    public Date getNextExecuteTime() {
-        return nextExecuteTime;
+    
+    /**
+     * 获取ID的兼容方法，保持与原有代码兼容
+     */
+    public Long getId() {
+        return taskId;
     }
-
-    public void setNextExecuteTime(Date nextExecuteTime) {
-        this.nextExecuteTime = nextExecuteTime;
-    }
-
-    public Long getExecuteCount() {
-        return executeCount;
-    }
-
-    public void setExecuteCount(Long executeCount) {
-        this.executeCount = executeCount;
-    }
-
-    public Long getAlarmCount() {
-        return alarmCount;
-    }
-
-    public void setAlarmCount(Long alarmCount) {
-        this.alarmCount = alarmCount;
-    }
-
-    @Override
-    public String toString() {
-        return "InspectionTask{" +
-                "taskId=" + taskId +
-                ", taskName='" + taskName + '\'' +
-                ", deviceId=" + deviceId +
-                ", deviceName='" + deviceName + '\'' +
-                ", cronExpression='" + cronExpression + '\'' +
-                ", duration=" + duration +
-                ", status='" + status + '\'' +
-                ", enableDetection='" + enableDetection + '\'' +
-                ", threshold=" + threshold +
-                ", lastExecuteTime=" + lastExecuteTime +
-                ", nextExecuteTime=" + nextExecuteTime +
-                ", executeCount=" + executeCount +
-                ", alarmCount=" + alarmCount +
-                '}';
+    
+    /**
+     * 设置ID的兼容方法，保持与原有代码兼容
+     */
+    public void setId(Long id) {
+        this.taskId = id;
     }
 }