Merge remote-tracking branch 'origin/master'

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

@@ -24,76 +24,100 @@ import java.util.List;
 @Slf4j
 @RequestMapping("${url.manage.prefix}${url.manage.version}/upstream")
 public class UpstreamController {
-
+    
     @Autowired
     private IDeviceService deviceService;
-
-
+    
     @Autowired
     private IManageDeviceLivestreamUrlService livestreamUrlService;
-
+    
     @Autowired
     private IFileService fileService;
-
-
+    
+    
     /**
      * 上游系统获取设备列表信息
+     *
      * @param searchInfo
      * @param status
+     * @param workspaceId
      * @return
      */
     @GetMapping("/devicesList")
     public HttpResultResponse<List<UpstreamDeviceDTO>> getDevicesList(String searchInfo,
                                                                       Integer status,
                                                                       String workspaceId) {
-        List<UpstreamDeviceDTO> devices = deviceService.selUpstreamDeviceList(searchInfo, status,workspaceId);
+        log.info("===========================>Fetching devices list with parameters - searchInfo: {}, status: {}, workspaceId: {}", searchInfo, status, workspaceId);
+        List<UpstreamDeviceDTO> devices = deviceService.selUpstreamDeviceList(searchInfo, status, workspaceId);
+        log.info("===========================>Fetched Return devices: {} ", devices);
         return HttpResultResponse.success(devices);
     }
-
+    
     /**
      * 上游系统获取图片文件信息
-     * @param workspaceName
+     *
      * @param startTime
      * @param endTime
+     * @param workspaceId
+     * @param deviceSn
+     * @param pictureType
      * @return
      */
     @GetMapping("/files")
     public HttpResultResponse<PaginationData<UpstreamMediaFileDTO>> getFilesList(@RequestParam(defaultValue = "1") Long page,
-                                                                                @RequestParam(name = "page_size", defaultValue = "10") Long pageSize,
-                                                                                String workspaceName,
-                                                                                Long startTime,
-                                                                                Long endTime,
-                                                                                 String workspaceId) {
-        PaginationData<UpstreamMediaFileDTO> filesList = fileService.getMediaFilesPagination(workspaceName, startTime,endTime, page, pageSize,workspaceId);
+                                                                                 @RequestParam(name = "page_size", defaultValue = "10") Long pageSize,
+                                                                                 String workspaceName,
+                                                                                 Long startTime,
+                                                                                 Long endTime,
+                                                                                 String workspaceId,
+                                                                                 String deviceSn,
+                                                                                 String pictureType) {
+        log.info("============================>Fetching files list with parameters - page: {}, pageSize: {}, startTime: {}, endTime: {}, workspaceId: {}, deviceSn: {}, pictureType: {}",
+                page, pageSize, startTime, endTime, workspaceId, deviceSn, pictureType);
+        PaginationData<UpstreamMediaFileDTO> filesList = fileService.getMediaFilesPagination(
+                workspaceName,
+                startTime,
+                endTime,
+                page,
+                pageSize,
+                workspaceId,
+                deviceSn,
+                pictureType
+        );
+        log.info("============================>Fetched Return filesList: {} ", filesList);
         return HttpResultResponse.success(filesList);
     }
-
+    
     /**
      * 上游系统获取直播地址
+     *
      * @param payload
      * @param deviceSn
      * @return
      */
     @GetMapping("/webRtc")
     public HttpResultResponse<List<UpstreamLivestreamUrlDTO>> getWebRtc(String payload,
-                                                                    String deviceSn,
-                                                                    String workspaceId) {
-        List<UpstreamLivestreamUrlDTO> url = livestreamUrlService.selWebRtc(payload, deviceSn,workspaceId);
+                                                                        String deviceSn,
+                                                                        String workspaceId) {
+        List<UpstreamLivestreamUrlDTO> url = livestreamUrlService.selWebRtc(payload, deviceSn, workspaceId);
         return HttpResultResponse.success(url);
     }
-
+    
     /**
      * 上游系统获取设备列表详情信息
+     *
      * @param searchInfo
      * @param status
      * @return
      */
     @GetMapping("/devicesDetailList")
     public HttpResultResponse<List<UpstreamDeviceDetailDTO>> getDevicesDetailList(String searchInfo,
-                                                                                    Integer status,
+                                                                                  Integer status,
                                                                                   String workspaceId) {
-        List<UpstreamDeviceDetailDTO> devices = deviceService.selUpstreamDeviceDetailList(searchInfo, status,workspaceId);
+        log.info("===========================>Fetching devices detail list with parameters - searchInfo: {}, status: {}, workspaceId: {}", searchInfo, status, workspaceId);
+        List<UpstreamDeviceDetailDTO> devices = deviceService.selUpstreamDeviceDetailList(searchInfo, status, workspaceId);
+        log.info("===========================>Fetched Return devices details: {} ", devices);
         return HttpResultResponse.success(devices);
     }
-
+    
 }

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,7 @@ 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

@@ -880,8 +880,10 @@ 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())) {
@@ -890,7 +892,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));
     }
 

Backend/sample/src/main/resources/application-prd.yml

@@ -139,7 +139,8 @@ logging:
 
 ntp:
   server:
-    host: Google.mzr.me
+    #host: Google.mzr.me
+    host: ntp.tencent.com
 
 # To create a license for an application: https://developer.dji.com/user/apps/#all
 cloud-api: