From 02c4b1411025c8090879eabad9182a4033eacac2 Mon Sep 17 00:00:00 2001 From: weidong Date: Mon, 22 Jan 2024 19:46:35 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E6=8E=A8=E9=80=81b?= =?UTF-8?q?ug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/imdroid/beidou_fwd/task/Forwarder.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 6a240c91..f661861c 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 @@ -87,7 +87,9 @@ public class Forwarder { record.setRb562n(record.getRb562n()-device.getB562n()); record.setRb562d(record.getRb562d()-device.getB562d()); } - if(device.getFwddeviceid()!=null) record.setDeviceid(device.getFwddeviceid()); + if(device.getFwddeviceid()!=null && device.getFwddeviceid().trim().length()>0) { + record.setDeviceid(device.getFwddeviceid()); + } recordsToSend.add(record); } } @@ -160,8 +162,9 @@ public class Forwarder { // 推送 lastTime = calcData.getCreatetime(); // 替换推送名和值 - if(device.getFwddeviceid()!=null) + if(device.getFwddeviceid()!=null && device.getFwddeviceid().trim().length()>0) { calcData.setDeviceid(device.getFwddeviceid()); + } if(device.getB562e()!=null && device.getB562n()!=null && device.getB562d()!=null){