From 8d9a2d656e4ae007590c622e5f7c228adacdca49 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Fri, 14 Jun 2024 10:11:36 +0800
Subject: [PATCH] 统一风格
---
src/main/java/com/dji/sample/wayline/dao/IWaylineJobMapper.xml | 124 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 122 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/dji/sample/wayline/dao/IWaylineJobMapper.xml b/src/main/java/com/dji/sample/wayline/dao/IWaylineJobMapper.xml
index 90b955e..6a7bb5b 100644
--- a/src/main/java/com/dji/sample/wayline/dao/IWaylineJobMapper.xml
+++ b/src/main/java/com/dji/sample/wayline/dao/IWaylineJobMapper.xml
@@ -5,9 +5,11 @@
<select id="getPage" resultType="com.dji.sample.wayline.model.entity.WaylineJobEntity">
- SELECT job.* FROM wayline_job job
+ SELECT job.*,
+ ( SELECT CASE WHEN count( 1 ) > 0 THEN 1 ELSE 0 END FROM wayline_job WHERE parent_id = job.id ) AS hasChildren
+ FROM wayline_job job
LEFT JOIN wayline_file file ON job.file_id = file.wayline_id
- WHERE job.workspace_id = #{workspaceId}
+ WHERE job.workspace_id = #{workspaceId} and job.parent_id is NULL
<if test="queryParam.taskType != null and queryParam.taskType!= '' or queryParam.taskType==0 ">
AND job.task_type = #{queryParam.taskType}
</if>
@@ -40,4 +42,122 @@
ORDER BY job.create_time DESC
</select>
+
+ <select id="getPageNew" resultType="com.dji.sample.wayline.model.entity.WaylineJobEntity">
+
+ SELECT job.*,
+ ( SELECT CASE WHEN count( 1 ) > 0 THEN 1 ELSE 0 END FROM wayline_job WHERE parent_id = job.id ) AS hasChildren
+ FROM wayline_job job
+ LEFT JOIN wayline_file file ON job.file_id = file.wayline_id
+ WHERE job.workspace_id = #{workspaceId}
+ <if test="queryParam.taskType != null and queryParam.taskType!= '' or queryParam.taskType==0 ">
+ AND job.task_type = #{queryParam.taskType}
+ </if>
+
+ <if test="queryParam.name != null and queryParam.name != '' ">
+ AND ( (job.name LIKE CONCAT('%',#{queryParam.name},'%'))or(file.name LIKE CONCAT('%',#{queryParam.name},'%')) )
+ </if>
+
+ <if test="queryParam.status != null and queryParam.status !='' ">
+ AND job.status in
+ <foreach collection="queryParam.status.split(',')" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </if>
+
+ <if test="queryParam.startTime !=null and queryParam.endTime !=null">
+ AND DATE_FORMAT(FROM_UNIXTIME(job.begin_time/1000,'%Y-%m-%d'),'%Y-%m-%d') >= DATE_FORMAT(#{queryParam.startTime},'%Y-%m-%d')
+ </if>
+
+ <if test="queryParam.endTime !=null and queryParam.endTime !=null">
+ AND DATE_FORMAT(FROM_UNIXTIME(job.end_time/1000,'%Y-%m-%d'),'%Y-%m-%d') <= DATE_FORMAT(#{queryParam.endTime},'%Y-%m-%d')
+ </if>
+
+ <if test="queryParam.dockSn != null and queryParam.dockSn != '' ">
+ AND job.dock_sn in
+ <foreach collection="queryParam.dockSn.split(',')" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </if>
+
+ <if test="order != null and order != '' and order == 'DESC'">
+ ORDER BY job.begin_time DESC
+ </if>
+ <if test="order != null and order != '' and order == 'ASC'">
+ ORDER BY job.begin_time ASC
+ </if>
+
+ </select>
+
+ <select id="getLatest" resultType="com.dji.sample.wayline.model.entity.WaylineJobEntity">
+ SELECT job.* FROM wayline_job job
+ WHERE job.workspace_id = #{workspaceId}
+ <if test="queryParam.dockSn != null and queryParam.dockSn != '' ">
+ AND job.dock_sn = #{queryParam.dockSn}
+ </if>
+ AND job.status = 1
+ AND DATE_FORMAT(FROM_UNIXTIME(job.begin_time/1000,'%Y-%m-%d'),'%Y-%m-%d') >= DATE(NOW())
+ AND DATE_FORMAT(FROM_UNIXTIME(job.begin_time/1000,'%Y-%m-%d'),'%Y-%m-%d') <= DATE(NOW()) + INTERVAL 2 DAY
+ ORDER BY job.begin_time - NOW() ASC
+ LIMIT 1
+
+
+ </select>
+ <select id="getJobs" resultType="com.dji.sample.wayline.model.entity.WaylineJobEntity">
+
+ SELECT job.*
+ FROM wayline_job job
+ LEFT JOIN wayline_file file ON job.file_id = file.wayline_id
+ WHERE job.workspace_id = #{workspaceId}
+ <if test="queryParam.taskType != null and queryParam.taskType!= '' or queryParam.taskType==0 ">
+ AND job.task_type = #{queryParam.taskType}
+ </if>
+
+ <if test="queryParam.name != null and queryParam.name != '' ">
+ AND ( (job.name LIKE CONCAT('%',#{queryParam.name},'%'))or(file.name LIKE CONCAT('%',#{queryParam.name},'%')) )
+ </if>
+
+ <if test="queryParam.status != null and queryParam.status !='' ">
+ AND job.status in
+ <foreach collection="queryParam.status.split(',')" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </if>
+
+ <if test="queryParam.startTime !=null and queryParam.endTime !=null">
+ AND DATE_FORMAT(FROM_UNIXTIME(job.begin_time/1000,'%Y-%m-%d'),'%Y-%m-%d') >= DATE_FORMAT(#{queryParam.startTime},'%Y-%m-%d')
+ </if>
+
+ <if test="queryParam.endTime !=null and queryParam.endTime !=null">
+ AND DATE_FORMAT(FROM_UNIXTIME(job.end_time/1000,'%Y-%m-%d'),'%Y-%m-%d') <= DATE_FORMAT(#{queryParam.endTime},'%Y-%m-%d')
+ </if>
+
+ <if test="queryParam.dockSn != null and queryParam.dockSn != '' ">
+ AND job.dock_sn in
+ <foreach collection="queryParam.dockSn.split(',')" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ </if>
+
+ <if test="queryParam.parentId != null and queryParam.parentId !='' ">
+ AND job.parent_id = (SELECT id FROM wayline_job where job_id = #{queryParam.parentId})
+ </if>
+ ORDER BY job.create_time DESC
+
+
+ </select>
+ <select id="patrolStatistics" resultType="com.dji.sample.wayline.model.entity.WaylineJobEntity">
+ SELECT
+ *
+ FROM
+ wayline_job
+ WHERE 1=1
+ and status = 3
+ <if test="queryTime != null and queryTime != ''">
+ and ( FROM_UNIXTIME( execute_time / 1000, '%Y' ) = #{queryTime} OR FROM_UNIXTIME( execute_time / 1000, '%Y-%m' ) = #{queryTime} )
+ </if>
+ <if test="workspaceId != null and workspaceId != ''">
+ and workspace_id = #{workspaceId}
+ </if>
+ </select>
</mapper>
--
Gitblit v1.9.3