diff --git a/sec-beidou-fwd/pom.xml b/sec-beidou-fwd/pom.xml index 7d3f889c..8a82da93 100644 --- a/sec-beidou-fwd/pom.xml +++ b/sec-beidou-fwd/pom.xml @@ -114,6 +114,14 @@ + + org.apache.maven.plugins + maven-compiler-plugin + + 11 + 11 + + diff --git a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/Forwarder.java b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/Forwarder.java index 0d79000b..c5d07379 100644 --- a/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/Forwarder.java +++ b/sec-beidou-fwd/src/main/java/com/imdroid/beidou_fwd/task/Forwarder.java @@ -117,7 +117,7 @@ public class Forwarder { for(GnssDevice device:gnssDeviceList){ if(device.getOpmode() != GnssDevice.OP_MODE_USE) continue; String projectId = device.getProject_id(); - if(device.getProject2_id()!=null) { + if(device.getProject2_id()!=null && !device.getProject2_id().isBlank()) { // 推送组2用项目2的id号 String fwdGroupId2 = device.getFwd_group_id2(); if (fwdGroupId2 != null && fwdGroupId2.equals(fwdGroupId)) { @@ -141,7 +141,7 @@ public class Forwarder { record.setRposn(record.getRposn() - device.getIposn()); record.setRposd(record.getRposd() - device.getIposd()); } - if (useFwdId && device.getFwddeviceid() != null && device.getFwddeviceid().trim().length() > 0) { + if (useFwdId && device.getFwddeviceid() != null && !device.getFwddeviceid().isBlank()) { record.setDeviceid(device.getFwddeviceid()); } recordsToSend.add(record);