From 6b009b0f6d3ef3aee97c362cebcd679d1b9088a3 Mon Sep 17 00:00:00 2001
From: zhangjian <zhangjianrock@163.com>
Date: 星期一, 07 八月 2023 17:34:08 +0800
Subject: [PATCH] 判断列表为空
---
ard-work/src/main/java/com/ruoyi/device/hiksdk/util/hikSdkUtil/LoginResultCallBack.java | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/hiksdk/util/hikSdkUtil/LoginResultCallBack.java b/ard-work/src/main/java/com/ruoyi/device/hiksdk/util/hikSdkUtil/LoginResultCallBack.java
index 4ea42ef..476c083 100644
--- a/ard-work/src/main/java/com/ruoyi/device/hiksdk/util/hikSdkUtil/LoginResultCallBack.java
+++ b/ard-work/src/main/java/com/ruoyi/device/hiksdk/util/hikSdkUtil/LoginResultCallBack.java
@@ -1,18 +1,15 @@
package com.ruoyi.device.hiksdk.util.hikSdkUtil;
-import com.ruoyi.alarm.globalAlarm.domain.GuidePriorityQueue;
-import com.ruoyi.alarm.globalAlarm.domain.GuideTask;
+import com.ruoyi.alarm.global.domain.GuidePriorityQueue;
+import com.ruoyi.alarm.global.domain.GuideTask;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.device.camera.domain.ArdCameras;
-import com.ruoyi.device.camera.mapper.ArdCamerasMapper;
+import com.ruoyi.device.camera.service.IArdCamerasService;
import com.ruoyi.device.hiksdk.common.GlobalVariable;
import com.sun.jna.Pointer;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-import javax.annotation.Resource;
import java.util.Comparator;
-import java.util.PriorityQueue;
import java.util.concurrent.PriorityBlockingQueue;
/**
@@ -38,7 +35,7 @@
}
if (dwResult == 1) {
GlobalVariable.loginMap.put(camera.getId(), lUserID);
- log.info(camera.getIp() + ":" + camera.getPort() + "鐧诲綍鎴愬姛");
+ log.debug(camera.getIp() + ":" + camera.getPort() + "鐧诲綍鎴愬姛");
camera.setLoginId(lUserID);
camera.setChannel((int) lpDeviceinfo.byChanNum);
//鍒涘缓寮曞闃熷垪
@@ -46,12 +43,12 @@
PriorityBlockingQueue<GuideTask> priorityQueue = new PriorityBlockingQueue<>(1000,comparator);
GuidePriorityQueue.cameraQueueMap.put(camera.getId(), priorityQueue);
} else {
- log.info(camera.getIp() + ":" + camera.getPort() + "鐧诲綍澶辫触");
+ log.debug(camera.getIp() + ":" + camera.getPort() + "鐧诲綍澶辫触");
camera.setChannel(0);
camera.setLoginId(-1);
}
- ArdCamerasMapper ardCamerasMapper = SpringUtils.getBean(ArdCamerasMapper.class);
- ardCamerasMapper.updateArdCameras(camera);
+ IArdCamerasService ardCamerasService = SpringUtils.getBean(IArdCamerasService.class);
+ ardCamerasService.updateArdCameras(camera);
return 1;
}
}
--
Gitblit v1.9.3