From 342b6590ee28cc1a7b501287ce57eec1d6d166b8 Mon Sep 17 00:00:00 2001 From: Administrator <1144154118@qq.com> Date: 星期三, 26 七月 2023 09:16:32 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ard-work/src/main/java/com/ruoyi/device/hiksdk/util/hikSdkUtil/LoginResultCallBack.java | 13 +++++-------- 1 files changed, 5 insertions(+), 8 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..61551a0 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; /** @@ -50,8 +47,8 @@ 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