视频巡检任务 重新生成表

zhangjian

2023-05-30 690514a1445d8925f62f9c73e9ed563f647a00c7

视频巡检任务 重新生成表

 ard-work/src/main/java/com/ruoyi/inspect/domain/ArdVideoInspectTask.java

@@ -49,11 +49,15 @@

    /** 通道号 */
    @Excel(name = "通道号")
    private String channel;
    private Integer channel;

    /** 当前步骤 */
    @Excel(name = "当前步骤")
    private String currentStepId;

    /** 当前步骤开始时间 */
    @Excel(name = "当前步骤开始时间")
    private String currentStepStartTime;

    /** 部门id */
    @Excel(name = "部门id")
@@ -62,10 +66,6 @@
    /** 用户id */
    @Excel(name = "用户id")
    private String userId;

    /** 当前步骤开始时间 */
    @Excel(name = "当前步骤开始时间")
    private String currentStopStartTime;

    /** 视频巡检步骤信息 */
    private List<ArdVideoInspectTaskStep> ardVideoInspectTaskStepList;
@@ -142,12 +142,12 @@
    {
        return cameraId;
    }
    public void setChannel(String channel) 
    public void setChannel(Integer channel)
    {
        this.channel = channel;
    }

    public String getChannel() 
    public Integer getChannel()
    {
        return channel;
    }
@@ -159,6 +159,15 @@
    public String getCurrentStepId() 
    {
        return currentStepId;
    }
    public void setCurrentStepStartTime(String currentStepStartTime) 
    {
        this.currentStepStartTime = currentStepStartTime;
    }

    public String getCurrentStepStartTime() 
    {
        return currentStepStartTime;
    }
    public void setDeptId(String deptId) 
    {
@@ -177,15 +186,6 @@
    public String getUserId() 
    {
        return userId;
    }
    public void setCurrentStopStartTime(String currentStopStartTime) 
    {
        this.currentStopStartTime = currentStopStartTime;
    }

    public String getCurrentStopStartTime() 
    {
        return currentStopStartTime;
    }

    public List<ArdVideoInspectTaskStep> getArdVideoInspectTaskStepList()
@@ -212,12 +212,12 @@
            .append("cameraId", getCameraId())
            .append("channel", getChannel())
            .append("currentStepId", getCurrentStepId())
            .append("currentStepStartTime", getCurrentStepStartTime())
            .append("createTime", getCreateTime())
            .append("updateBy", getUpdateBy())
            .append("updateTime", getUpdateTime())
            .append("deptId", getDeptId())
            .append("userId", getUserId())
            .append("currentStopStartTime", getCurrentStopStartTime())
            .append("ardVideoInspectTaskStepList", getArdVideoInspectTaskStepList())
            .toString();
    }

 ard-work/src/main/java/com/ruoyi/inspect/domain/ArdVideoInspectTaskStep.java

@@ -20,11 +20,11 @@

    /** 排序 */
    @Excel(name = "排序")
    private String orderNumber;
    private Integer orderNumber;

    /** 录制时间 */
    @Excel(name = "录制时间")
    private String recordingTime;
    private Integer recordingTime;

    /** 井id */
    @Excel(name = "井id")
@@ -51,21 +51,21 @@
    {
        return id;
    }
    public void setOrderNumber(String orderNumber) 
    public void setOrderNumber(Integer orderNumber)
    {
        this.orderNumber = orderNumber;
    }

    public String getOrderNumber() 
    public Integer getOrderNumber()
    {
        return orderNumber;
    }
    public void setRecordingTime(String recordingTime) 
    public void setRecordingTime(Integer recordingTime)
    {
        this.recordingTime = recordingTime;
    }

    public String getRecordingTime() 
    public Integer getRecordingTime()
    {
        return recordingTime;
    }

 ard-work/src/main/resources/mapper/inspect/ArdVideoInspectTaskMapper.xml

@@ -16,12 +16,12 @@
        <result property="cameraId"    column="camera_id"    />
        <result property="channel"    column="channel"    />
        <result property="currentStepId"    column="current_step_id"    />
        <result property="currentStepStartTime"    column="current_step_start_time"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"    column="update_by"    />
        <result property="updateTime"    column="update_time"    />
        <result property="deptId"    column="dept_id"    />
        <result property="userId"    column="user_id"    />
        <result property="currentStopStartTime"    column="current_stop_start_time"    />
    </resultMap>

    <resultMap id="ArdVideoInspectTaskArdVideoInspectTaskStepResult" type="ArdVideoInspectTask" extends="ArdVideoInspectTaskResult">
