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

1.修改冀北日曲线bug

Browse Source
This commit is contained in:
wr
2023-08-16 10:47:49 +08:00
parent 500e4e3444
commit 49e939c550
1 changed files with 25 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/StatationStatServiceImpl.java
View File

@@ -386,9 +386,9 @@ public class StatationStatServiceImpl extends ServiceImpl<StatationStatMapper, S
.eq(Monitor::getPowerrId, subID) .eq(Monitor::getPowerrId, subID)
.eq(Monitor::getVoltageLevel, voltageLevel) .eq(Monitor::getVoltageLevel, voltageLevel)
); );
if (CollUtil.isEmpty(list)) { if (CollUtil.isNotEmpty(list)) {
// String lineId = list.get(0).getLineId(); String lineId = list.get(0).getLineId();
addCurves(null,type,curves); addCurves(lineId, type, curves);
} else { } else {
List<PmsMonitorBaseDTO> disMonitorAllList = distributionMonitorMapper.getDisMonitorAllList(subID, 1); List<PmsMonitorBaseDTO> disMonitorAllList = distributionMonitorMapper.getDisMonitorAllList(subID, 1);
@@ -398,7 +398,9 @@ public class StatationStatServiceImpl extends ServiceImpl<StatationStatMapper, S
addCurves(monitorId, type, curves); addCurves(monitorId, type, curves);
} }
} }
if(CollUtil.isNotEmpty(curves)){
curves.sort(Comparator.comparing(r -> r.getTime())); curves.sort(Comparator.comparing(r -> r.getTime()));
}
return curves; return curves;
} }
@@ -429,6 +431,7 @@ public class StatationStatServiceImpl extends ServiceImpl<StatationStatMapper, S
/** /**
* 对象添加 * 对象添加
*
* @param LineID 监测点id ff2d9674c1f1ecce7f33a5bf17fc4f2d * @param LineID 监测点id ff2d9674c1f1ecce7f33a5bf17fc4f2d
* @param type 0=谐波 1=总有功 * @param type 0=谐波 1=总有功
* @param curves 初始集合 * @param curves 初始集合