From 145d316b970fd248c60f2a3e4337ea801d3447c3 Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Tue, 6 Feb 2024 10:34:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A6=82=E6=9E=9Csample=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=90=8C=E6=97=B6=E6=9C=89=E9=87=87=E9=9B=86=E5=BC=80=E5=A7=8B?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=92=8C=E9=87=87=E9=9B=86=E7=BB=93=E6=9D=9F?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=B0=B1=E8=AE=B0=E5=BD=95=E5=8F=B0=E7=AB=99?= =?UTF-8?q?=E7=9A=84=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/DataReceivingStatusManager.java | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/DataReceivingStatusManager.java b/jeecg-module-station-operation/src/main/java/org/jeecg/DataReceivingStatusManager.java index 506ba9df..335d2721 100644 --- a/jeecg-module-station-operation/src/main/java/org/jeecg/DataReceivingStatusManager.java +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/DataReceivingStatusManager.java @@ -160,16 +160,18 @@ public class DataReceivingStatusManager { } else { continue; } - //处理开始时间 - Date acquisitionStart = sampleData.getAcquisitionStart(); - dataInfo.setBeginTime(Double.valueOf(acquisitionStart.getTime() / 1000)); - //处理结束时间 - Date acquisitionStop = sampleData.getAcquisitionStop(); - dataInfo.setEndTime(Double.valueOf(acquisitionStop.getTime() / 1000)); - //时间间隔 - Double span = Double.valueOf((acquisitionStop.getTime() - acquisitionStart.getTime()) / 1000); - dataInfo.setSpanTime(span); - dataInfoList.add(dataInfo); + if (Objects.nonNull(sampleData.getAcquisitionStart()) && Objects.nonNull(sampleData.getAcquisitionStop())) { + //处理开始时间 + Date acquisitionStart = sampleData.getAcquisitionStart(); + dataInfo.setBeginTime(Double.valueOf(acquisitionStart.getTime() / 1000)); + //处理结束时间 + Date acquisitionStop = sampleData.getAcquisitionStop(); + dataInfo.setEndTime(Double.valueOf(acquisitionStop.getTime() / 1000)); + //时间间隔 + Double span = Double.valueOf((acquisitionStop.getTime() - acquisitionStart.getTime()) / 1000); + dataInfo.setSpanTime(span); + dataInfoList.add(dataInfo); + } } } }