From 883a15bbcbad503b084a5806b7deb99cfba6f539 Mon Sep 17 00:00:00 2001
From: zhangjianrock@163.com <zhangjianrock@163.com>
Date: 星期日, 28 四月 2024 10:51:49 +0800
Subject: [PATCH] 按任务id和开始时间查询
---
ard-work/src/main/java/com/ruoyi/inspect/mapper/ArdVideoInspectRecordMapper.java | 2 ++
ard-work/src/main/java/com/ruoyi/inspect/service/IArdVideoInspectRecordService.java | 1 +
ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectRecordServiceImpl.java | 5 +++++
server/redis/dump.rdb | 0
ard-work/src/main/java/com/ruoyi/inspect/controller/TaskController.java | 2 +-
ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectRecordController.java | 4 ++--
ard-work/src/main/resources/mapper/inspect/ArdVideoInspectRecordMapper.xml | 9 +++++++++
7 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectRecordController.java b/ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectRecordController.java
index e4c4d8e..b9fe59f 100644
--- a/ard-work/src/main/java/com/ruoyi/inspect/controller/ArdVideoInspectRecordController.java
+++ b/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')")
diff --git a/ard-work/src/main/java/com/ruoyi/inspect/controller/TaskController.java b/ard-work/src/main/java/com/ruoyi/inspect/controller/TaskController.java
index df6b92e..550ce20 100644
--- a/ard-work/src/main/java/com/ruoyi/inspect/controller/TaskController.java
+++ b/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();
}
diff --git a/ard-work/src/main/java/com/ruoyi/inspect/mapper/ArdVideoInspectRecordMapper.java b/ard-work/src/main/java/com/ruoyi/inspect/mapper/ArdVideoInspectRecordMapper.java
index cb938b8..1ebcc5b 100644
--- a/ard-work/src/main/java/com/ruoyi/inspect/mapper/ArdVideoInspectRecordMapper.java
+++ b/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);
/**
* 鏂板瑙嗛宸℃璁板綍
diff --git a/ard-work/src/main/java/com/ruoyi/inspect/service/IArdVideoInspectRecordService.java b/ard-work/src/main/java/com/ruoyi/inspect/service/IArdVideoInspectRecordService.java
index ba55704..5344380 100644
--- a/ard-work/src/main/java/com/ruoyi/inspect/service/IArdVideoInspectRecordService.java
+++ b/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);
/**
diff --git a/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectRecordServiceImpl.java b/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectRecordServiceImpl.java
index 20da998..bf203f3 100644
--- a/ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectRecordServiceImpl.java
+++ b/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);
+ }
+
/**
* 鎸夋湀浠借幏鍙栨瘡鏃ヨ褰曟枃浠舵暟閲�
*
diff --git a/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectRecordMapper.xml b/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectRecordMapper.xml
index b98e0c6..f65265d 100644
--- a/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectRecordMapper.xml
+++ b/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
diff --git a/server/redis/dump.rdb b/server/redis/dump.rdb
new file mode 100644
index 0000000..56bffcb
--- /dev/null
+++ b/server/redis/dump.rdb
Binary files differ
--
Gitblit v1.9.3