如果sample数据同时有采集开始时间和采集结束时间就记录台站的状态

2024-02-06 10:34:51 +08:00 · 2024-02-06 10:34:51 +08:00 · 145d316b97
commit 145d316b97
parent 2cac351fce
1 changed files with 12 additions and 10 deletions
--- 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,6 +160,7 @@ public class DataReceivingStatusManager {
                                                } else {
                                                    continue;
                                                }
+                                                if (Objects.nonNull(sampleData.getAcquisitionStart()) && Objects.nonNull(sampleData.getAcquisitionStop())) {
                                                    //处理开始时间
                                                    Date acquisitionStart = sampleData.getAcquisitionStart();
                                                    dataInfo.setBeginTime(Double.valueOf(acquisitionStart.getTime() / 1000));
@ -173,6 +174,7 @@ public class DataReceivingStatusManager {
                                                }
                                            }
                                        }
+                                    }
                                    if (CollectionUtils.isNotEmpty(sohDataList)) {
                                        //根据台站id 开始时间查询状态数据
                                        for (GardsSohData sohData : sohDataList) {