微调

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/InfluxdbCsCommunicateServiceImpl.java

@@ -95,7 +95,7 @@ public class InfluxdbCsCommunicateServiceImpl implements ICsCommunicateService {
                 .select(PqsCommunicate::getDevId)
                 .select(PqsCommunicate::getDescription)
                 .select(PqsCommunicate::getType)
-                .le(PqsCommunicate::getTime, lineParam.getEndTime())
+                .between(PqsCommunicate::getTime, lineParam.getStartTime(), lineParam.getEndTime())
                 .timeDesc()
                 .limit(1);
         List<PqsCommunicate> list = pqsCommunicateMapper.selectByQueryWrapper(influxQueryWrapper);

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/RStatOnlineRateDServiceImpl.java

@@ -188,6 +188,10 @@ public class RStatOnlineRateDServiceImpl extends MppServiceImpl<RStatOnlineRateD
                     } catch (ParseException e) {
                         throw new RuntimeException(e);
                     }
+                } else {
+                        if (online.equals(communicateDataOld.get(0).getType())){
+                        minute = InfluxDBPublicParam.DAY_MINUTE;
+                    }
                 }
             }
         }