From 35d098a89613c96179391178b7f8143dec393ada Mon Sep 17 00:00:00 2001
From: zhizhijie <zhizhijie@users.noreply.gitee.com>
Date: 星期日, 20 九月 2026 15:52:36 +0800
Subject: [PATCH] feat(报表): 汇总大表导出异步化 + 结果缓存 + 进度弹窗
---
traffic-audit-server/src/main/java/com/trafficaudit/reportexport/calc/WycSplitCalc.java | 39 ++++++++++++++++++++++++++++-----------
1 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/traffic-audit-server/src/main/java/com/trafficaudit/reportexport/calc/WycSplitCalc.java b/traffic-audit-server/src/main/java/com/trafficaudit/reportexport/calc/WycSplitCalc.java
index 947eff3..3ba16bd 100644
--- a/traffic-audit-server/src/main/java/com/trafficaudit/reportexport/calc/WycSplitCalc.java
+++ b/traffic-audit-server/src/main/java/com/trafficaudit/reportexport/calc/WycSplitCalc.java
@@ -4,8 +4,10 @@
import com.trafficaudit.common.util.RegionUtil;
import com.trafficaudit.dataimport.entity.CityTaxiMonthly;
import com.trafficaudit.dataimport.entity.WycOrderMonthly;
+import com.trafficaudit.dataimport.entity.WycTotalMonthly;
import com.trafficaudit.dataimport.mapper.CityTaxiMonthlyMapper;
import com.trafficaudit.dataimport.mapper.WycOrderMonthlyMapper;
+import com.trafficaudit.dataimport.mapper.WycTotalMonthlyMapper;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.CellType;
import org.apache.poi.ss.usermodel.DataFormatter;
@@ -80,6 +82,8 @@
private CityTaxiMonthlyMapper cityTaxiMapper;
@Resource
private WycOrderMonthlyMapper wycOrderMapper;
+ @Resource
+ private WycTotalMonthlyMapper wycTotalMapper;
@Value("${city-passenger.template-dir:docs/鍩庡競瀹㈣繍}")
private String templateDir;
@@ -186,8 +190,9 @@
if (r.getAvgDistanceCity() != null && r.getAvgDistanceCity() > 0) a[5] = r.getAvgDistanceCity();
}
for (double[] a : map.values()) {
- if (a[4] <= 0 && a[0] > 0) a[4] = round(a[1] / a[0], 2);
- if (a[5] <= 0 && a[2] > 0) a[5] = round(a[3] / a[2], 2);
+ // 骞冲潎杩愯窛鍏滃簳锛氬叏绮惧害淇濈暀锛屽睍绀轰綅鏁颁氦缁欏崟鍏冩牸鏍煎紡
+ if (a[4] <= 0 && a[0] > 0) a[4] = a[1] / a[0];
+ if (a[5] <= 0 && a[2] > 0) a[5] = a[3] / a[2];
}
return map;
}
@@ -254,14 +259,30 @@
if (sum <= 0) return null;
double orderSum = sum;
if (row.getOrderSum() != null && row.getOrderSum() > 0) orderSum = row.getOrderSum();
+ double pinK = row.getPinK() == null ? 0.0 : row.getPinK();
+ double pinCK = row.getPinCK() == null ? 0.0 : row.getPinCK();
+ double pinZ = row.getPinZ() == null ? 0.0 : row.getPinZ();
+ double pinCZ = row.getPinCZ() == null ? 0.0 : row.getPinCZ();
+ boolean pinFix = false;
+ // pin 鍏滃簳锛氳鍗曡〃 pin 鍒椾负绌�/涓� 0 鏃跺洖钀� wyc_total_monthly锛坧in 涓撹〃锛�
+ if (pinK <= 0 || pinCK <= 0 || pinZ <= 0 || pinCZ <= 0) {
+ WycTotalMonthly tot = wycTotalMapper.selectOne(new LambdaQueryWrapper<WycTotalMonthly>()
+ .eq(WycTotalMonthly::getReportPeriod, period).last("LIMIT 1"));
+ if (tot != null) {
+ if (pinK <= 0 && tot.getPinK() != null && tot.getPinK() > 0) { pinK = tot.getPinK(); pinFix = true; }
+ if (pinCK <= 0 && tot.getPinCK() != null && tot.getPinCK() > 0) { pinCK = tot.getPinCK(); pinFix = true; }
+ if (pinZ <= 0 && tot.getPinZ() != null && tot.getPinZ() > 0) { pinZ = tot.getPinZ(); pinFix = true; }
+ if (pinCZ <= 0 && tot.getPinCZ() != null && tot.getPinCZ() > 0) { pinCZ = tot.getPinCZ(); pinFix = true; }
+ }
+ }
Map<String, Object> map = new LinkedHashMap<>();
- map.put("pinK", row.getPinK() == null ? 0.0 : row.getPinK());
- map.put("pinCK", row.getPinCK() == null ? 0.0 : row.getPinCK());
- map.put("pinZ", row.getPinZ() == null ? 0.0 : row.getPinZ());
- map.put("pinCZ", row.getPinCZ() == null ? 0.0 : row.getPinCZ());
+ map.put("pinK", pinK);
+ map.put("pinCK", pinCK);
+ map.put("pinZ", pinZ);
+ map.put("pinCZ", pinCZ);
map.put("orders", orders);
map.put("orderSum", orderSum);
- map.put("source", "db");
+ map.put("source", pinFix ? "db+wyc_total" : "db");
return map;
}
private File findInput() throws Exception {
@@ -297,8 +318,4 @@
private double nz(Double v) { return v == null ? 0.0 : v; }
- private double round(double v, int scale) {
- double factor = Math.pow(10, scale);
- return Math.round(v * factor) / factor;
- }
}
--
Gitblit v1.9.1