From f041323a2bce037843fcb163b017427baa556da3 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: 星期三, 24 七月 2024 16:41:16 +0800
Subject: [PATCH] 优化:修改未读消息入库前判断不存在则插入 取消：程序自动拉起redis/mediamtx/minio,中间件全部服务化 增加：流媒体vtdu详情接口
---
ard-work/src/main/resources/mapper/inspect/ArdVideoInspectRecordMapper.xml | 36 ++++++++++++++++++++++++++++++++----
1 files changed, 32 insertions(+), 4 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectRecordMapper.xml b/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectRecordMapper.xml
index c08b4cc..5d15653 100644
--- a/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectRecordMapper.xml
+++ b/ard-work/src/main/resources/mapper/inspect/ArdVideoInspectRecordMapper.xml
@@ -15,21 +15,46 @@
</resultMap>
<sql id="selectArdVideoInspectRecordVo">
- select id, start_time, end_time, record_file_path, step_id, dept_id, user_id from ard_video_inspect_record
+ select id, start_time, end_time, record_file_path, step_id, dept_id, user_id,well_name from ard_video_inspect_record
</sql>
<select id="selectArdVideoInspectRecordList" parameterType="ArdVideoInspectRecord" resultMap="ArdVideoInspectRecordResult">
<include refid="selectArdVideoInspectRecordVo"/>
- <where>
+ <where>
<if test="startTime != null and startTime != ''"> and start_time = #{startTime}</if>
- <if test="endTime != null and endTime != ''"> and end_time = #{endTime}</if>
+ <if test="endTime != null and endTime != ''"> and end_time = #{ejava.util.HashMapndTime}</if>
<if test="recordFilePath != null and recordFilePath != ''"> and record_file_path = #{recordFilePath}</if>
<if test="stepId != null and stepId != ''"> and step_id = #{stepId}</if>
<if test="deptId != null and deptId != ''"> and dept_id = #{deptId}</if>
<if test="userId != null and userId != ''"> and user_id = #{userId}</if>
</where>
</select>
-
+ <!--鎸夋棩鏈熸煡璇�-->
+ <select id="selectArdVideoInspectRecordListByStartTime" parameterType="ArdVideoInspectRecord" resultType="java.util.HashMap">
+ <include refid="selectArdVideoInspectRecordVo"/>
+ <where>
+ <if test="startTime != null and startTime != ''">and start_time like ('${startTime}%')</if>
+ <if test="stepId != null and stepId != ''">and step_id = #{stepId}</if>
+ </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
+ (select substring(r.start_time,0,11)as start_date,* from ard_video_inspect_record r
+ where r.start_time like '${startMonth}%') as f
+ group by f.start_date
+ </select>
+
<select id="selectArdVideoInspectRecordById" parameterType="String" resultMap="ArdVideoInspectRecordResult">
<include refid="selectArdVideoInspectRecordVo"/>
where id = #{id}
@@ -45,6 +70,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>
@@ -54,6 +80,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>
@@ -66,6 +93,7 @@
<if test="stepId != null">step_id = #{stepId},</if>
<if test="deptId != null">dept_id = #{deptId},</if>
<if test="userId != null">user_id = #{userId},</if>
+ <if test="wellName != null">well_name = #{wellName},</if>
</trim>
where id = #{id}
</update>
--
Gitblit v1.9.3