From c4dfbde4b685dba6fd541e5fe6b833cbd009229c Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期一, 18 九月 2023 17:18:19 +0800
Subject: [PATCH] 增加三场数字化
---
src/main/java/com/ard/alarm/camera/service/impl/ArdCamerasServiceImpl.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ard/alarm/camera/service/impl/ArdCamerasServiceImpl.java b/src/main/java/com/ard/alarm/camera/service/impl/ArdCamerasServiceImpl.java
index 7b0f9ab..7513cd8 100644
--- a/src/main/java/com/ard/alarm/camera/service/impl/ArdCamerasServiceImpl.java
+++ b/src/main/java/com/ard/alarm/camera/service/impl/ArdCamerasServiceImpl.java
@@ -42,8 +42,10 @@
public void run(ApplicationArguments args) {
//鍔犺浇sdk搴�
HikClientUtil.loadHCNetSDKLib();
- //鑾峰彇鍏ㄩ儴娴峰悍鍏夌數灏濊瘯鐧诲綍
- ardCameraList = ardCamerasMapper.selectArdCamerasList(new ArdCameras());
+ //鑾峰彇灏忓厜鐢靛皾璇曠櫥褰�
+ ArdCameras ardCamera=new ArdCameras();
+ ardCamera.setGdtype("0");
+ ardCameraList = ardCamerasMapper.selectArdCamerasList(ardCamera);
HikClientUtil.loginAllCamera(ardCameraList);
syncTask();
}
@@ -56,8 +58,10 @@
private void syncTask() {
scheduler.scheduleAtFixedRate(() -> {
try {
- //region 瀹氭椂鍚屾鐩告満
- List<ArdCameras> newArdCameraList = ardCamerasMapper.selectArdCamerasList(new ArdCameras());
+ //region 瀹氭椂鍚屾灏忓厜鐢�
+ ArdCameras ardCamera=new ArdCameras();
+ ardCamera.setGdtype("0");
+ List<ArdCameras> newArdCameraList = ardCamerasMapper.selectArdCamerasList(ardCamera);
//闇�瑕佹洿鏂扮殑鏁版嵁
List<ArdCameras> updateList = sameListWithDifferent(ardCameraList, newArdCameraList);
if (updateList.size() > 0) {
@@ -129,12 +133,7 @@
.findFirst()
.orElse(null);
- return oldItem == null ||
- !Objects.equals(oldItem.getUpdateTime(), newItem.getUpdateTime()) ||
- !Objects.equals(oldItem.getIp(), newItem.getIp()) ||
- !Objects.equals(oldItem.getPort(), newItem.getPort()) ||
- !Objects.equals(oldItem.getUsername(), newItem.getUsername()) ||
- !Objects.equals(oldItem.getPassword(), newItem.getPassword());
+ return oldItem == null || !Objects.equals(oldItem.getUpdateTime(), newItem.getUpdateTime());
})
.collect(Collectors.toList());
--
Gitblit v1.9.3