From 73b2f1dca27e540d6ce09767bba2e7ac44dc6770 Mon Sep 17 00:00:00 2001 From: weidong Date: Tue, 15 Oct 2024 16:17:37 +0800 Subject: [PATCH] =?UTF-8?q?updateDeviceState=E5=8A=A0=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../executor/D331RtcmMessageExecutor.java | 2 +- .../service/DataPersistServiceImpl.java | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D331RtcmMessageExecutor.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D331RtcmMessageExecutor.java index aa69358a..0d37fdb8 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D331RtcmMessageExecutor.java +++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D331RtcmMessageExecutor.java @@ -88,7 +88,7 @@ public class D331RtcmMessageExecutor implements Executor try { beidouClient.onDeviceActive(device1.getDeviceId(), device1.getTenantId()); } catch (Exception e) { - + logger.error(e.toString()); } dataPersistService.updateDeviceState(lastCycleDevice); }); diff --git a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/DataPersistServiceImpl.java b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/DataPersistServiceImpl.java index da822f2c..b93b90b6 100644 --- a/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/DataPersistServiceImpl.java +++ b/sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/DataPersistServiceImpl.java @@ -6,6 +6,8 @@ import com.imdroid.sideslope.message.D342LocationMessage; import com.imdroid.sideslope.message.D3F0SelfCheckMessage; import com.imdroid.sideslope.message.D3F2StopIndicationMessage; import com.imdroid.sideslope.sal.Device; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -16,6 +18,7 @@ import org.springframework.stereotype.Service; */ @Service public class DataPersistServiceImpl implements DataPersistService { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired private GnssStatusMapper deviceStateRepository; @@ -166,8 +169,12 @@ public class DataPersistServiceImpl implements DataPersistService { if(null == deviceState) { deviceState = new GnssStatus(); new_flag = true; + logger.info("device {} updateDeviceState",device.getDeviceId()); } - //deviceState.setId(SequenceUtil.getSequence()); + else { + logger.info("device {} updateDeviceState with id {}", deviceState.getDeviceid(),deviceState.getId()); + } + deviceState.setTenantid(device.getTenantId()); deviceState.setDeviceid(device.getDeviceId()); deviceState.setUpdatetime(device.getLastRxTime()); @@ -175,11 +182,13 @@ public class DataPersistServiceImpl implements DataPersistService { deviceState.setB562bytes(device.getD342Bytes()); deviceState.setSatelliteinuse(device.getSatelitesInUse()); - // 检测状态和告警 + // 清除离线告警 deviceState.setState(GnssStatus.STATE_ACTIVE); warningService.checkDeviceStatus(null, deviceState); + if(new_flag) deviceStateRepository.insert(deviceState); + else deviceStateRepository.updateById(deviceState); - // + // 检查GNSS质量 if(device.getDeviceType() == Device.DEVICE_BASE_STATION){ warningService.checkD3xxNum(device); } @@ -187,7 +196,5 @@ public class DataPersistServiceImpl implements DataPersistService { warningService.checkB562Num(device); } - if(new_flag) deviceStateRepository.insert(deviceState); - else deviceStateRepository.updateById(deviceState); } }