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 eventvalue, List pereventvalue) throws TemplateException, IOException { - HashMap 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 sisttime, List persisttime) throws TemplateException, IOException { HashMap map = new HashMap<>(); @@ -4884,7 +4878,7 @@ public class ReportServiceImpl implements ReportService { List ybardata = probabilityDistributionArea.getPereventvalue(); List 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 ybardata = probabilityDistributionArea.getPereventvalue(); List ylinedata = probabilityDistributionArea.getEventvalue(); - String fz = getFZ(ylinedata, ybardata); + String fz = drawPicUtil.drawEventAmplitude(ylinedata, ybardata); createPic(doc, fz, "" + typeName + "幅值的概率分布函数");