From 8e6c94c58df3cd7edb8f4f12a13bfa646faf2272 Mon Sep 17 00:00:00 2001 From: zhuxinyu <1799009482@qq.com> Date: Mon, 24 Apr 2023 10:17:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/device/pq/service/impl/CommunicateServiceImpl.java | 4 ++-- .../mysql/Impl/device/DeviceAbnormaStatisticsServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommunicateServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommunicateServiceImpl.java index 6108bfb3c..a34fc98aa 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommunicateServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommunicateServiceImpl.java @@ -117,7 +117,7 @@ public class CommunicateServiceImpl implements CommunicateService { if (floatList == 0) { inter.setOnlineRate(3.14159f); } else { - inter.setOnlineRate(Float.parseFloat(decimalFormat.format(floatList * 100))); + inter.setOnlineRate(Float.parseFloat(decimalFormat.format(floatList))); } deviceOnlineDataList.add(inter); } @@ -135,7 +135,7 @@ public class CommunicateServiceImpl implements CommunicateService { param.setIds(Arrays.asList(lineList)); param.setStartTime( DateUtil.beginOfDay(DateUtil.parse(startTime)).toString()); param.setEndTime( DateUtil.endOfDay(DateUtil.parse(endTime)).toString()); - if(state == 1){ + if (state == 1) { //在线率 List onlineRateByDevIds = onlinerateDMapper.getOnlineRateByDevIds(param); if (CollUtil.isNotEmpty(onlineRateByDevIds)) { diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/DeviceAbnormaStatisticsServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/DeviceAbnormaStatisticsServiceImpl.java index 7bc889f92..d8a85fce2 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/DeviceAbnormaStatisticsServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/DeviceAbnormaStatisticsServiceImpl.java @@ -144,7 +144,7 @@ public class DeviceAbnormaStatisticsServiceImpl implements DeviceAbnormalStatist topMsg.setOfftimeFlag(0); topMsg.setComOutCount(1); topMsg.setComOutDescription(DateUtil.beginOfDay(DateUtil.parse(param.getTime()))+"至"+devEntry.getValue().get(0).getUpdateTime()); - } else if (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(devEntry.getValue().get(0).getUpdateTime()).before(DateUtil.beginOfDay(DateUtil.parse(param.getTime())))) { + } else { topMsg.setOfftimeFlag(1); topMsg.setComOutCount(0); }