From 61abbc251d654541d70e2f5cefa95488542c8344 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=B6=85?= <973677575@qq.com>
Date: Wed, 17 Aug 2022 14:57:28 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/service/impl/AreaDeviceOnlineServiceImpl.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pqs-device/device-boot/src/main/java/com/njcn/device/service/impl/AreaDeviceOnlineServiceImpl.java b/pqs-device/device-boot/src/main/java/com/njcn/device/service/impl/AreaDeviceOnlineServiceImpl.java
index b444098db..4ddc64303 100644
--- a/pqs-device/device-boot/src/main/java/com/njcn/device/service/impl/AreaDeviceOnlineServiceImpl.java
+++ b/pqs-device/device-boot/src/main/java/com/njcn/device/service/impl/AreaDeviceOnlineServiceImpl.java
@@ -6,7 +6,6 @@ import com.njcn.device.mapper.AreaDeviceOnlineMapper;
 import com.njcn.device.mapper.DeviceMapper;
 import com.njcn.device.pojo.dto.GeneralDeviceDTO;
 import com.njcn.device.pojo.param.AreaCensusParam;
-import com.njcn.device.pojo.param.DeviceInfoParam;
 import com.njcn.device.pojo.po.Device;
 import com.njcn.device.pojo.vo.AreaDeviceOnlineVO;
 import com.njcn.device.pojo.vo.LineInfluxDbOnlineVO;
@@ -121,7 +120,7 @@ public class AreaDeviceOnlineServiceImpl implements AreaDeviceOnlineService {
         areaDeviceOnlineVO.setBreaksRate(new BigDecimal(breaksRate).setScale(2, RoundingMode.HALF_UP).doubleValue());
         double shutdownRate = areaDeviceOnlineVO.getShutdown().doubleValue() / deviceIndexes.size() * 100;
         areaDeviceOnlineVO.setShutdownRate(new BigDecimal(shutdownRate).setScale(2, RoundingMode.HALF_UP).doubleValue());
-        List<LineInfluxDbOnlineVO> onlineData = getOnlineData(deviceIndexes, areaCensusParam);
+        List<LineInfluxDbOnlineVO> onlineData = getOnlineData(deviceIndexes, areaCensusParam.getSearchBeginTime(), areaCensusParam.getSearchEndTime());
         if (!CollectionUtils.isEmpty(onlineData)) {
             double avgOnline = onlineData.stream().mapToDouble(LineInfluxDbOnlineVO::getOnlineRate).sum() / onlineData.size();
             areaDeviceOnlineVO.setOnlineRate(new BigDecimal(avgOnline).setScale(2, RoundingMode.HALF_UP).doubleValue());
@@ -129,6 +128,7 @@ public class AreaDeviceOnlineServiceImpl implements AreaDeviceOnlineService {
         return areaDeviceOnlineVO;
     }
 
+
     private int getDeviceNumber(String lineLevel, List<String> deviceIndexes, List<String> lineIndexes) {
         List<String> lineIdList = areaDeviceOnlineMapper.selectLineIdBylineLevel(lineLevel);
         List<String> result = lineIdList.stream().filter(item -> lineIndexes.contains(item)).collect(Collectors.toList());
@@ -152,10 +152,10 @@ public class AreaDeviceOnlineServiceImpl implements AreaDeviceOnlineService {
     }
 
     /** 获取按终端分组的终端在线率*/
-    public List<LineInfluxDbOnlineVO> getOnlineData(List<String> deviceIndexes, DeviceInfoParam.BusinessParam deviceInfoParam) {
+    public List<LineInfluxDbOnlineVO> getOnlineData(List<String> deviceIndexes, String searchBeginTime, String searchEndTime) {
         //组装sql语句
         StringBuilder stringBuilder = new StringBuilder();
-        stringBuilder.append("time >= '").append(DateUtil.beginOfDay(DateUtil.parse(deviceInfoParam.getSearchBeginTime()))).append("' and ").append("time <= '").append(DateUtil.endOfDay(DateUtil.parse(deviceInfoParam.getSearchEndTime()))).append("' and ");
+        stringBuilder.append("time >= '").append(DateUtil.beginOfDay(DateUtil.parse(searchBeginTime))).append("' and ").append("time <= '").append(DateUtil.endOfDay(DateUtil.parse(searchEndTime))).append("' and ");
 
         for (int i = 0; i < deviceIndexes.size(); i++) {
             if (deviceIndexes.size() - i != 1) {