From 59fcc48c8589b9df2af744fd6c77854061a52f54 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期一, 16 十月 2023 10:07:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SyncTask.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SyncTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SyncTask.java
index 2ce32ca..c2fee6a 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SyncTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SyncTask.java
@@ -50,7 +50,9 @@
*/
public void cameraState() {
try {
- List<ArdCameras> ardCameras = iArdCamerasService.selectArdCamerasListNoDataScope(new ArdCameras());
+ ArdCameras ardCamera = new ArdCameras();
+ ardCamera.setFactory("1");
+ List<ArdCameras> ardCameras = iArdCamerasService.selectArdCamerasListNoDataScope(ardCamera);
for (ArdCameras camera : ardCameras) {
CameraCmd cmd = new CameraCmd();
cmd.setCameraId(camera.getId());
@@ -109,7 +111,7 @@
List<Vtdu> vtdus = vtduService.selectVtduList(new Vtdu());
for (Vtdu vtdu : vtdus) {
if (!nameList.contains(vtdu.getName())) {
- mediaService.addPath(vtdu.getName(),vtdu.getRtspSource(),vtdu.getMode(),vtdu.getIsCode());
+ mediaService.addPath(vtdu.getName(), vtdu.getRtspSource(), vtdu.getMode(), vtdu.getIsCode());
}
}
}
--
Gitblit v1.9.3