From f4a60a693a7dec0c921e573573c58cf81e47aa98 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 25 十月 2023 09:21:56 +0800
Subject: [PATCH] 增加厂商类别
---
src/main/java/com/ard/alarm/camera/service/impl/ArdCamerasServiceImpl.java | 46 ++++++++++++++++++----------------------------
1 files changed, 18 insertions(+), 28 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..6934173 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
@@ -12,6 +12,8 @@
import com.ard.alarm.external.domain.ArdEquipExternal;
import com.ard.alarm.external.mapper.ArdEquipExternalMapper;
import com.ard.utils.hiksdk.service.impl.HikClientUtil;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
@@ -34,30 +36,31 @@
private final static ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
public static List<ArdCameras> ardCameraList = new ArrayList<>();
-
@Resource
private ArdCamerasMapper ardCamerasMapper;
+ //鍒濆鍖栨墽琛�
@Override
public void run(ApplicationArguments args) {
//鍔犺浇sdk搴�
HikClientUtil.loadHCNetSDKLib();
- //鑾峰彇鍏ㄩ儴娴峰悍鍏夌數灏濊瘯鐧诲綍
- ardCameraList = ardCamerasMapper.selectArdCamerasList(new ArdCameras());
+ //鑾峰彇灏忓厜鐢靛皾璇曠櫥褰�
+ ardCameraList = selectArdCamerasList(new ArdCameras());
HikClientUtil.loginAllCamera(ardCameraList);
- syncTask();
+ syncCameraListTask();
}
/**
- * 鍚屾浠诲姟
+ * 鍚屾鐩告満鍒楄〃浠诲姟
+ * 瀹炴椂鑾峰彇鍦ㄧ嚎鐨勫皬鍏夌數
* 鍒樿嫃涔�
* 2023/8/11 9:09:27
*/
- private void syncTask() {
+ private void syncCameraListTask() {
scheduler.scheduleAtFixedRate(() -> {
try {
- //region 瀹氭椂鍚屾鐩告満
- List<ArdCameras> newArdCameraList = ardCamerasMapper.selectArdCamerasList(new ArdCameras());
+ //region 瀹氭椂鍚屾灏忓厜鐢�
+ List<ArdCameras> newArdCameraList = selectArdCamerasList(new ArdCameras());
//闇�瑕佹洿鏂扮殑鏁版嵁
List<ArdCameras> updateList = sameListWithDifferent(ardCameraList, newArdCameraList);
if (updateList.size() > 0) {
@@ -90,25 +93,17 @@
}
/**
- * 鏌ヨ鐩告満璁惧
- *
- * @param id 鐩告満璁惧涓婚敭
- * @return 鐩告満璁惧
- */
- @Override
- public ArdCameras selectArdCamerasById(String id) {
- return ardCamerasMapper.selectArdCamerasById(id);
- }
-
- /**
* 鏌ヨ鐩告満璁惧鍒楄〃
*
- * @param ardCameras 鐩告満璁惧
+ * @param ardCamera 鐩告満璁惧
* @return 鐩告満璁惧
*/
@Override
- public List<ArdCameras> selectArdCamerasList(ArdCameras ardCameras) {
- return ardCamerasMapper.selectArdCamerasList(ardCameras);
+ public List<ArdCameras> selectArdCamerasList(ArdCameras ardCamera) {
+ ardCamera.setGdType("0");
+ ardCamera.setFactory("1");
+ Wrapper<ArdCameras> queryWrapper=new QueryWrapper<>(ardCamera);
+ return ardCamerasMapper.selectList(queryWrapper);
}
@@ -129,12 +124,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