From 25a1cd1e6f6be895cdf19d49286969cbbca59eb9 Mon Sep 17 00:00:00 2001
From: huangzhen <867217663@qq.com>
Date: Wed, 20 Dec 2023 13:16:13 +0800
Subject: [PATCH] 完善日报生成规则
---
src/main/java/com/gkhy/fourierSpecialGasMonitor/schedule/DailyReportSchedule.java | 50 ++++++++++++++++++++++++++++++--------------------
1 files changed, 30 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/gkhy/fourierSpecialGasMonitor/schedule/DailyReportSchedule.java b/src/main/java/com/gkhy/fourierSpecialGasMonitor/schedule/DailyReportSchedule.java
index b22477b..1a3bad1 100644
--- a/src/main/java/com/gkhy/fourierSpecialGasMonitor/schedule/DailyReportSchedule.java
+++ b/src/main/java/com/gkhy/fourierSpecialGasMonitor/schedule/DailyReportSchedule.java
@@ -69,6 +69,8 @@
private final Logger logger = LoggerFactory.getLogger(this.getClass());
+ private static int serialNumber = 4;
+
@Autowired
private GasWarnLogService gasWarnLogService;
@@ -90,13 +92,15 @@
@Autowired
private MonitorDailyReportService monitorDailyReportService;
- @Scheduled(cron = "0 0 2 * * ?") //每天两点执行一次
+ //@Scheduled(cron = "0 0 2 * * ?") //每天两点执行一次
+ @Scheduled(cron = "0/30 * * * * ?")
@Async(value = "SocketTaskExecutor")
public void generateDailyReport() {
LocalDateTime now = LocalDateTime.now();
String startTime = now.format(execformatter);
RBucket<List<GasCategory>> bucket = redissonClient.getBucket("gas_category_cache_info");
List<GasCategory> gasCategories = bucket.get();
+ serialNumber = 4;
logger.info("【##】开始生成日报 ,时间："+startTime);
OPCPackage opcPackage = null;
//加载文档
@@ -191,9 +195,10 @@
List<GasConcentration> gasConcentrations = gasConcentrationService.listDatabyTimeSlot(LocalDateTime.of(now.minusDays(1).toLocalDate(), LocalTime.MIN)
, LocalDateTime.of(now.minusDays(1).toLocalDate(), LocalTime.MAX));
if (!CollectionUtils.isEmpty(gasConcentrations)) {
- for (int i = 0; i < 30; i++) {
+ //for (int i = 0; i < 30; i++) {
+ for (int i = 0; i < gasCategories.size(); i++) {
String series = gasCategories.get(i).getMolecularFormula() + "浓度观测结果";
- String title = "—" + gasCategories.get(i).getMolecularFormula();
+ String title = gasCategories.get(i).getMolecularFormula();
drawLineChart(gasConcentrations, fileurl, series, title, gasCategories.get(i).getMolecularFormula(), i);
}
}
@@ -207,9 +212,13 @@
Map<Integer, String> regionMap = allRegion.stream()
.collect(Collectors.toMap(Region::getId, Region::getName));
if (!CollectionUtils.isEmpty(gasFluxes)) {
- for (int i = 1; i <= areaNum.size(); i++) {
- for (int j = 0; j < 20; j++) {
- drawBarChart(gasFluxes, fileurl, regionMap.get(i), "柱形图" + gasCategories.get(j).getMolecularFormula(), i, j + 1);
+ for (int j = 0; j < gasCategories.size(); j++) {
+ for (int i = 1; i <= areaNum.size(); i++) {
+ //for (int j = 0; j < 20; j++) {
+ int finalI = i;
+ List<GasFlux> gasFluxesByArea = gasFluxes.stream().filter(gasFlux -> gasFlux.getAreaId() == finalI)
+ .collect(Collectors.toList());
+ drawBarChart(gasFluxesByArea, fileurl, regionMap.get(i), gasCategories.get(j).getMolecularFormula(), i, j + 1);
}
}
}
@@ -265,6 +274,7 @@
value2.add(n);
List<XWPFChart> charts = doc.getCharts();
+ serialNumber++;
for (int k = 0; k < charts.size(); k++) {
XWPFChart xwpfChart = charts.get(k);
XDDFTitle xddfTitletitle = xwpfChart.getTitle();
@@ -283,9 +293,9 @@
Element aT = (Element) root.getElementsByTagName("a:t").item(0);
// 获取 <a:t> 元素的文本内容 获取标题具体内容
String value = aT.getTextContent();
- String chartTitle = "图"+(31 + i * j)+" "+i+"号厂区排放"+molecularFormula+"通量反演结果";
- if ((i+"-"+j).equals(value)) {
- drawBarChartExec(charts.get(k), series2, x2, value2, chartTitle);
+ String chartTitle = "图"+serialNumber+" "+i+"号厂区排放"+molecularFormula+"通量反演结果";
+ if ((j+"-"+i).equals(value)) {
+ drawBarChartExec(charts.get(k), series2, x2, value2, chartTitle,molecularFormula);
}
} catch (ParserConfigurationException e) {
e.printStackTrace();
@@ -393,12 +403,12 @@
public void drawBarChartExec(XWPFChart chart, String[] series, String[] categories,
- List<Number[]> values, String chartTitle) {
+ List<Number[]> values, String chartTitle,String molecularFormula) {
final List<XDDFChartData> data = chart.getChartSeries();
final XDDFBarChartData line = (XDDFBarChartData) data.get(0);//这里一般获取第一个,我们这里是折线图就是XDDFLineChartData
line.getCategoryAxis().setTitle(chartTitle);
- line.getValueAxes().get(0).setTitle("C2H2 Emission Rate (ug/m^2/s)");
+ line.getValueAxes().get(0).setTitle(molecularFormula+" Emission Rate (ug/m^2/s)");
final int numOfPoints = categories.length;
final String categoryDataRange = chart.formatRange(new CellRangeAddress(1, numOfPoints, 0, 0));
@@ -462,8 +472,8 @@
Map<String, Object> map = new HashMap<>();
map.put("${today}", today);
map.put("${yesterday}", yesterday);
- map.put("${generalradius}","10");
- map.put("${generalradiu}","20");
+ map.put("${generalradius}","1km");
+ map.put("${generalradiu}","300m");
List<GasWarnLog> gasWarnLogs = gasWarnLogService.listYesterday();
if (!CollectionUtils.isEmpty(gasWarnLogs)){
@@ -482,21 +492,21 @@
}
String fiveGas = "";
String sixGas = "";
- for (int i = 0; i < 6; i++) {
+ for (int i = 0; i < 3; i++) {
String name = gasCategories.get(i).getMolecularFormula()+"（"+gasCategories.get(i).getName()+"）";
name = name + "、";
- if (i < 5){
+ if (i < 3){
fiveGas = fiveGas + name;
- if (i == 4){
+ if (i == 2){
int index = fiveGas.lastIndexOf("、");
- fiveGas = fiveGas.substring(0, index)+"共五种";
+ fiveGas = fiveGas.substring(0, index)+"共三种";
}
}
- if (i < 6){
+ if (i < 3){
sixGas = sixGas + name;
- if (i == 5){
+ if (i == 2){
int index = sixGas.lastIndexOf("、");
- sixGas = sixGas.substring(0, index)+"共六种";
+ sixGas = sixGas.substring(0, index)+"共三种";
}
}
}
--
Gitblit v1.9.2