@@ -39,7 +39,7 @@
    </resultMap>

    <sql id="selectArdVideoInspectTaskVo">
        select id, task_name, start_time, end_time, repeat_period, inspect_mode, menual_switch, create_by, camera_id, channel, current_step_id, create_time, update_by, update_time, dept_id, user_id, current_stop_start_time from ard_video_inspect_task
        select id, task_name, start_time, end_time, repeat_period, inspect_mode, menual_switch, create_by, camera_id, channel, current_step_id, current_step_start_time, create_time, update_by, update_time, dept_id, user_id from ard_video_inspect_task
    </sql>

    <select id="selectArdVideoInspectTaskList" parameterType="ArdVideoInspectTask" resultMap="ArdVideoInspectTaskResult">
@@ -54,14 +54,14 @@
            <if test="cameraId != null  and cameraId != ''"> and camera_id = #{cameraId}</if>
            <if test="channel != null  and channel != ''"> and channel = #{channel}</if>
            <if test="currentStepId != null  and currentStepId != ''"> and current_step_id = #{currentStepId}</if>
            <if test="currentStepStartTime != null  and currentStepStartTime != ''"> and current_step_start_time = #{currentStepStartTime}</if>
            <if test="deptId != null  and deptId != ''"> and dept_id = #{deptId}</if>
            <if test="userId != null  and userId != ''"> and user_id = #{userId}</if>
            <if test="currentStopStartTime != null  and currentStopStartTime != ''"> and current_stop_start_time = #{currentStopStartTime}</if>
        </where>
    </select>
    
    <select id="selectArdVideoInspectTaskById" parameterType="String" resultMap="ArdVideoInspectTaskArdVideoInspectTaskStepResult">
        select a.id, a.task_name, a.start_time, a.end_time, a.repeat_period, a.inspect_mode, a.menual_switch, a.create_by, a.camera_id, a.channel, a.current_step_id, a.create_time, a.update_by, a.update_time, a.dept_id, a.user_id, a.current_stop_start_time,
        select a.id, a.task_name, a.start_time, a.end_time, a.repeat_period, a.inspect_mode, a.menual_switch, a.create_by, a.camera_id, a.channel, a.current_step_id, a.current_step_start_time, a.create_time, a.update_by, a.update_time, a.dept_id, a.user_id,
 b.id as sub_id, b.order_number as sub_order_number, b.recording_time as sub_recording_time, b.well_id as sub_well_id, b.task_id as sub_task_id, b.dept_id as sub_dept_id, b.user_id as sub_user_id
        from ard_video_inspect_task a
        left join ard_video_inspect_task_step b on b.task_id = a.id
@@ -82,12 +82,12 @@
            <if test="cameraId != null">camera_id,</if>
            <if test="channel != null">channel,</if>
            <if test="currentStepId != null">current_step_id,</if>
            <if test="currentStepStartTime != null">current_step_start_time,</if>
            <if test="createTime != null">create_time,</if>
            <if test="updateBy != null">update_by,</if>
            <if test="updateTime != null">update_time,</if>
            <if test="deptId != null">dept_id,</if>
            <if test="userId != null">user_id,</if>
            <if test="currentStopStartTime != null">current_stop_start_time,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id},</if>
@@ -101,12 +101,12 @@
            <if test="cameraId != null">#{cameraId},</if>
            <if test="channel != null">#{channel},</if>
            <if test="currentStepId != null">#{currentStepId},</if>
            <if test="currentStepStartTime != null">#{currentStepStartTime},</if>
            <if test="createTime != null">#{createTime},</if>
            <if test="updateBy != null">#{updateBy},</if>
            <if test="updateTime != null">#{updateTime},</if>
            <if test="deptId != null">#{deptId},</if>
            <if test="userId != null">#{userId},</if>
            <if test="currentStopStartTime != null">#{currentStopStartTime},</if>
         </trim>
    </insert>

@@ -123,12 +123,12 @@
            <if test="cameraId != null">camera_id = #{cameraId},</if>
            <if test="channel != null">channel = #{channel},</if>
            <if test="currentStepId != null">current_step_id = #{currentStepId},</if>
            <if test="currentStepStartTime != null">current_step_start_time = #{currentStepStartTime},</if>
            <if test="createTime != null">create_time = #{createTime},</if>
            <if test="updateBy != null">update_by = #{updateBy},</if>
            <if test="updateTime != null">update_time = #{updateTime},</if>
            <if test="deptId != null">dept_id = #{deptId},</if>
            <if test="userId != null">user_id = #{userId},</if>
            <if test="currentStopStartTime != null">current_stop_start_time = #{currentStopStartTime},</if>
        </trim>
        where id = #{id}
    </update>