forked from ard/ruoyi-api
parent: 102512 | patch | commitdiff
aijinhui
2023-09-07 2fa66c208202f420a5f001cf0d67e5aa1bf94578
refs
author aijinhui <aijinhui>
Thursday, September 7, 2023 16:53 +0800
committer aijinhui <aijinhui>
Thursday, September 7, 2023 16:53 +0800
commit2fa66c208202f420a5f001cf0d67e5aa1bf94578
tree e3f84a48774ef9ddd44046762ce75c9f51fa9c1b tree | zip | gz
parent 1025124051633ed086e1a53d8a2f01a7e6f833d2 view | diff
cece9e60b6dd536835c9158d98a50d8b60bf655f view | diff 
Merge remote-tracking branch 'origin/master'
13 files modified
326 ■■■■■ changed files
ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/GlobalAlarmServiceImpl.java 10 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/alarm/global/service/impl/QueueTaskExecutor.java 2 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/camera/domain/CameraCmd.java 3 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/camera/service/impl/ArdCamerasServiceImpl.java 44 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/device/hiksdk/service/impl/HikClientServiceImpl.java 110 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/inspect/service/impl/ArdVideoInspectTaskServiceImpl.java 6 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/inspect/service/impl/InspectionTaskManager.java 2 ●●●●● diff | view | raw | blame | history
ard-work/src/main/java/com/ruoyi/media/service/impl/MediaServiceImpl.java 3 ●●●●● diff | view | raw | blame | history
ard-work/src/main/resources/templates/preview.html 2 ●●●●● diff | view | raw | blame | history
ard-work/src/main/resources/templates/test.html 65 ●●●●● diff | view | raw | blame | history
lib/mediamtx/mediamtx.yml 77 ●●●●● diff | view | raw | blame | history
lib/webrtc/webrtc-streamer.exe diff | view | raw | blame | history
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SdkTask.java 2 ●●●●● diff | view | raw | blame | history