From b04a715e8767dc3f675e7ff2667d95edd87b2d54 Mon Sep 17 00:00:00 2001
From: weidong <weidong@im-droid.com>
Date: Sat, 9 Mar 2024 17:41:38 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9projectId=E4=B8=8D?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=EF=BC=8C=E4=BD=86=E6=98=AF=E6=9C=89=E7=A9=BA?=
 =?UTF-8?q?=E6=A0=BC=E7=9A=84=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sec-beidou-fwd/pom.xml                                    | 8 ++++++++
 .../main/java/com/imdroid/beidou_fwd/task/Forwarder.java  | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

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 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>11</source>
+                    <target>11</target>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
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);