巡检记录增加wellName字段

‘liusuyi’

2023-06-05 20f84e1b1e20dca7b52d5c2213fd0fe1198b7b28

巡检记录增加wellName字段

 ard-work/src/main/java/com/ruoyi/constant/Global.java

@@ -1,9 +1,7 @@
package com.ruoyi.constant;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
 * @Description: 全局类
@@ -14,5 +12,6 @@
 **/
public class Global {

    //开启录像的任务列表
    public static List<String> task_record=new ArrayList<>();
}

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

@@ -41,8 +41,19 @@
    /** 用户id */
    @Excel(name = "用户id")
    private String userId;
    /** 井名称 */
    @Excel(name = "井名称")
    private String wellName;

    public void setId(String id) 
    public String getWellName() {
        return wellName;
    }

    public void setWellName(String wellName) {
        this.wellName = wellName;
    }

    public void setId(String id)
    {
        this.id = id;
    }

 ard-work/src/main/java/com/ruoyi/inspect/mapper/ArdVideoInspectRecordMapper.java

@@ -26,6 +26,7 @@
     * @return 视频巡检记录集合
     */
    public List<ArdVideoInspectRecord> selectArdVideoInspectRecordList(ArdVideoInspectRecord ardVideoInspectRecord);
    @SuppressWarnings("MybatisXMapperMethodInspection")
    public List selectArdVideoInspectRecordListByStartTime(ArdVideoInspectRecord ardVideoInspectRecord);

    /**
@@ -59,6 +60,6 @@
     * @return 结果
     */
    public int deleteArdVideoInspectRecordByIds(String[] ids);

    @SuppressWarnings("MybatisXMapperMethodInspection")
    List selectArdVideoInspectRecordCountByStartMonth(String startMonth);
}

 ard-work/src/main/java/com/ruoyi/inspect/mapper/ArdVideoInspectTaskMapper.java

@@ -1,6 +1,8 @@
package com.ruoyi.inspect.mapper;

import java.util.List;
import java.util.Map;

import com.ruoyi.inspect.domain.ArdVideoInspectTask;
import com.ruoyi.inspect.domain.ArdVideoInspectTaskStep;

@@ -90,6 +92,6 @@
     * @return 结果
     */
    public int deleteArdVideoInspectTaskStepByTaskId(String id);

    public List getTaskUsedCameraPeriods(String cameraId);
    @SuppressWarnings("MybatisXMapperMethodInspection")
    public  List<Map<String,Object>> getTaskUsedCameraPeriods(String cameraId);
}

 ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java

@@ -61,7 +61,7 @@
            }
            ardVideoInspectTask.setCurrentStepId("");
            ardVideoInspectTask.setCurrentStepStartTime("");
            ardVideoInspectTaskMapper.updateArdVideoInspectTask(ardVideoInspectTask);
            ardVideoInspectTaskMapper.updateArdVideoInspectTaskWithCurrentSetpInfo(ardVideoInspectTask);
        }
    }

@@ -514,6 +514,11 @@
                /*插入巡检记录*/
                ArdVideoInspectRecord ardVideoInspectRecord = new ArdVideoInspectRecord();
                ardVideoInspectRecord.setStepId(step.getId());
                ArdAlarmpointsWell ardAlarmpointsWell = ardAlarmpointsWellMapper.selectArdAlarmpointsWellById(step.getWellId());
                if(StringUtils.isNotNull(ardAlarmpointsWell))
                {
                    ardVideoInspectRecord.setWellName(ardAlarmpointsWell.getWellId());
                }
                Date currentStepStartDate = DateUtils.dateTime(DateUtils.YYYY_MM_DD_HH_MM_SS, currentStepStartTime);
                Date currentStepStopDate = DateUtils.addMinutes(currentStepStartDate, step.getRecordingTime());
                ardVideoInspectRecord.setStartTime(DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, currentStepStartDate));

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

@@ -58,6 +58,7 @@
            <if test="stepId != null">step_id,</if>
            <if test="deptId != null">dept_id,</if>
            <if test="userId != null">user_id,</if>
            <if test="wellName != null">well_name,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null">#{id},</if>
@@ -67,6 +68,7 @@
            <if test="stepId != null">#{stepId},</if>
            <if test="deptId != null">#{deptId},</if>
            <if test="userId != null">#{userId},</if>
            <if test="wellName != null">#{wellName},</if>
         </trim>
    </insert>


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

@@ -178,7 +178,7 @@
    </insert>

    <!--查询任务中相机已使用时段-->
    <select id="getTaskUsedCameraPeriods" parameterType="String" resultType="java.util.List">
    <select id="getTaskUsedCameraPeriods" parameterType="String" resultType="java.util.HashMap">
        select t.start_time,t.end_time from ard_video_inspect_task t
        where t.camera_id=#{startMonth}
        ORDER BY t.start_time