代码调整
This commit is contained in:
@@ -2137,13 +2137,7 @@ public class ReportServiceImpl implements ReportService {
|
|||||||
return str;
|
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 {
|
public String getSJ(List<String> sisttime, List<String> persisttime) throws TemplateException, IOException {
|
||||||
HashMap<String, Object> map = new HashMap<>();
|
HashMap<String, Object> map = new HashMap<>();
|
||||||
@@ -4884,7 +4878,7 @@ public class ReportServiceImpl implements ReportService {
|
|||||||
|
|
||||||
List<String> ybardata = probabilityDistributionArea.getPereventvalue();
|
List<String> ybardata = probabilityDistributionArea.getPereventvalue();
|
||||||
List<String> ylinedata = probabilityDistributionArea.getEventvalue();
|
List<String> ylinedata = probabilityDistributionArea.getEventvalue();
|
||||||
String fz = getFZ(ylinedata, ybardata);
|
String fz = drawPicUtil.drawEventAmplitude(ylinedata, ybardata);
|
||||||
createPic(doc, fz, "" + typeName + "幅值的概率分布");
|
createPic(doc, fz, "" + typeName + "幅值的概率分布");
|
||||||
|
|
||||||
|
|
||||||
@@ -8101,7 +8095,7 @@ public class ReportServiceImpl implements ReportService {
|
|||||||
|
|
||||||
List<String> ybardata = probabilityDistributionArea.getPereventvalue();
|
List<String> ybardata = probabilityDistributionArea.getPereventvalue();
|
||||||
List<String> ylinedata = probabilityDistributionArea.getEventvalue();
|
List<String> ylinedata = probabilityDistributionArea.getEventvalue();
|
||||||
String fz = getFZ(ylinedata, ybardata);
|
String fz = drawPicUtil.drawEventAmplitude(ylinedata, ybardata);
|
||||||
createPic(doc, fz, "" + typeName + "幅值的概率分布函数");
|
createPic(doc, fz, "" + typeName + "幅值的概率分布函数");
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user