From c3b04f92b4c196644a80a912a601b5c29194f71b Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 05 八月 2023 09:37:52 +0800
Subject: [PATCH] 增加线程池配置信息 修改雷达数据最近一次引导从redis获取
---
ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml b/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml
index 106e9c4..1f65a23 100644
--- a/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml
+++ b/ard-work/src/main/resources/mapper/app/ArdAppTaskMapper.xml
@@ -27,7 +27,12 @@
<!-- <collection property="ardAppTaskDetailList" notNullColumn="sub1_id" javaType="java.util.List"-->
<!-- resultMap="ArdAppTaskDetailResult"/>-->
</resultMap>
-
+ <resultMap id="ArdAppTaskSub1Result" type="ArdAppTask" extends="ArdAppTaskResult">
+ <collection property="ardAppTaskPicList" notNullColumn="sub2_id" javaType="java.util.List"
+ resultMap="ArdAppTaskPicResult"/>
+ <collection property="ardAppTaskDetailList" notNullColumn="sub1_id" javaType="java.util.List"
+ resultMap="ArdAppTaskDetailResult"/>
+ </resultMap>
<resultMap type="ArdAppTaskDetail" id="ArdAppTaskDetailResult">
<result property="id" column="sub1_id"/>
<result property="name" column="sub1_name"/>
@@ -93,7 +98,8 @@
c.view_time as sub1_view_time,
c.view_position as sub1_view_position,
c.clock_in_time as sub1_clock_in_time,
- c.view_flag as sub1_view_flag
+ c.view_flag as sub1_view_flag,
+ c.task_id as sub1_task_id
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
@@ -152,19 +158,31 @@
</if>
</where>
</select>
-
- <select id="selectArdAppTaskById" parameterType="String" resultMap="ArdAppTaskSubResult">
+ <select id="selectArdAppTaskDetailListByTaskId" resultType="ArdAppTaskDetail">
+ select * from ard_app_task_detail where task_id=#{taskId}
+ </select>
+ <select id="selectArdAppTaskById" parameterType="String" resultMap="ArdAppTaskSub1Result">
<include refid="selectArdAppTaskDto"/>
where a.id = #{id}
</select>
<select id="selectArdAppTaskDetailListByIdAndUserId" resultType="ArdAppTaskDetail">
- select * from ard_app_task_detail d
- where d.task_id = #{id} and d.user_id = #{detailUserId}
+ select *
+ from ard_app_task_detail d
+ where d.task_id = #{id}
+ and d.user_id = #{detailUserId}
</select>
<select id="selectArdAppTaskPicListById" resultType="ArdAppTaskPic">
- select * from ard_app_task_pic d where d.task_id = #{id}
+ select *
+ from ard_app_task_pic d
+ where d.task_id = #{id}
</select>
+ <select id="selectArdAppTaskDetailUserIdsByTaskId" parameterType="String" resultType="java.lang.String">
+ select DISTINCT(user_id)
+ from ard_app_task_detail
+ where task_id = #{taskId}
+ </select>
+
<insert id="insertArdAppTask" parameterType="ArdAppTask">
insert into ard_app_task
@@ -321,7 +339,7 @@
from ard_app_task_detail c
where c.id = #{id}
</select>
- <select id="selectNewArdAppTaskByUserId" parameterType="String" resultMap="ArdAppTaskSubResult">
+ <select id="selectNewArdAppTaskByUserId" parameterType="String" resultMap="ArdAppTaskSub1Result">
<include refid="selectArdAppTaskDto"/>
where c.user_id = #{userId} AND c.view_flag is null
order by create_time desc limit 1
--
Gitblit v1.9.3