From 28de2aa63d49f7b8a4ed052259ede2f1f8348b19 Mon Sep 17 00:00:00 2001
From: xuyang <748613696@qq.com>
Date: Wed, 13 Sep 2023 16:31:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E9=AB=98=E5=8E=8B-=E7=BB=BC=E5=90=88?=
 =?UTF-8?q?=E5=88=86=E6=9E=90=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/njcn/harmonic/pojo/dto/AreaDTO.java |  7 ++++++-
 .../com/njcn/harmonic/pojo/vo/HarmonicDeptVO.java     | 11 +++++++----
 .../harmonic/service/impl/HarmonicServiceImpl.java    |  8 +++++++-
 3 files changed, 20 insertions(+), 6 deletions(-)

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;
     }