上游系统请求文件列表检索值添加deviceSn pictureType

Backend/sample/src/main/java/com/dji/sample/manage/controller/UpstreamController.java

@@ -63,8 +63,11 @@ public class UpstreamController {
                                                                                 String workspaceName,
                                                                                 Long startTime,
                                                                                 Long endTime,
-                                                                                 String workspaceId) {
-        PaginationData<UpstreamMediaFileDTO> filesList = fileService.getMediaFilesPagination(workspaceName, startTime,endTime, page, pageSize,workspaceId);
+                                                                                String workspaceId,
+                                                                                 String deviceSn,
+                                                                                 String pictureType) {
+        PaginationData<UpstreamMediaFileDTO> filesList = fileService.getMediaFilesPagination(workspaceName, startTime,endTime, page, pageSize,workspaceId,deviceSn,
+                pictureType);
         return HttpResultResponse.success(filesList);
     }
 

Backend/sample/src/main/java/com/dji/sample/media/dao/IFileMapper.java

@@ -39,14 +39,21 @@ public interface IFileMapper extends BaseMapper<MediaFileEntity> {
             "    AND MW.workspace_id = #{workspaceId}  " +
             "</if>" +
             "<if test= 'null != startTime'  >" +
-            "    AND MF.create_time &gt; #{startTime}  " +
+            "    AND MF.picture_time &gt; #{startTime}  " +
             "</if>" +
             "<if test= 'endTime != null' >" +
-            "    AND MF.create_time &lt; #{endTime}  " +
+            "    AND MF.picture_time &lt; #{endTime}  " +
+            "</if>" +
+            "<if test= 'pictureType != null' >" +
+            "    AND MF.picture_type = #{pictureType}  " +
+            "</if>" +
+            "<if test= 'deviceSn != null' >" +
+            "    AND MF.drone = #{deviceSn}  " +
             "</if>" +
             "order by pictureTime desc LIMIT #{page},#{pageSize} " +
             "</script>")
-    List<UpstreamMediaFileDTO> getMediaFiles(@Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("workspaceName") String workspaceName,@Param("page") long page,@Param("pageSize") long pageSize,@Param("workspaceId") String workspaceId);
+    List<UpstreamMediaFileDTO> getMediaFiles(@Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("workspaceName") String workspaceName,@Param("page") long page,@Param("pageSize") long pageSize,@Param("workspaceId") String workspaceId,@Param("deviceSn")String deviceSn,
+                                             @Param("pictureType")String pictureType);
     @Select("<script> " +
             "SELECT count(*) total " +
             "FROM MEDIA_FILE MF " +
@@ -61,12 +68,19 @@ public interface IFileMapper extends BaseMapper<MediaFileEntity> {
             "    AND MW.workspace_id = #{workspaceId}  " +
             "</if>" +
             "<if test= 'null != startTime'  >" +
-            "    AND MF.create_time &gt; #{startTime}  " +
+            "    AND MF.picture_time &gt; #{startTime}  " +
             "</if>" +
             "<if test= 'endTime != null' >" +
-            "    AND MF.create_time &lt; #{endTime}  " +
+            "    AND MF.picture_time = #{endTime}  " +
+            "</if>" +
+            "<if test= 'pictureType != null' >" +
+            "    AND MF.picture_type = #{pictureType}  " +
+            "</if>" +
+            "<if test= 'deviceSn != null' >" +
+            "    AND MF.drone &lt; #{deviceSn}  " +
             "</if>" +
             "</script>")
-    long getMediaFilesCount(@Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("workspaceName") String workspaceName,@Param("workspaceId") String workspaceId);
+    long getMediaFilesCount(@Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("workspaceName") String workspaceName,@Param("workspaceId") String workspaceId,@Param("deviceSn")String deviceSn,
+                            @Param("pictureType")String pictureType);
 
 }

Backend/sample/src/main/java/com/dji/sample/media/service/IFileService.java

@@ -108,7 +108,8 @@ public interface IFileService {
 
     boolean deleteMediaElement(String workspaceId, MediaFileDTO mediaFileDTO);
 
-    PaginationData<UpstreamMediaFileDTO> getMediaFilesPagination(String workspaceName, Long startTime, Long endTime, long page, long pageSize,String workspaceId);
+    PaginationData<UpstreamMediaFileDTO> getMediaFilesPagination(String workspaceName, Long startTime, Long endTime, long page, long pageSize,String workspaceId,String deviceSn,
+                                                                 String pictureType);
 
     UploadResultDTO uploadFile(MultipartFile file,String creator);
 

Backend/sample/src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java

@@ -874,8 +874,11 @@ public class FileServiceImpl implements IFileService {
     }
 
     @Override
-    public PaginationData<UpstreamMediaFileDTO> getMediaFilesPagination(String workspaceName, Long startTime, Long endTime, long page, long pageSize,String workspaceId) {
-        List<UpstreamMediaFileDTO> respData = mapper.getMediaFiles(startTime,endTime,workspaceName, page-1,  pageSize,workspaceId);
+    public PaginationData<UpstreamMediaFileDTO> getMediaFilesPagination(String workspaceName, Long startTime, Long endTime, long page, long pageSize,String workspaceId,String deviceSn,
+                                                                        String pictureType) {
+
+        List<UpstreamMediaFileDTO> respData = mapper.getMediaFiles(startTime,endTime,workspaceName, page-1,  pageSize,workspaceId,deviceSn,
+                pictureType);
         if(respData != null) {
             for(UpstreamMediaFileDTO mf : respData) {
                 if(StringUtils.hasText(mf.getFileUrl())) {
@@ -884,7 +887,8 @@ public class FileServiceImpl implements IFileService {
                 }
             }
         }
-        long total = mapper.getMediaFilesCount(startTime,endTime,workspaceName,workspaceId);
+        long total = mapper.getMediaFilesCount(startTime,endTime,workspaceName,workspaceId,deviceSn,
+                pictureType);
         return new PaginationData<UpstreamMediaFileDTO>(respData, new Pagination(page, pageSize, total));
     }