视频巡检任务 重新生成表

zhangjian

2023-05-30 4f540e1253a99e33bf76be60ec5fdd02ca3123d4

视频巡检任务 重新生成表

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

@@ -47,17 +47,13 @@
    @Excel(name = "相机id")
    private String cameraId;

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

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

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

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

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

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

    /** 视频巡检步骤信息 */
    private List<ArdVideoInspectTaskStep> ardVideoInspectTaskStepList;
@@ -142,24 +142,6 @@
    {
        return cameraId;
    }
    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 void setChannel(String channel) 
    {
        this.channel = channel;
@@ -168,6 +150,15 @@
    public String getChannel() 
    {
        return channel;
    }
    public void setCurrentStepId(String currentStepId) 
    {
        this.currentStepId = currentStepId;
    }

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

    public String getCurrentStopStartTime() 
    {
        return currentStopStartTime;
    }

    public List<ArdVideoInspectTaskStep> getArdVideoInspectTaskStepList()
@@ -210,14 +210,14 @@
            .append("menualSwitch", getMenualSwitch())
            .append("createBy", getCreateBy())
            .append("cameraId", getCameraId())
            .append("currentStepId", getCurrentStepId())
            .append("currentStepStartTime", getCurrentStepStartTime())
            .append("channel", getChannel())
            .append("currentStepId", getCurrentStepId())
            .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

@@ -22,10 +22,6 @@
    @Excel(name = "排序")
    private String orderNumber;

    /** 操作相机编号 */
    @Excel(name = "操作相机编号")
    private String cameraId;

    /** 录制时间 */
    @Excel(name = "录制时间")
    private String recordingTime;
@@ -63,15 +59,6 @@
    public String getOrderNumber() 
    {
        return orderNumber;
    }
    public void setCameraId(String cameraId) 
    {
        this.cameraId = cameraId;
    }

    public String getCameraId() 
    {
        return cameraId;
    }
    public void setRecordingTime(String recordingTime) 
    {
@@ -124,7 +111,6 @@
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
            .append("id", getId())
            .append("orderNumber", getOrderNumber())
            .append("cameraId", getCameraId())
            .append("recordingTime", getRecordingTime())
            .append("wellId", getWellId())
            .append("taskId", getTaskId())

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

@@ -14,14 +14,14 @@
        <result property="menualSwitch"    column="menual_switch"    />
        <result property="createBy"    column="create_by"    />
        <result property="cameraId"    column="camera_id"    />
        <result property="currentStepId"    column="current_step_id"    />
        <result property="currentStepStartTime"    column="current_step_start_time"    />
        <result property="channel"    column="channel"    />
        <result property="currentStepId"    column="current_step_id"    />
        <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">
@@ -31,7 +31,6 @@
    <resultMap type="ArdVideoInspectTaskStep" id="ArdVideoInspectTaskStepResult">
        <result property="id"    column="sub_id"    />
        <result property="orderNumber"    column="sub_order_number"    />
        <result property="cameraId"    column="sub_camera_id"    />
        <result property="recordingTime"    column="sub_recording_time"    />
        <result property="wellId"    column="sub_well_id"    />
        <result property="taskId"    column="sub_task_id"    />
@@ -40,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, current_step_id, current_step_start_time, channel, create_time, update_by, update_time, dept_id, user_id 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, create_time, update_by, update_time, dept_id, user_id, current_stop_start_time from ard_video_inspect_task
    </sql>

    <select id="selectArdVideoInspectTaskList" parameterType="ArdVideoInspectTask" resultMap="ArdVideoInspectTaskResult">
@@ -53,17 +52,17 @@
            <if test="inspectMode != null  and inspectMode != ''"> and inspect_mode = #{inspectMode}</if>
            <if test="menualSwitch != null  and menualSwitch != ''"> and menual_switch = #{menualSwitch}</if>
            <if test="cameraId != null  and cameraId != ''"> and camera_id = #{cameraId}</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="channel != null  and channel != ''"> and channel = #{channel}</if>
            <if test="currentStepId != null  and currentStepId != ''"> and current_step_id = #{currentStepId}</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.current_step_id, a.current_step_start_time, a.channel, 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.camera_id as sub_camera_id, 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
        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,
 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
        where a.id = #{id}
@@ -81,14 +80,14 @@
            <if test="menualSwitch != null">menual_switch,</if>
            <if test="createBy != null">create_by,</if>
            <if test="cameraId != null">camera_id,</if>
            <if test="currentStepId != null">current_step_id,</if>
            <if test="currentStepStartTime != null">current_step_start_time,</if>
            <if test="channel != null">channel,</if>
            <if test="currentStepId != null">current_step_id,</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>
@@ -100,14 +99,14 @@
            <if test="menualSwitch != null">#{menualSwitch},</if>
            <if test="createBy != null">#{createBy},</if>
            <if test="cameraId != null">#{cameraId},</if>
            <if test="currentStepId != null">#{currentStepId},</if>
            <if test="currentStepStartTime != null">#{currentStepStartTime},</if>
            <if test="channel != null">#{channel},</if>
            <if test="currentStepId != null">#{currentStepId},</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>

@@ -122,14 +121,14 @@
            <if test="menualSwitch != null">menual_switch = #{menualSwitch},</if>
            <if test="createBy != null">create_by = #{createBy},</if>
            <if test="cameraId != null">camera_id = #{cameraId},</if>
            <if test="currentStepId != null">current_step_id = #{currentStepId},</if>
            <if test="currentStepStartTime != null">current_step_start_time = #{currentStepStartTime},</if>
            <if test="channel != null">channel = #{channel},</if>
            <if test="currentStepId != null">current_step_id = #{currentStepId},</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>
@@ -157,9 +156,9 @@
    </delete>

    <insert id="batchArdVideoInspectTaskStep">
        insert into ard_video_inspect_task_step( id, order_number, camera_id, recording_time, well_id, task_id, dept_id, user_id) values
        insert into ard_video_inspect_task_step( id, order_number, recording_time, well_id, task_id, dept_id, user_id) values
        <foreach item="item" index="index" collection="list" separator=",">
            ( #{item.id}, #{item.orderNumber}, #{item.cameraId}, #{item.recordingTime}, #{item.wellId}, #{item.taskId}, #{item.deptId}, #{item.userId})
            ( #{item.id}, #{item.orderNumber}, #{item.recordingTime}, #{item.wellId}, #{item.taskId}, #{item.deptId}, #{item.userId})
        </foreach>
    </insert>
</mapper>