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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
hongawen
2023-09-07 19:43:22 +08:00
parent 8fa7e6521a 6caa2785b2
commit 8b0c56096b
4 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/MonitorOverLimitVO.java
View File

@@ -34,6 +34,9 @@ public class MonitorOverLimitVO {
@ApiModelProperty("监测点电压等级")
private String lineScale;
@ApiModelProperty("厂家")
private String manufacturer;
@ApiModelProperty("变电站名称")
private String subName;

4
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/IntegrityServiceImpl.java
View File

@@ -180,7 +180,9 @@ public class IntegrityServiceImpl implements IntegrityService {
outParam.setType(generalDeviceDTO.getName());
//根据监测点查询数据完整性
List<PublicDTO> integrityData = getCondition(lineIndexes, integrityIconParam.getSearchBeginTime(), integrityIconParam.getSearchEndTime());
outParam.setSingle(NumberUtil.round(integrityData.stream().mapToDouble(PublicDTO::getData).average().orElse(3.14159), 2).doubleValue());
double temSingle = integrityData.stream().mapToDouble(PublicDTO::getData).average().orElse(3.14159);
outParam.setSingle(temSingle == 3.14159 ? temSingle :NumberUtil.round(temSingle, 2).doubleValue());
//如果存在需要比较的时间，再获取对应数据
if (StrUtil.isNotBlank(integrityIconParam.getPeriodBeginTime()) && StrUtil.isNotBlank(integrityIconParam.getPeriodEndTime())) {
List<PublicDTO> compareData = getCondition(lineIndexes, integrityIconParam.getPeriodBeginTime(), integrityIconParam.getPeriodEndTime());