From 2db1aa88e8ab53096a936163d686b90d8e056a99 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 21 Aug 2024 23:18:33 +0800
Subject: [PATCH] 国土对接返回信息加密
---
src/main/java/com/dji/sample/media/dao/IFileMapper.xml | 71 ++++++++++++++++++++++++++++++++---
1 files changed, 65 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/dji/sample/media/dao/IFileMapper.xml b/src/main/java/com/dji/sample/media/dao/IFileMapper.xml
index 7bafea2..7062db7 100644
--- a/src/main/java/com/dji/sample/media/dao/IFileMapper.xml
+++ b/src/main/java/com/dji/sample/media/dao/IFileMapper.xml
@@ -19,19 +19,78 @@
AND file_name LIKE CONCAT('%',#{query.name},'%')
</if>
- <if test="query.fileSubType != null and query.fileSubType !='' ">
+ <if test="query.subFileType != null and query.subFileType !='' ">
AND sub_file_type in
- <foreach collection="query.fileSubType.split(',')" item="item" open="(" separator="," close=")">
+ <foreach collection="query.subFileType.split(',')" item="item" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="query.payload != null and query.payload !='' ">
- AND sub_file_type in
- <foreach collection="query.payload.split(',')" item="item" open="(" separator="," close=")">
- #{item}
- </foreach>
+ AND payload LIKE CONCAT('%',#{query.payload},'%')
+ </if>
+ ORDER BY create_time DESC
+
+ </select>
+ <select id="mediaPage" resultType="com.dji.sample.media.model.MediaJobDTO">
+ SELECT
+ j.collect_status,
+ m.job_id,
+ t.url,
+ COUNT( CASE WHEN m.file_name LIKE '%.mp4' THEN 1 END) AS videoCount,
+ COUNT( CASE WHEN m.file_name LIKE '%.jpeg' THEN 1 END ) AS picCount,
+ DATE_FORMAT(FROM_UNIXTIME(j.create_time/1000,'%Y-%m-%d'),'%Y-%m-%d') as create_time
+ FROM
+ media_file m LEFT JOIN wayline_job j ON m.job_id = j.job_id
+-- LEFT JOIN (SELECT CONCAT("https://dev.jxpskj.com:8026/cloud-bucket",object_key) as url,job_id from media_file WHERE file_name LIKE '%.jpeg' GROUP BY job_id) t ON t.job_id = m.job_id
+ LEFT JOIN (SELECT CONCAT(#{param.fileAddress},object_key) as url,job_id from media_file WHERE file_name LIKE '%.jpeg' GROUP BY job_id) t ON t.job_id = m.job_id
+ LEFT JOIN wayline_file w ON w.wayline_id = j.file_id
+ where 1=1
+ <if test="workspaceId != null and workspaceId != ''">
+ and j.workspace_id = #{workspaceId}
+ </if>
+ <if test="param.dockSn !=null and param.dockSn != ''">
+ and j.dock_sn = #{param.dockSn}
+ </if>
+ <if test="param.startTime !=null and param.endTime !=null">
+ AND DATE_FORMAT(FROM_UNIXTIME(j.create_time/1000,'%Y-%m-%d'),'%Y-%m-%d') >= DATE_FORMAT(#{param.startTime},'%Y-%m-%d')
</if>
+ <if test="param.endTime !=null and param.endTime !=null">
+ AND DATE_FORMAT(FROM_UNIXTIME(j.create_time/1000,'%Y-%m-%d'),'%Y-%m-%d') <= DATE_FORMAT(#{param.endTime},'%Y-%m-%d')
+ </if>
+ <if test="param.waylineFileId != null and param.waylineFileId != ''">
+ and w.wayline_id = #{param.waylineFileId}
+ </if>
+ GROUP BY m.job_id
+ ORDER BY
+ <if test="param.sort eq 2">j.collect_status = 1 desc,</if>
+ <if test="param.sort eq 3">m.collect_status = 1 desc,</if>
+ j.create_time desc
+ </select>
+ <select id="mediaDetail" resultType="com.dji.sample.media.model.MediaJobDTO">
+ SELECT
+ m.collect_status,
+ m.job_id,
+ m.file_id,
+ CONCAT(#{fileAddress},m.object_key) as url,
+ CASE WHEN m.file_name LIKE '%.mp4' THEN "视频" ELSE "图片" END AS type,
+ DATE_FORMAT( FROM_UNIXTIME( m.create_time / 1000, '%Y-%m-%d' ), '%Y-%m-%d' ) AS create_time
+ FROM
+ media_file m
+ WHERE
+ 1 = 1
+ <if test="jobId != null and jobId != ''">
+ and m.job_id = #{jobId}
+ </if>
+ ORDER BY type = '视频' DESC
+ </select>
+
+ <select id="getMediaFieByTid" resultType="com.dji.sample.media.model.MediaFileEntity">
+ SELECT *
+ FROM media_file
+ WHERE CAST(JSON_EXTRACT(metadata, '$.createdTime') AS UNSIGNED) >= #{timestamp}
+ ORDER BY CAST(JSON_EXTRACT(metadata, '$.createdTime') / 1000 AS UNSIGNED) ASC
+ LIMIT 1;
</select>
</mapper>
--
Gitblit v1.9.3