From 160604a9d7dcbd9c18aeb8a58af24b9d509e1ea0 Mon Sep 17 00:00:00 2001
From: hongawen <83944980@qq.com>
Date: Wed, 21 Jun 2023 15:52:49 +0800
Subject: [PATCH] =?UTF-8?q?=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

---
 .../service/majornetwork/Impl/ReportServiceImpl.java | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java
index 9e072b852..d6a76d0ff 100644
--- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java
+++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java
@@ -2137,13 +2137,7 @@ public class ReportServiceImpl implements ReportService {
         return str;
     }
 
-    public String getFZ(List<String> eventvalue, List<String> pereventvalue) throws TemplateException, IOException {
-        HashMap<String, Object> map = new HashMap<>();
-        map.put("eventValue", JSONArray.fromObject(eventvalue).toString());
-        map.put("pereventValue", JSONArray.fromObject(pereventvalue).toString());
-        String str = getStr("bar5.ftl", map);
-        return str;
-    }
+
 
     public String getSJ(List<String> sisttime, List<String> persisttime) throws TemplateException, IOException {
         HashMap<String, Object> map = new HashMap<>();
@@ -4884,7 +4878,7 @@ public class ReportServiceImpl implements ReportService {
 
                 List<String> ybardata = probabilityDistributionArea.getPereventvalue();
                 List<String> ylinedata = probabilityDistributionArea.getEventvalue();
-                String fz = getFZ(ylinedata, ybardata);
+                String fz = drawPicUtil.drawEventAmplitude(ylinedata, ybardata);
                 createPic(doc, fz, "" + typeName + "幅值的概率分布");
 
 
@@ -8101,7 +8095,7 @@ public class ReportServiceImpl implements ReportService {
 
                 List<String> ybardata = probabilityDistributionArea.getPereventvalue();
                 List<String> ylinedata = probabilityDistributionArea.getEventvalue();
-                String fz = getFZ(ylinedata, ybardata);
+                String fz = drawPicUtil.drawEventAmplitude(ylinedata, ybardata);
                 createPic(doc, fz, "" + typeName + "幅值的概率分布函数");