From b95df429267d2d4932c4b604e9acdfc0617d06d4 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期五, 06 十月 2023 15:58:03 +0800
Subject: [PATCH] 雷达设备
---
src/main/java/com/ard/alarm/external/service/impl/ArdEquipExternalServiceImpl.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ard/alarm/external/service/impl/ArdEquipExternalServiceImpl.java b/src/main/java/com/ard/alarm/external/service/impl/ArdEquipExternalServiceImpl.java
index e5fa5e8..723ab35 100644
--- a/src/main/java/com/ard/alarm/external/service/impl/ArdEquipExternalServiceImpl.java
+++ b/src/main/java/com/ard/alarm/external/service/impl/ArdEquipExternalServiceImpl.java
@@ -11,6 +11,7 @@
import com.ard.alarm.external.mapper.ArdEquipExternalMapper;
import com.ard.alarm.external.service.IArdEquipExternalService;
import com.ard.utils.hiksdk.service.impl.HikClientUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.ApplicationArguments;
@@ -44,16 +45,16 @@
ArdEquipExternal alarmHost = new ArdEquipExternal();
alarmHost.setFactory("1");
alarmHost.setType("1");
- ardAlarmHostList = ardEquipExternalMapper.selectArdEquipExternalList(alarmHost);
+ ardAlarmHostList = selectArdEquipExternalList(alarmHost);
HikClientUtil.loginAllAlarmHost(ardAlarmHostList);
-
+ log.debug("鎶ヨ涓绘満灏濊瘯鐧诲綍");
//鑾峰彇鍏ㄩ儴闂ㄧ涓绘満灏濊瘯鐧诲綍
ArdEquipExternal accessControlHost = new ArdEquipExternal();
accessControlHost.setFactory("1");
accessControlHost.setType("6");
- ardAccessHostList = ardEquipExternalMapper.selectArdEquipExternalList(accessControlHost);
+ ardAccessHostList = selectArdEquipExternalList(accessControlHost);
HikClientUtil.loginAllAccessControlHost(ardAccessHostList);
-
+ log.debug("闂ㄧ涓绘満灏濊瘯鐧诲綍");
//鍚屾浠诲姟
syncTask();
}
@@ -70,7 +71,7 @@
ArdEquipExternal alarmHost = new ArdEquipExternal();
alarmHost.setFactory("1");
alarmHost.setType("1");
- List<ArdEquipExternal> newAlarmHostList = ardEquipExternalMapper.selectArdEquipExternalList(alarmHost);
+ List<ArdEquipExternal> newAlarmHostList = selectArdEquipExternalList(alarmHost);
//闇�瑕佹洿鏂扮殑鏁版嵁
List<ArdEquipExternal> updateList = sameListWithDifferent(ardAlarmHostList, newAlarmHostList);
if (updateList.size() > 0) {
@@ -101,7 +102,7 @@
alarmHost = new ArdEquipExternal();
alarmHost.setFactory("1");
alarmHost.setType("6");
- List<ArdEquipExternal> newAccessHostList = ardEquipExternalMapper.selectArdEquipExternalList(alarmHost);
+ List<ArdEquipExternal> newAccessHostList = selectArdEquipExternalList(alarmHost);
//闇�瑕佹洿鏂扮殑鏁版嵁
updateList = sameListWithDifferent(ardAccessHostList, newAccessHostList);
if (updateList.size() > 0) {
@@ -142,12 +143,13 @@
*/
@Override
public ArdEquipExternal selectArdEquipExternalById(String id) {
- return ardEquipExternalMapper.selectArdEquipExternalById(id);
+ return ardEquipExternalMapper.selectById(id);
}
@Override
public ArdEquipExternal selectArdEquipExternal(ArdEquipExternal ardEquipExternal) {
- return ardEquipExternalMapper.selectArdEquipExternal(ardEquipExternal);
+ QueryWrapper<ArdEquipExternal> queryWrapper=new QueryWrapper<>(ardEquipExternal);
+ return ardEquipExternalMapper.selectOne(queryWrapper);
}
/**
@@ -158,7 +160,8 @@
*/
@Override
public List<ArdEquipExternal> selectArdEquipExternalList(ArdEquipExternal ardEquipExternal) {
- return ardEquipExternalMapper.selectArdEquipExternalList(ardEquipExternal);
+ QueryWrapper<ArdEquipExternal> queryWrapper=new QueryWrapper<>(ardEquipExternal);
+ return ardEquipExternalMapper.selectList(queryWrapper);
}
--
Gitblit v1.9.3