forked from uav/ard-uav-server
parent: 4c81bf | patch | commitdiff
zhaowenyu
2026-01-06 4e8a1c02b45f72f6377603778e8c8746ed82f374
refs
author zhaowenyu <35589726@qq.com>
Tuesday, January 6, 2026 10:04 +0800
committer zhaowenyu <35589726@qq.com>
Tuesday, January 6, 2026 10:04 +0800
commit4e8a1c02b45f72f6377603778e8c8746ed82f374
tree 8266b2586bb08294e376d3becfb9f5dcbf1475ed tree | zip | gz
parent 4c81bf56309588672a166511d451aa20ce21c604 view | diff
d2a65f0c13df21354ac83bf13b15f46937bd8ecb view | diff 
Merge remote-tracking branch 'origin/dev' into dev
9 files added
48 files modified
3 files deleted
2957 ■■■■■ changed files
ard-admin/src/main/java/com/ard/web/controller/data/ArdMapController.java 7 ●●●●● diff | view | raw | blame | history
ard-admin/src/main/java/com/ard/web/controller/data/ArdModelController.java 7 ●●●●● diff | view | raw | blame | history
ard-admin/src/main/java/com/ard/web/controller/data/ArdNoFlyZoneController.java 7 ●●●●● diff | view | raw | blame | history
ard-admin/src/main/java/com/ard/web/controller/data/ArdTileController.java 7 ●●●●● diff | view | raw | blame | history
ard-admin/src/main/java/com/ard/web/controller/work/ArdDroneInfoController.java 8 ●●●●● diff | view | raw | blame | history
ard-admin/src/main/java/com/ard/web/controller/work/ArdFlightTaskController.java 78 ●●●●● diff | view | raw | blame | history
ard-admin/src/main/java/com/ard/web/controller/work/ArdServerInfoController.java 12 ●●●●● diff | view | raw | blame | history
ard-admin/src/main/java/com/ard/web/controller/work/UavBaseController.java 30 ●●●●● diff | view | raw | blame | history
ard-device/src/main/java/com/ard/device/camera/domain/ArdCamera.java 2 ●●●●● diff | view | raw | blame | history
ard-device/src/main/java/com/ard/device/camera/service/impl/ArdCameraServiceImpl.java 86 ●●●●● diff | view | raw | blame | history
ard-device/src/main/java/com/ard/device/channel/service/impl/ArdChannelServiceImpl.java 107 ●●●●● diff | view | raw | blame | history
ard-device/src/main/java/com/ard/device/component/sdk/common/GlobalVariable.java 3 ●●●●● diff | view | raw | blame | history
ard-device/src/main/java/com/ard/device/component/sdk/dh/service/impl/DaHuaSDK.java 39 ●●●●● diff | view | raw | blame | history
ard-device/src/main/java/com/ard/device/component/sdk/hik/service/impl/HikVisionSDK.java 40 ●●●●● diff | view | raw | blame | history
ard-device/src/main/java/com/ard/device/component/sdk/service/CameraSDK.java 6 ●●●●● diff | view | raw | blame | history
ard-device/src/main/java/com/ard/device/component/sdk/service/CameraSDKService.java 36 ●●●●● diff | view | raw | blame | history
ard-framework/src/main/java/com/ard/framework/config/ThreadPoolConfig.java 28 ●●●●● diff | view | raw | blame | history
ard-quartz/pom.xml 8 ●●●●● diff | view | raw | blame | history
ard-quartz/src/main/java/com/ard/quartz/task/DeviceTask.java 258 ●●●●● diff | view | raw | blame | history
ard-quartz/src/main/java/com/ard/quartz/task/MediaTask.java 353 ●●●●● diff | view | raw | blame | history
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java 39 ●●●●● diff | view | raw | blame | history
ard-route/src/main/java/com/ard/route/util/RouteFileUtils.java 6 ●●●●● diff | view | raw | blame | history
ard-sample/src/main/java/com/ard/sample/manage/service/impl/LiveStreamServiceImpl.java 1 ●●●●● diff | view | raw | blame | history
ard-system/src/main/java/com/ard/data/map/mapper/ArdMapMapper.java 10 ●●●●● diff | view | raw | blame | history
ard-system/src/main/java/com/ard/data/map/service/IArdMapService.java 9 ●●●●● diff | view | raw | blame | history
ard-system/src/main/java/com/ard/data/map/service/impl/ArdMapServiceImpl.java 21 ●●●●● diff | view | raw | blame | history
ard-system/src/main/java/com/ard/data/model/mapper/ArdModelMapper.java 10 ●●●●● diff | view | raw | blame | history
ard-system/src/main/java/com/ard/data/model/service/IArdModelService.java 9 ●●●●● diff | view | raw | blame | history
ard-system/src/main/java/com/ard/data/model/service/impl/ArdModelServiceImpl.java 21 ●●●●● diff | view | raw | blame | history
ard-system/src/main/java/com/ard/data/noflyzone/mapper/ArdNoFlyZoneMapper.java 9 ●●●●● diff | view | raw | blame | history
ard-system/src/main/java/com/ard/data/noflyzone/service/IArdNoFlyZoneService.java 8 ●●●●● diff | view | raw | blame | history
ard-system/src/main/java/com/ard/data/noflyzone/service/impl/ArdNoFlyZoneServiceImpl.java 55 ●●●●● diff | view | raw | blame | history
ard-system/src/main/java/com/ard/data/tile/mapper/ArdTileMapper.java 10 ●●●●● diff | view | raw | blame | history
ard-system/src/main/java/com/ard/data/tile/service/IArdTileService.java 9 ●●●●● diff | view | raw | blame | history
ard-system/src/main/java/com/ard/data/tile/service/impl/ArdTileServiceImpl.java 21 ●●●●● diff | view | raw | blame | history
ard-system/src/main/resources/mapper/data/ArdMapMapper.xml 5 ●●●●● diff | view | raw | blame | history
ard-system/src/main/resources/mapper/data/ArdModelMapper.xml 5 ●●●●● diff | view | raw | blame | history
ard-system/src/main/resources/mapper/data/ArdNoFlyZoneMapper.xml 5 ●●●●● diff | view | raw | blame | history
ard-system/src/main/resources/mapper/data/ArdTileMapper.xml 5 ●●●●● diff | view | raw | blame | history
ard-vtdu/src/main/java/com/ard/vtdu/service/impl/ArdVtduServiceImpl.java 8 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ard/work/domain/entity/ArdMedia.java 30 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ard/work/domain/entity/ArdMediaPic.java 28 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ard/work/domain/entity/ArdMediaVideo.java 30 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ard/work/mapper/ArdMediaMapper.java 40 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ard/work/mapper/ArdMediaPicMapper.java 60 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ard/work/mapper/ArdMediaVideoMapper.java 59 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ard/work/service/IArdDroneInfoService.java 2 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ard/work/service/IArdMediaService.java 20 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ard/work/service/IArdServerInfoService.java 2 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ard/work/service/ITyService.java 2 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ard/work/service/impl/ArdDroneInfoServiceImpl.java 78 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ard/work/service/impl/ArdFlightTaskPartServiceImpl.java 14 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ard/work/service/impl/ArdFlightTaskServiceImpl.java 473 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ard/work/service/impl/ArdMediaServiceImpl.java 275 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ard/work/service/impl/ArdServerInfoServiceImpl.java 24 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ard/work/service/impl/TyServiceImpl.java 5 ●●●●● diff | view | raw | blame | history
ard-work/src/main/resources/mapper/ArdFlightTaskMapper.xml 2 ●●●●● diff | view | raw | blame | history
ard-work/src/main/resources/mapper/ArdMediaMapper.xml 202 ●●●●● diff | view | raw | blame | history
ard-work/src/main/resources/mapper/ArdMediaPicMapper.xml 115 ●●●●● diff | view | raw | blame | history
ard-work/src/main/resources/mapper/ArdMediaVideoMapper.xml 108 ●●●●● diff | view | raw | blame | history