Merge remote-tracking branch 'origin/master'

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

@@ -24,79 +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,
+                                                                                 @RequestParam(name = "page_size", defaultValue = "10") Long pageSize,
+                                                                                 String workspaceName,
+                                                                                 Long startTime,
+                                                                                 Long endTime,
+                                                                                 String workspaceId,
                                                                                  String deviceSn,
                                                                                  String pictureType) {
-        PaginationData<UpstreamMediaFileDTO> filesList = fileService.getMediaFilesPagination(workspaceName, startTime,endTime, page, pageSize,workspaceId,deviceSn,
-                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/service/IFileService.java

@@ -108,8 +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,String deviceSn,
-                                                                 String pictureType);
+    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

@@ -248,6 +248,7 @@ public class FileServiceImpl implements IFileService {
                             fileEntity.setSubFileType(MediaSubFileTypeEnum.PANORAMA.getType());
                         }
                         if(exif.getCreateTime() != null) {
+                            log.info("******exif pictureTime***********" + exif.getCreateTime());
                             fileEntity.setPictureTime(exif.getCreateTime());
                         }
 
@@ -411,7 +412,6 @@ public class FileServiceImpl implements IFileService {
 //        String dirName = getDirName(waylineName, file.getPath());
         String dirName = file.getPath();
         MediaDirDTO dirDto = null;
-
         synchronized(dirName.intern()) {
             dirDto = mediaDirService.getMediaDirByName(workspaceId, dirName, null);
             //文件夹不存在，则创建文件夹
@@ -436,7 +436,9 @@ public class FileServiceImpl implements IFileService {
 
             if (file != null) {
 
-
+                log.info("******媒体文件保存***********");
+                log.info("******当前时区***********" + ZoneId.systemDefault());
+                log.info("******pictureTime***********" + (file.getMetadata().getCreatedTime() != null ? file.getMetadata().getCreatedTime().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli() : null));
                 //经纬度转换
                 //AMap aMap = CoordinateUtil.transform(file.getMetadata().getShootPosition().getLng(),file.getMetadata().getShootPosition().getLat());
                 //AMap aMap = CoordinateUtil.transform(exif.getLongitude(),exif.getLatitude());
@@ -461,7 +463,7 @@ public class FileServiceImpl implements IFileService {
                         .absoluteAltitude(BigDecimal.valueOf(CoordinateUtil.checkValidVal(file.getMetadata().getAbsoluteAltitude())).setScale(6, RoundingMode.DOWN))
                         .relativeAltitude(BigDecimal.valueOf(CoordinateUtil.checkValidVal(file.getMetadata().getRelativeAltitude())).setScale(6, RoundingMode.DOWN))
 //                        .size(ossService.getObjectSize(OssConfiguration.bucket, file.getObjectKey()))
-                        .pictureTime(file.getMetadata().getCreatedTime() != null ? file.getMetadata().getCreatedTime().atZone(ZoneId.of("UTC+0")).toInstant().toEpochMilli() : null)
+                        .pictureTime(file.getMetadata().getCreatedTime() != null ? file.getMetadata().getCreatedTime().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli() : null)
 //                        .longitudeRef(exif.getLongitudeRef())
 //                        .latitudeRef(exif.getLatitudeRef())
 //                        .mediaType(exif.getPictureType())
@@ -541,6 +543,10 @@ public class FileServiceImpl implements IFileService {
                 MediaDirDTO mediaDirDTO = mediaDirService.getMediaDirById(null,String.valueOf(entity.getDirId()));
                 taskName = mediaDirDTO.getDirName();
             }
+            log.info("******媒体文件查询***********");
+            log.info("******当前时区***********" + ZoneId.systemDefault());
+            log.info("******entity.getCreateTime()***********" + entity.getCreateTime());
+            log.info("******LocalDateTime.ofInstant(Instant.ofEpochMilli(entity.getCreateTime()), ZoneId.systemDefault())***********" + LocalDateTime.ofInstant(Instant.ofEpochMilli(entity.getCreateTime()), ZoneId.systemDefault()));
             MediaTypeEnum mediaTypeEnum = convertMediaType(entity);
             String url = ossService.getObjectUrl(OssConfiguration.bucket, entity.getObjectKey()).toString();
             String thumbnailURL = getThumbnailURL(entity);
@@ -874,8 +880,7 @@ public class FileServiceImpl implements IFileService {
     }
 
     @Override
-    public PaginationData<UpstreamMediaFileDTO> getMediaFilesPagination(String workspaceName, Long startTime, Long endTime, long page, long pageSize,String workspaceId,String deviceSn,
-                                                                        String pictureType) {
+    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);
@@ -1066,6 +1071,4 @@ public class FileServiceImpl implements IFileService {
         });
     }
 
-
-
 }

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

@@ -110,6 +110,10 @@ public class MediaDirServiceImpl implements IMediaDirService {
         MediaDirEntity.MediaDirEntityBuilder builder = MediaDirEntity.builder();
 
         if (mediaDir != null) {
+            log.info("******媒体文件夹保存***********");
+            log.info("******当前时区***********" + ZoneId.systemDefault());
+            log.info("******当前时间***********" + System.currentTimeMillis());
+            log.info("******createTime***********" + (mediaDir.getCreateTime() != null ? mediaDir.getCreateTime().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli() : null));
             builder.workspaceId(mediaDir.getWorkspaceId())
                     .dirName(mediaDir.getDirName())
                     .parentId(mediaDir.getParentId())
@@ -127,6 +131,10 @@ public class MediaDirServiceImpl implements IMediaDirService {
     private MediaDirDTO entityToDto(MediaDirEntity mediaDirEntity) {
         MediaDirDTO.MediaDirDTOBuilder builder = MediaDirDTO.builder();
         if (mediaDirEntity != null) {
+            log.info("******媒体文件夹查询***********");
+            log.info("******当前时区***********" + ZoneId.systemDefault());
+            log.info("******当前时间***********" + System.currentTimeMillis());
+            log.info("******createTime***********" + (LocalDateTime.ofInstant(Instant.ofEpochMilli(mediaDirEntity.getCreateTime()), ZoneId.systemDefault())));
             builder.id(mediaDirEntity.getId())
                     .workspaceId(mediaDirEntity.getWorkspaceId())
                     .dirName(mediaDirEntity.getDirName())

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: