diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/dto/AreaDTO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/dto/AreaDTO.java index bb79bc266..f2f2bc6cc 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/dto/AreaDTO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/dto/AreaDTO.java @@ -28,7 +28,12 @@ public class AreaDTO { private Double averageOverDay = 0.0; /** - * 占比 + * 符合性占比 */ private Double ratio = 0.0; + + /** + * 监测点超标占比 + */ + private Double lineRatio = 0.0; } diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/HarmonicDeptVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/HarmonicDeptVO.java index 618f45e03..3531147f8 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/HarmonicDeptVO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/HarmonicDeptVO.java @@ -32,12 +32,15 @@ public class HarmonicDeptVO implements Serializable { @ApiModelProperty("超标监测点数") private Integer overLineCount = 0; - /** - * 占比 - */ - @ApiModelProperty("超标占比") + @ApiModelProperty("符合性占比") private Double ratio = -1.0; + /** + * 监测点超标占比 + */ + @ApiModelProperty("监测点超标占比") + private Double lineRatio; + /** * 平均超标天数 */ diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HarmonicServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HarmonicServiceImpl.java index 872eec463..539dbf798 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HarmonicServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HarmonicServiceImpl.java @@ -446,6 +446,9 @@ public class HarmonicServiceImpl implements IHarmonicService { //平均超标天数 areaDTO.setAverageOverDay(avgOverDay); areaDTO.setRatio(Math.min(ratio,100.0)); + //月监测点超标占比 + Double lineRatio = BigDecimal.valueOf(overLineCount*100/onlineCount).setScale(2, RoundingMode.HALF_UP).doubleValue(); + areaDTO.setLineRatio(lineRatio); return areaDTO; } @@ -517,12 +520,15 @@ public class HarmonicServiceImpl implements IHarmonicService { } else { avgOverDay = overLineCount == 0?0.0:BigDecimal.valueOf(overCountByDay*1.0/overLineCount).setScale(2, RoundingMode.HALF_UP).doubleValue(); } - //月监测点超标占比 + //月监测点符合性超标占比 ratio = map.size() == 0?-1.0:BigDecimal.valueOf(ratio*100/map.size()).setScale(2, RoundingMode.HALF_UP).doubleValue(); areaDTO.setOnlineCount(onlineCount); areaDTO.setOverLineCount(overLineCount); areaDTO.setAverageOverDay(avgOverDay); areaDTO.setRatio(Math.min(ratio,100.0)); + //月监测点超标占比 + Double lineRatio = BigDecimal.valueOf(overLineCount*100/onlineCount).setScale(2, RoundingMode.HALF_UP).doubleValue(); + areaDTO.setLineRatio(lineRatio); return areaDTO; }