From 1ca9656140c41165459dfb6f6b7606b3aa6a8747 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: Wed, 24 Jul 2024 15:05:13 +0800
Subject: [PATCH] 三一车辆查询加入关联后bug修改提交
---
ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java b/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java
index eb62b1c..0209056 100644
--- a/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/device/camera/service/impl/CameraSdkServiceImpl.java
@@ -25,8 +25,10 @@
import com.ruoyi.utils.sdk.common.GlobalVariable;
import com.ruoyi.utils.tools.ArdTool;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
+import org.springframework.context.ApplicationEventPublisher;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -41,7 +43,7 @@
* @Date: 2023年10月16日15:21:01
**/
@Service
-@Slf4j(topic = "SDK")
+@Slf4j(topic = "sdk")
public class CameraSdkServiceImpl implements ICameraSdkService, ApplicationRunner {
@Resource
private IArdCamerasService ardCamerasService;
@@ -64,10 +66,10 @@
@Override
public void run(ApplicationArguments args) {
try {
+ log.info("初始化登录相机开始");
+ ardCamerasService.resetCameraLoginId();
List<ArdCameras> ardCameras = ardCamerasService.selectArdCamerasListNoDataScope(new ArdCameras());
- for (ArdCameras camera : ardCameras) {
- asyncLogin(camera);
- }
+ ardCameras.stream().forEach(ardCamera -> asyncLogin(ardCamera));
} catch (Exception ex) {
log.error("初始化登录相机异常：" + ex.getMessage());
}
@@ -586,17 +588,17 @@
case 1:
if (ardWellGuideCamera.getP1() != null) {
ptzMap = new HashMap<>();
- ptzMap.put("p" , ardWellGuideCamera.getP1());
- ptzMap.put("t" , ardWellGuideCamera.getT1());
- ptzMap.put("z" , ardWellGuideCamera.getZ1());
+ ptzMap.put("p", ardWellGuideCamera.getP1());
+ ptzMap.put("t", ardWellGuideCamera.getT1());
+ ptzMap.put("z", ardWellGuideCamera.getZ1());
}
break;
case 2:
if (ardWellGuideCamera.getP2() != null) {
ptzMap = new HashMap<>();
- ptzMap.put("p" , ardWellGuideCamera.getP2());
- ptzMap.put("t" , ardWellGuideCamera.getT2());
- ptzMap.put("z" , ardWellGuideCamera.getZ2());
+ ptzMap.put("p", ardWellGuideCamera.getP2());
+ ptzMap.put("t", ardWellGuideCamera.getT2());
+ ptzMap.put("z", ardWellGuideCamera.getZ2());
}
break;
@@ -624,9 +626,9 @@
}
//按井坐标开始引导
if (!guideTargetPosition(cmd).get("code").equals(200)) {
- return AjaxResult.warn("井坐标引导失败" , "cameraId:" + cameraId);
+ return AjaxResult.warn("井坐标引导失败", "cameraId:" + cameraId);
}
- return AjaxResult.success("井坐标引导成功" , "cameraId:" + cameraId);
+ return AjaxResult.success("井坐标引导成功", "cameraId:" + cameraId);
}
--
Gitblit v1.9.3