From 21c3f3647d664df7b067c7b3c25173eaa13eb0b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com>
Date: Tue, 24 Oct 2023 11:00:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CustomReportServiceImpl.java | 36 +++++++++----------
 .../mysql/Impl/line/DayDataServiceImpl.java   |  4 ---
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java
index fa05eb446..5c1597958 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java
@@ -848,7 +848,6 @@ public class CustomReportServiceImpl implements CustomReportService {
             System.out.println(sql);
         }
 
-
         List<Map<String, Object>> mapList = influxDbUtils.getMapResult(sql.toString());
         if (CollUtil.isEmpty(mapList)) {
             data = data.stream().peek(item -> item.setValue("/")).collect(Collectors.toList());
@@ -870,30 +869,26 @@ public class CustomReportServiceImpl implements CustomReportService {
                     }
 
                     //判断是否越限
-                    String key = item.getLimitName() + "#" + item.getStatMethod().toLowerCase() + "#pq_overlimit";
-                    if (limitMap.containsKey(key)) {
-                        ReportTemplateDTO tem = limitMap.get(key);
-                        double limitVal = Double.parseDouble(tem.getValue());
-                        if (v > limitVal) {
-                            tem.setOverLimitFlag(1);
-                            tem.setValue(tem.getValue());
-                            assNoPassMap.put(key, tem);
-                        } else if (!assNoPassMap.containsKey(key)) {
-                            tem.setOverLimitFlag(0);
-                            assNoPassMap.put(key, tem);
-                            tem.setValue(tem.getValue());
+                    if(limitMap.size()!=0) {
+                        String key = item.getLimitName() + "#" + item.getStatMethod().toLowerCase() + "#pq_overlimit";
+                        if (limitMap.containsKey(key)) {
+                            ReportTemplateDTO tem = limitMap.get(key);
+                            double limitVal = Double.parseDouble(tem.getValue());
+                            if (v > limitVal) {
+                                tem.setOverLimitFlag(1);
+
+                                assNoPassMap.put(key, tem);
+                            } else if (!assNoPassMap.containsKey(key)) {
+                                tem.setOverLimitFlag(0);
+                                assNoPassMap.put(key, tem);
+                            }
                         }
                     }
-
                 } else {
                     item.setValue("/");
                 }
             }
-
-
         }
-
-
         endList.addAll(data);
     }
 
@@ -972,8 +967,13 @@ public class CustomReportServiceImpl implements CustomReportService {
                 });
 
             });
+
+            //处理合格率
             assNoPassMap.forEach((key, val) -> {
                 limitTargetMapX.remove(key);
+                if("Voltage_Dev".equals(val.getTemplateName())||"Freq_Dev".equals(val.getTemplateName())){
+                    val.setValue("±"+val.getValue());
+                }
                 if (val.getOverLimitFlag() == 1) {
                     val.setValue("不合格 ("+val.getValue()+")");
                 } else {
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java
index ca7d76ef8..a492db40c 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java
@@ -912,11 +912,7 @@ public class DayDataServiceImpl implements DayDataService {
                 dayPltMapper.insertBatch(dayPltList);
             }
         }
-
-
         log.info(LocalDateTime.now() + "data表转day结束=====》");
-
-
     }