Merge remote-tracking branch 'origin/20210223' into 20210223

sms_water/src/main/java/com/huaxu/service/impl/OnlineMonitorImpl.java

@@ -610,7 +610,8 @@ public class OnlineMonitorImpl implements OnlineMonitorService {
                         monitorDataEntity = (MonitorDataEntity) ByteArrayUtils.bytesToObject(bytes).get();}
                 }
                 if(monitorDataEntity != null) {
-                    monDataCol.setCollectDate(monitorDataEntity.getCollectDate());
+                    if(monDataCol.getCollectDate()==null || monitorDataEntity.getCollectDate().getTime()>monDataCol.getCollectDate().getTime() )
+                        monDataCol.setCollectDate(monitorDataEntity.getCollectDate());
                     SimpleDateFormat formatdate = new SimpleDateFormat("YYYY-MM-dd");//日期算换格式
                     //筛选该设备相同属性的值
                     List<MonitorDataValueEntity>  attributeEntities=monitorDataEntity.getDataValues().stream().filter((MonitorDataValueEntity m)
@@ -712,7 +713,8 @@ public class OnlineMonitorImpl implements OnlineMonitorService {
                                 monitorDataEntity = (MonitorDataEntity) ByteArrayUtils.bytesToObject(bytes).get();}
                         }
                         if(monitorDataEntity != null) {
-                            monDataCol.setCollectDate(monitorDataEntity.getCollectDate());
+                            if(monDataCol.getCollectDate()==null||monitorDataEntity.getCollectDate().getTime()>monDataCol.getCollectDate().getTime())
+                                monDataCol.setCollectDate(monitorDataEntity.getCollectDate());
                             //筛选该设备相同属性的值
                             List<MonitorDataValueEntity> attributeEntities = monitorDataEntity.getDataValues().stream().filter((MonitorDataValueEntity m)
                                     -> m.getAttributeId().equals(monitorData.getAttributeId())).collect(Collectors.toList());