From 6fe3c583389375f1b54f5c260ae8e2604c11f515 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期二, 02 七月 2024 13:49:22 +0800
Subject: [PATCH] 电磁锁查询加入分页修改提交
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/SyncTask.java | 31 +++++++++++--------------------
1 files changed, 11 insertions(+), 20 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 968fcab..d6ed2c3 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
@@ -1,25 +1,25 @@
package com.ruoyi.quartz.task;
-import com.alibaba.fastjson2.JSONObject;
+
+import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.device.camera.domain.ArdCameras;
import com.ruoyi.device.camera.domain.CameraCmd;
+import com.ruoyi.device.camera.factory.CameraSDK;
+import com.ruoyi.device.camera.factory.CameraSDKFactory;
import com.ruoyi.device.camera.service.IArdCamerasService;
-import com.ruoyi.device.channel.domain.ArdChannel;
-import com.ruoyi.utils.sdk.dhsdk.service.IDhClientService;
-import com.ruoyi.utils.sdk.hiksdk.service.IHikClientService;
-import com.ruoyi.media.domain.Items;
-import com.ruoyi.media.domain.JsonsRoot;
+import com.ruoyi.device.camera.service.ICameraSdkService;
import com.ruoyi.media.domain.Vtdu;
import com.ruoyi.media.service.IMediaService;
import com.ruoyi.media.service.IVtduService;
import com.ruoyi.rongcloud.service.RongCloudService;
import com.ruoyi.system.service.ISysUserService;
+import com.ruoyi.utils.sdk.dhsdk.service.impl.DahuaSDK;
+import com.ruoyi.utils.sdk.hiksdk.service.impl.HikvisionSDK;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
-import java.util.ArrayList;
import java.util.List;
/**
@@ -38,14 +38,11 @@
@Resource
IArdCamerasService iArdCamerasService;
@Resource
- IHikClientService hikClientService;
- @Resource
- IDhClientService dhClientService;
- @Resource
IVtduService vtduService;
@Resource
IMediaService mediaService;
-
+ @Resource
+ private ICameraSdkService cameraSdkService;
/**
* 鍚屾鐩告満鍦ㄧ嚎鐘舵��
* 鍒樿嫃涔�
@@ -53,19 +50,13 @@
*/
public void cameraState() {
try {
- ArdCameras ardCamera = new ArdCameras();
+ ArdCameras ardCamera = new ArdCameras();
//璋冪敤鏌ヨ鏂规硶
List<ArdCameras> ardCameras = iArdCamerasService.selectArdCamerasListNoDataScope(ardCamera);
for (ArdCameras camera : ardCameras) {
CameraCmd cmd = new CameraCmd();
cmd.setCameraId(camera.getId());
- boolean onLineNew = false;
- // 鍒ゆ柇鏄�1杩樻槸2
- if (camera.getFactory().equals("1")) {
- onLineNew = hikClientService.isOnLine(cmd);
- } else if (camera.getFactory().equals("2")) {
- onLineNew = dhClientService.isOnLine(cmd);
- }
+ boolean onLineNew = cameraSdkService.isOnLine(cmd);
boolean onLineOld = "1".equals(camera.getState());
if (onLineNew != onLineOld) {
if (onLineNew) {
--
Gitblit v1.9.3