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

1.pmsBug修改

Browse Source
This commit is contained in:
雨木c
2024-01-24 19:01:41 +08:00
parent 9b468ca404
commit 2728b57cb9
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/vo/ROperatingIndexCommonVO.java
View File

@@ -1,5 +1,6 @@
package com.njcn.device.pms.pojo.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -24,6 +25,8 @@ public class ROperatingIndexCommonVO {
@ApiModelProperty(name = "orgName", value = "单位名称")
private String orgName;
private Integer sort;
/**
* 时间
*/

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

@@ -19,6 +19,7 @@ import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import java.text.DecimalFormat;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -69,6 +70,7 @@ public class ROperatingIndexMServiceImpl extends ServiceImpl<ROperatingIndexMMap
BeanUtils.copyProperties(item, rOperatingIndexCommonVO);
rOperatingIndexCommonVO.setOrgName(deptDTOMap.get(item.getOrgNo()).getName()); //单位名称
rOperatingIndexCommonVO.setSort(deptDTOMap.get(item.getOrgNo()).getSort());
//在线监测率
Integer measurementRunPoints = item.getMeasurementRunPoints(); //监测点数
Integer transitMeasurementPoints = item.getTransitMeasurementPoints(); //在线监测点数
@@ -79,7 +81,7 @@ public class ROperatingIndexMServiceImpl extends ServiceImpl<ROperatingIndexMMap
rOperatingIndexCommonVO.setTransitMeasurementRate(0.0);
}
return rOperatingIndexCommonVO;
}).collect(Collectors.toList());
}).sorted(Comparator.comparing(ROperatingIndexCommonVO::getSort)).collect(Collectors.toList());
return resultList;
}
}

8
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/upload/impl/RUploadPointStatisticalDataDServiceImpl.java
View File

@@ -22,6 +22,7 @@ import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.*;
import java.util.stream.Collectors;
@@ -105,7 +106,12 @@ public class RUploadPointStatisticalDataDServiceImpl extends MppServiceImpl<RUpl
int real = l3.stream().mapToInt(RStatIntegrityD::getRealTime).sum();
rUploadPointStatisticalDataD.setExpectCollectNum(due);
rUploadPointStatisticalDataD.setActualCollectNum(real);
rUploadPointStatisticalDataD.setDataFullRate(BigDecimal.valueOf(real*100.0/due).setScale(4, BigDecimal.ROUND_HALF_UP).doubleValue());
if(due == 0 || real == 0){
rUploadPointStatisticalDataD.setDataFullRate(BigDecimal.valueOf(0).setScale(4, RoundingMode.HALF_UP).doubleValue());
}else {
rUploadPointStatisticalDataD.setDataFullRate(BigDecimal.valueOf(real*100.0/due).setScale(4, RoundingMode.HALF_UP).doubleValue());
}
rUploadPointStatisticalDataD.setStationMonitorNum(l3.size());
}
result.add(rUploadPointStatisticalDataD);