zhangjianrock@163.com
2024-04-28 883a15bbcbad503b084a5806b7deb99cfba6f539
按任务id和开始时间查询
已添加1个文件
已修改6个文件
23 ■■■■ 文件已修改
ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectRecordController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/inspect/controller/TaskController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/inspect/mapper/ArdVideoInspectRecordMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/inspect/service/IArdVideoInspectRecordService.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectRecordServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/resources/mapper/inspect/ArdVideoInspectRecordMapper.xml 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/redis/dump.rdb 补丁 | 查看 | 原始文档 | blame | 历史
ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectRecordController.java
@@ -49,9 +49,9 @@
    //不校验权限
    @GetMapping("/listByStartTime/noPerm")
    public TableDataInfo listByStartTimeNoPerm(ArdVideoInspectRecord ardVideoInspectRecord) {
    public TableDataInfo listByStartTimeNoPerm(@RequestParam("taskId") String taskId,@RequestParam("startTime") String startTime) {
        startPage();
        List<HashMap> list = ardVideoInspectRecordService.selectArdVideoInspectRecordListByStartTime(ardVideoInspectRecord);
        List<HashMap> list = ardVideoInspectRecordService.selectTaskRecordByStartTime(taskId,startTime);
        return getDataTable(list);
    }
    @PreAuthorize("@ss.hasPermi('inspect:record:list')")
ard-work/src/main/java/com/ruoyi/inspect/controller/TaskController.java
@@ -74,7 +74,7 @@
    @ApiOperation("手动停止巡检")
    @GetMapping("/stopTask/{taskId}")
    AjaxResult stopTask(@PathVariable String taskId) {
        // 停止巡检任务
        // 停止巡检任务
        inspectionTaskManager.stopInspectionTask(taskId);
        return AjaxResult.success();
    }
ard-work/src/main/java/com/ruoyi/inspect/mapper/ArdVideoInspectRecordMapper.java
@@ -3,6 +3,7 @@
import java.util.HashMap;
import java.util.List;
import com.ruoyi.inspect.domain.ArdVideoInspectRecord;
import org.apache.ibatis.annotations.Param;
/**
 * 视频巡检记录Mapper接口
@@ -30,6 +31,7 @@
    @SuppressWarnings("MybatisXMapperMethodInspection")
    public List<HashMap> selectArdVideoInspectRecordListByStartTime(ArdVideoInspectRecord ardVideoInspectRecord);
    public List<HashMap> selectTaskRecordByStartTime(@Param("taskId") String taskId,@Param("startTime") String startTime);
    /**
     * 新增视频巡检记录
ard-work/src/main/java/com/ruoyi/inspect/service/IArdVideoInspectRecordService.java
@@ -33,6 +33,7 @@
     * @return
     */
    public List selectArdVideoInspectRecordListByStartTime(ArdVideoInspectRecord ardVideoInspectRecord);
    public List selectTaskRecordByStartTime(String taskId,String startTime);
    public List selectArdVideoInspectRecordCountByStartMonth(String startMonth);
    /**
ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectRecordServiceImpl.java
@@ -49,6 +49,11 @@
        return ardVideoInspectRecordMapper.selectArdVideoInspectRecordListByStartTime(ardVideoInspectRecord);
    }
    @Override
    public List selectTaskRecordByStartTime(String taskId, String startTime) {
        return ardVideoInspectRecordMapper.selectTaskRecordByStartTime(taskId,startTime);
    }
    /**
     * 按月份获取每日记录文件数量
     *
ard-work/src/main/resources/mapper/inspect/ArdVideoInspectRecordMapper.xml
@@ -38,6 +38,15 @@
        </where>
        order by start_time desc
    </select>
    <!--按日期,任务id查询-->
    <select id="selectTaskRecordByStartTime" resultType="java.util.HashMap">
            select r.*, s.task_id
            from ard_video_inspect_record r
                     LEFT JOIN ard_video_inspect_task_step s on r.step_id = s.id
            where s.task_id = '#{taskId}'
              and r.start_time like '#{startTime}%'
            order by r.start_time asc
    </select>
    <!--按月份统计文件数量-->
    <select id="selectArdVideoInspectRecordCountByStartMonth" parameterType="String" resultType="java.util.HashMap">
        select f.start_date,count(*) from
server/redis/dump.rdb
Binary files differ