total修改 deviceOsd修改

Backend/sample/src/main/java/com/dji/sample/manage/service/impl/SDKDeviceService.java

@@ -852,7 +852,10 @@ public class SDKDeviceService extends AbstractDeviceService {
             dto.setElevation(osdRcDrone.getElevation());
             dto.setWindSpeed(osdRcDrone.getWindSpeed());
             dto.setTotalFlightTime(osdRcDrone.getTotalFlightTime());
-
+            dto.setPositionState(osdRcDrone.getPositionState());
+            dto.setHomeDistance(osdRcDrone.getHomeDistance());
+            dto.setHorizontalSpeed(osdRcDrone.getHorizontalSpeed());
+            dto.setWindDirection(osdRcDrone.getWindDirection());
         } else if (data instanceof OsdDockDrone) {
             OsdDockDrone osdDockDrone = (OsdDockDrone) data;
             dto.setBattery(osdDockDrone.getBattery());
@@ -866,6 +869,10 @@ public class SDKDeviceService extends AbstractDeviceService {
             dto.setElevation(osdDockDrone.getElevation());
             dto.setWindSpeed(osdDockDrone.getWindSpeed());
             dto.setTotalFlightTime(osdDockDrone.getTotalFlightTime());
+            dto.setPositionState(osdDockDrone.getPositionState());
+            dto.setHomeDistance(osdDockDrone.getHomeDistance());
+            dto.setHorizontalSpeed(osdDockDrone.getHorizontalSpeed());
+            dto.setWindDirection(osdDockDrone.getWindDirection());
         }
 
         return dto;

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

@@ -71,13 +71,13 @@ public interface IFileMapper extends BaseMapper<MediaFileEntity> {
             "    AND MF.picture_time &gt; #{startTime}  " +
             "</if>" +
             "<if test= 'endTime != null' >" +
-            "    AND MF.picture_time = #{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 &lt; #{deviceSn}  " +
+            "    AND MF.drone = #{deviceSn}  " +
             "</if>" +
             "</script>")
     long getMediaFilesCount(@Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("workspaceName") String workspaceName,@Param("workspaceId") String workspaceId,@Param("deviceSn")String deviceSn,