代码调整

This commit is contained in:
2023-06-25 10:58:25 +08:00
parent 4e494e5e8d
commit 8e93a9d880
3 changed files with 71 additions and 14 deletions

View File

@@ -1910,7 +1910,7 @@ public class ReportServiceImpl implements ReportService {
createTitle(doc, "4." + i + "." + two + " 持续时间的概率分函数", "标题 3", 400, 15);
List<String> ybardata = probabilityVO.getPersisttime();
List<String> ylinedata = probabilityVO.getSisttime();
String sj = getSJ(ylinedata, ybardata);
String sj = drawPicUtil.drawPersistentTime(ylinedata, ybardata);
createPic(doc, sj, "持续时间的概率分布函数");
two++;
}
@@ -2138,15 +2138,6 @@ public class ReportServiceImpl implements ReportService {
}
public String getSJ(List<String> sisttime, List<String> persisttime) throws TemplateException, IOException {
HashMap<String, Object> map = new HashMap<>();
map.put("sisttime", JSONArray.fromObject(sisttime).toString());
map.put("persisttime", JSONArray.fromObject(persisttime).toString());
String str = getStr("bar6.ftl", map);
return str;
}
/**
* 表格插入行数据
*
@@ -5007,7 +4998,7 @@ public class ReportServiceImpl implements ReportService {
List<String> ybardata = probabilityDistributionArea.getPersisttime();
List<String> ylinedata = probabilityDistributionArea.getSisttime();
String sj = getSJ(ylinedata, ybardata);
String sj = drawPicUtil.drawPersistentTime(ylinedata, ybardata);
createPic(doc, sj, "持续时间的概率分布函数");
@@ -8224,7 +8215,7 @@ public class ReportServiceImpl implements ReportService {
List<String> ybardata = probabilityDistributionArea.getPersisttime();
List<String> ylinedata = probabilityDistributionArea.getSisttime();
String sj = getSJ(ylinedata, ybardata);
String sj = drawPicUtil.drawPersistentTime(ylinedata, ybardata);
createPic(doc, sj, "持续时间的概率分布函数");