From 6caa2785b23350d5d417b8cfae594c9d9254af62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com>
Date: Thu, 7 Sep 2023 19:35:53 +0800
Subject: [PATCH] =?UTF-8?q?bug=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/njcn/device/pq/pojo/dto/OverLimitLineDTO.java  | 2 ++
 .../java/com/njcn/device/pq/mapper/mapping/LineMapper.xml   | 6 ++++--
 .../java/com/njcn/harmonic/pojo/vo/MonitorOverLimitVO.java  | 3 +++
 .../njcn/harmonic/service/impl/IntegrityServiceImpl.java    | 4 +++-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/dto/OverLimitLineDTO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/dto/OverLimitLineDTO.java
index e4448ebde..c27417a1f 100644
--- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/dto/OverLimitLineDTO.java
+++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/dto/OverLimitLineDTO.java
@@ -18,6 +18,8 @@ public class OverLimitLineDTO {
 
     private String lineScale;
 
+    private String manufacturer;
+
     private String loadType;
 
     private String lineObjectName;
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
index c8abae46d..b85f379c9 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml
@@ -667,7 +667,8 @@
         A4.`Name` subName,
         C3.`Name` subScale,
         A5.`Name` cityCompany,
-        F.`Name` provinceCompany
+        F.`Name` provinceCompany,
+        dev.Manufacturer
         FROM
         pq_line A1,
         pq_line A2,
@@ -676,6 +677,7 @@
         pq_line A5,
         pq_line A6,
         pq_voltage B,
+        pq_device dev,
         sys_dict_data C1,
         sys_dict_data C2,
         sys_dict_data C3,
@@ -689,7 +691,7 @@
         </foreach>
         AND A1.Pid = A2.Id AND A2.Id = B.Id AND B.Scale = C1.Id AND A1.Id = D.Id AND D.Load_Type = C2.Id
         AND A2.Pid = A3.Id AND A3.Pid = A4.Id AND A4.Pid = A5.Id AND A4.Id = E.Id AND E.Scale = C3.Id
-        AND A5.Pid = A6.Id AND A6.`Name` = F.Area_Code
+        AND A5.Pid = A6.Id AND A6.`Name` = F.Area_Code and A3.id = dev.id
     </select>
 
     <select id="getDeviceStatus" resultType="LineStateVO">
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/MonitorOverLimitVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/MonitorOverLimitVO.java
index 25da796d0..df9e116af 100644
--- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/MonitorOverLimitVO.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/MonitorOverLimitVO.java
@@ -34,6 +34,9 @@ public class MonitorOverLimitVO {
     @ApiModelProperty("监测点电压等级")
     private String lineScale;
 
+    @ApiModelProperty("厂家")
+    private String manufacturer;
+
     @ApiModelProperty("变电站名称")
     private String subName;
 
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/IntegrityServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/IntegrityServiceImpl.java
index d74c414b6..bb5c03667 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/IntegrityServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/IntegrityServiceImpl.java
@@ -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());