From e279e456850734349842edd8ce52dc16fc5cdea7 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期四, 27 七月 2023 09:58:01 +0800
Subject: [PATCH] 增加webrt流媒体随程序启动 修复用户添加报错的bug
---
ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml | 118 +++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 82 insertions(+), 36 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml b/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml
index b12a14b..820511b 100644
--- a/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml
+++ b/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml
@@ -93,13 +93,13 @@
a.create_time,
a.update_by,
a.update_time,
- b.id as sub2_id,
+ b.id as sub2_id,
b.task_id as sub2_task_id,
b.pic_url as sub2_pic_url,
- c.id as sub1_id,
+ c.id as sub1_id,
c.name as sub1_name,
c.longitude as sub1_longitude,
- c.latitude as sub1_latitde,
+ c.latitude as sub1_latitude,
c.altitude as sub1_altitude,
c.user_id as sub1_user_id,
c.text as sub1_text,
@@ -109,13 +109,59 @@
from ard_app_task a
left join ard_app_task_pic b on b.task_id = a.id
left join ard_app_task_detail c on c.task_id = a.id
- where c.user_id = #{userId}
- <if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
- and a.create_time >= to_timestamp(#{params.beginTime},'yyyy-MM-DD HH24:MI:ss')
- </if>
- <if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
- and a.create_time <= to_timestamp(#{params.endTime},'yyyy-MM-DD HH24:MI:ss')
- </if>
+ <where>
+ <if test="userId != null and userId != ''">
+ and c.user_id = #{userId}
+ </if>
+ <if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
+ and a.create_time >= to_timestamp(#{params.beginTime},'yyyy-MM-DD HH24:MI:ss')
+ </if>
+ <if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
+ and a.create_time <= to_timestamp(#{params.endTime},'yyyy-MM-DD HH24:MI:ss')
+ </if>
+ </where>
+ </select>
+ <select id="selectArdAppTaskListWithDetailById" parameterType="ArdAppTask" resultMap="ArdAppTaskSubResult">
+ select a.id,
+ a.name,
+ a.text,
+ a.voice,
+ a.dept_id,
+ a.user_id,
+ a.create_by,
+ a.create_time,
+ a.update_by,
+ a.update_time,
+ b.id as sub2_id,
+ b.task_id as sub2_task_id,
+ b.pic_url as sub2_pic_url,
+ c.id as sub1_id,
+ c.name as sub1_name,
+ c.longitude as sub1_longitude,
+ c.latitude as sub1_latitude,
+ c.altitude as sub1_altitude,
+ c.user_id as sub1_user_id,
+ c.text as sub1_text,
+ c.voice as sub1_voice,
+ c.status as sub1_status,
+ c.clock_in_pic_url as sub1_clock_in_pic_url
+ from ard_app_task a
+ left join ard_app_task_pic b on b.task_id = a.id
+ left join ard_app_task_detail c on c.task_id = a.id
+ <where>
+ <if test="id != null and id != ''">
+ and a.id = #{id}
+ </if>
+ <if test="userId != null and userId != ''">
+ and c.user_id = #{userId}
+ </if>
+ <if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
+ and a.create_time >= to_timestamp(#{params.beginTime},'yyyy-MM-DD HH24:MI:ss')
+ </if>
+ <if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
+ and a.create_time <= to_timestamp(#{params.endTime},'yyyy-MM-DD HH24:MI:ss')
+ </if>
+ </where>
</select>
<select id="selectArdAppTaskById" parameterType="String" resultMap="ArdAppTaskSubResult">
select a.id,
@@ -128,17 +174,17 @@
a.create_time,
a.update_by,
a.update_time,
- b.id as sub2_id,
- b.task_id as sub2_task_id,
- b.pic_url as sub2_pic_url,
- c.id as sub1_id,
- c.name as sub1_name,
+ b.id as sub2_id,
+ b.task_id as sub2_task_id,
+ b.pic_url as sub2_pic_url,
+ c.id as sub1_id,
+ c.name as sub1_name,
c.longitude as sub1_longitude,
- c.latitude as sub1_latitde,
- c.altitude as sub1_altitude,
- c.user_id as sub1_user_id,
- c.text as sub1_text,
- c.voice as sub1_voice
+ c.latitude as sub1_latitude,
+ c.altitude as sub1_altitude,
+ c.user_id as sub1_user_id,
+ c.text as sub1_text,
+ c.voice as sub1_voice
from ard_app_task a
left join ard_app_task_pic b on b.task_id = a.id
left join ard_app_task_detail c on c.task_id = a.id
@@ -155,9 +201,9 @@
a.create_time,
a.update_by,
a.update_time,
- b.id as sub_id,
- b.task_id as sub_task_id,
- b.pic_url as sub_pic_url
+ b.id as sub2_id,
+ b.task_id as sub2_task_id,
+ b.pic_url as sub2_pic_url
from ard_app_task a
left join ard_app_task_pic b on b.task_id = a.id
where a.id = #{id}
@@ -173,16 +219,16 @@
a.create_time,
a.update_by,
a.update_time,
- c.id as sub_id,
- c.name as sub_name,
- c.longitude as sub_longitude,
- c.latitude as sub_latitde,
- c.altitude as sub_altitude,
- c.user_id as sub_user_id,
- c.text as sub_text,
- c.voice as sub_voice,
- c.status as sub_status,
- c.clock_in_pic_url as sub_clock_in_pic_url
+ c.id as sub1_id,
+ c.name as sub1_name,
+ c.longitude as sub1_longitude,
+ c.latitude as sub1_latitude,
+ c.altitude as sub1_altitude,
+ c.user_id as sub1_user_id,
+ c.text as sub1_text,
+ c.voice as sub1_voice,
+ c.status as sub1_status,
+ c.clock_in_pic_url as sub1_clock_in_pic_url
from ard_app_task a
left join ard_app_task_detail c on c.task_id = a.id
where a.id = #{id}
@@ -279,7 +325,8 @@
</delete>
<insert id="batchArdAppTaskDetail">
- insert into ard_app_task_detail( id, name, longitude, latitude, altitude, user_id, text, voice, task_id,status,clock_in_pic_url) values
+ insert into ard_app_task_detail( id, name, longitude, latitude, altitude, user_id, text, voice,
+ task_id,status,clock_in_pic_url) values
<foreach item="item" index="index" collection="list" separator=",">
( #{item.id}, #{item.name}, #{item.longitude}, #{item.latitude}, #{item.altitude}, #{item.userId},
#{item.text}, #{item.voice}, #{item.taskId}, #{item.status}, #{item.clockInPicUrl})
@@ -308,8 +355,7 @@
where task_detail_id = #{taskDetailId}
</delete>
<select id="selectArdAppTaskDetailById" parameterType="String" resultType="ArdAppTaskDetail">
- select
- c.id,
+ select c.id,
c.name,
c.longitude,
c.latitude,
--
Gitblit v1.9.3