Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

定时任务问题修复

Browse Source
This commit is contained in:
zhuxinyu
2023-04-24 10:17:05 +08:00
parent c83deaedd7
commit 8e6c94c58d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommunicateServiceImpl.java
View File

@@ -117,7 +117,7 @@ public class CommunicateServiceImpl implements CommunicateService {
if (floatList == 0) { if (floatList == 0) {
inter.setOnlineRate(3.14159f); inter.setOnlineRate(3.14159f);
} else { } else {
inter.setOnlineRate(Float.parseFloat(decimalFormat.format(floatList * 100))); inter.setOnlineRate(Float.parseFloat(decimalFormat.format(floatList)));
} }
deviceOnlineDataList.add(inter); deviceOnlineDataList.add(inter);
} }
@@ -135,7 +135,7 @@ public class CommunicateServiceImpl implements CommunicateService {
param.setIds(Arrays.asList(lineList)); param.setIds(Arrays.asList(lineList));
param.setStartTime( DateUtil.beginOfDay(DateUtil.parse(startTime)).toString()); param.setStartTime( DateUtil.beginOfDay(DateUtil.parse(startTime)).toString());
param.setEndTime( DateUtil.endOfDay(DateUtil.parse(endTime)).toString()); param.setEndTime( DateUtil.endOfDay(DateUtil.parse(endTime)).toString());
if(state == 1){ if (state == 1) {
//在线率 //在线率
List<RStatOnlinerateVO> onlineRateByDevIds = onlinerateDMapper.getOnlineRateByDevIds(param); List<RStatOnlinerateVO> onlineRateByDevIds = onlinerateDMapper.getOnlineRateByDevIds(param);
if (CollUtil.isNotEmpty(onlineRateByDevIds)) { if (CollUtil.isNotEmpty(onlineRateByDevIds)) {

2
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/device/DeviceAbnormaStatisticsServiceImpl.java
View File

@@ -144,7 +144,7 @@ public class DeviceAbnormaStatisticsServiceImpl implements DeviceAbnormalStatist
topMsg.setOfftimeFlag(0); topMsg.setOfftimeFlag(0);
topMsg.setComOutCount(1); topMsg.setComOutCount(1);
topMsg.setComOutDescription(DateUtil.beginOfDay(DateUtil.parse(param.getTime()))+"至"+devEntry.getValue().get(0).getUpdateTime()); 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.setOfftimeFlag(1);
topMsg.setComOutCount(0); topMsg.setComOutCount(0);
} }