Imdroid/security-monitor
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

updateDeviceState加打印

Browse Source
This commit is contained in:
weidong 2024-10-15 16:17:37 +08:00
parent e40660f2c1
commit 73b2f1dca2
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/executor/D331RtcmMessageExecutor.java
View File

@ -88,7 +88,7 @@ public class D331RtcmMessageExecutor implements Executor<D331RtcmMessage, Void>
try { try {
beidouClient.onDeviceActive(device1.getDeviceId(), device1.getTenantId()); beidouClient.onDeviceActive(device1.getDeviceId(), device1.getTenantId());
} catch (Exception e) { } catch (Exception e) {
logger.error(e.toString());
} }
dataPersistService.updateDeviceState(lastCycleDevice); dataPersistService.updateDeviceState(lastCycleDevice);
}); });

17
sec-beidou-rtcm/src/main/java/com/imdroid/sideslope/service/DataPersistServiceImpl.java
View File

@ -6,6 +6,8 @@ import com.imdroid.sideslope.message.D342LocationMessage;
import com.imdroid.sideslope.message.D3F0SelfCheckMessage; import com.imdroid.sideslope.message.D3F0SelfCheckMessage;
import com.imdroid.sideslope.message.D3F2StopIndicationMessage; import com.imdroid.sideslope.message.D3F2StopIndicationMessage;
import com.imdroid.sideslope.sal.Device; import com.imdroid.sideslope.sal.Device;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -16,6 +18,7 @@ import org.springframework.stereotype.Service;
*/ */
@Service @Service
public class DataPersistServiceImpl implements DataPersistService { public class DataPersistServiceImpl implements DataPersistService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@Autowired @Autowired
private GnssStatusMapper deviceStateRepository; private GnssStatusMapper deviceStateRepository;
@ -166,8 +169,12 @@ public class DataPersistServiceImpl implements DataPersistService {
if(null == deviceState) { if(null == deviceState) {
deviceState = new GnssStatus(); deviceState = new GnssStatus();
new_flag = true; 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.setTenantid(device.getTenantId());
deviceState.setDeviceid(device.getDeviceId()); deviceState.setDeviceid(device.getDeviceId());
deviceState.setUpdatetime(device.getLastRxTime()); deviceState.setUpdatetime(device.getLastRxTime());
@ -175,11 +182,13 @@ public class DataPersistServiceImpl implements DataPersistService {
deviceState.setB562bytes(device.getD342Bytes()); deviceState.setB562bytes(device.getD342Bytes());
deviceState.setSatelliteinuse(device.getSatelitesInUse()); deviceState.setSatelliteinuse(device.getSatelitesInUse());
// 检测状态和告警 // 清除离线告警
deviceState.setState(GnssStatus.STATE_ACTIVE); deviceState.setState(GnssStatus.STATE_ACTIVE);
warningService.checkDeviceStatus(null, deviceState); warningService.checkDeviceStatus(null, deviceState);
if(new_flag) deviceStateRepository.insert(deviceState);
else deviceStateRepository.updateById(deviceState);
// // 检查GNSS质量
if(device.getDeviceType() == Device.DEVICE_BASE_STATION){ if(device.getDeviceType() == Device.DEVICE_BASE_STATION){
warningService.checkD3xxNum(device); warningService.checkD3xxNum(device);
} }
@ -187,7 +196,5 @@ public class DataPersistServiceImpl implements DataPersistService {
warningService.checkB562Num(device); warningService.checkB562Num(device);
} }
if(new_flag) deviceStateRepository.insert(deviceState);
else deviceStateRepository.updateById(deviceState);
} }
} }