From 6d1ac6150e4bc5e5c15faeed9889df21c04f6051 Mon Sep 17 00:00:00 2001
From: zhizhijie <zhizhijie@users.noreply.gitee.com>
Date: 星期五, 09 十月 2026 10:11:02 +0800
Subject: [PATCH] fix(汇总大表): 四页取数月份列由写死 C/V 改为按表头动态定位（Step 0，待验收）
---
HANDOFF.md | 12 ++++
traffic-audit-server/src/main/java/com/trafficaudit/reportexport/service/ReportExportService.java | 123 ++++++++++++++++++++++++++++++-----------
2 files changed, 102 insertions(+), 33 deletions(-)
diff --git a/HANDOFF.md b/HANDOFF.md
index 2e04ead..5bbc9d5 100644
--- a/HANDOFF.md
+++ b/HANDOFF.md
@@ -46,6 +46,18 @@
- **浠嶅緟纭锛堜粎涓�椤癸級**锛氭墿鍒椾骇鐗╂槸鑷姩钀界洏涓轰笅鏈熸瘝鐗堬紝杩樻槸姣忔浜哄伐纭鍚庡啀钀界洏锛堝缓璁悗鑰咃紝涓� A3/A4 涓�鑷达級銆�
- **鏂囨。鏇存柊**锛歚docs/姹囨�诲ぇ琛∕0鐗堝紡閲嶅缓鍣ㄨ鏍糭2026-10-06.md` 绗崄鍥涜妭宸插畾椤规浛鎹�"鏈喅椤�"锛涜鏍艰〃涓庨厤缃垵绋垮悇杩藉姞鍙ｅ緞琛ュ厖銆�
- **鐘舵��**锛氥�愬緟楠屾敹銆戯紱鏈敼鍔ㄤ唬鐮併�佹湭瀵煎叆鏁版嵁銆�
+
+### 10-09锛�5锛夛細Step 0 钀藉湴鈥斺�斿洓寮犺法椤靛悎鎴愰〉鍙栨暟鏀逛负**鎸夎〃澶村姩鎬佸畾浣�**鏈堜唤鍒椼�愬緟楠屾敹銆�
+
+- **鏀瑰姩**锛歚ReportExportService` 涓� `SM_CUR_COL0 = 2`锛�2026骞�1鏈�=C锛�/ `SM_LAST_COL0 = 21`锛�2025骞�1鏈�=V锛�**搴熷純**锛屾敼鐢辨柊澧炵殑 `smMonthCols(sheet, year)` + `smYearMonthOf(cell)` 鎸夎〃澶村畾浣嶏紱`smSumMonths` 鏀瑰悆銆屾湀浠解啋鍒楀彿銆嶆槧灏勩��**鍙崲鍙栨暟鏂瑰紡锛屼笉鏀圭増寮忎笌鏁板�煎彛寰勩�佷笉鍋氭墿鍒�**銆�
+- **涓轰粈涔堝繀椤诲厛鍋�**锛氳鍐欐鍒椾綅鏄� 09-29銆婇厤缃垵绋裤�嬬浜旇妭鏍囨槑鐨�"纭墠鎻�"鈥斺�斾竴鎻掑垪锛�2025 鍧楀彸绉伙紝鍥涢〉浼氳閿欏幓骞村熀鏁帮紙瀵瑰簲宸茬‘璁ゅ彛寰� C3/C4锛夈��
+- **琛ㄥご涓夊舰寮忓吋瀹�**锛堝疄娴� 8 鏈堟瘝鐗堢‘涓轰笁绉嶆贩鐢級锛氭枃鏈� `'2026骞�3鏈�'`銆佽８鏃ユ湡搴忓垪鍙凤紙`46082`锛孏eneral锛屽嚭绉熼〉鍑犱箮鏁磋锛夈�佺湡鏃ユ湡 + `yyyy"骞�"m"鏈�"`锛坄 璐ц繍`锛夈�傛帓闄ゅ惈銆岀疮璁�/鍚屾瘮/鐜瘮銆嶇殑琛ㄥご涓庨潪褰撴湀 1 鍙风殑鏁板�硷紱骞翠唤涓嶅尮閰嶏紙2024/2023 鍧楋級涓嶈銆�
+- **楠岃瘉锛堝叧閿紝閲嶅仛杩囦竴娆★級**锛氭棫浠ｇ爜瀹炰緥锛坖ava PID 5716锛夌敓鎴� 2026-08 浣滃熀绾� 鈫� 鏂颁唬鐮佸疄渚嬶紙java PID 32368锛�10:07:58 鍚姩锛夌敓鎴� 2026-08 鈫� **閫愭牸 diff = 0**锛堝叕寮�/鏂囨湰 0銆佺紦瀛樺�� 0锛岃鐩� 19 椤碉級锛涙棤"鏈瘑鍒埌鏈堜唤琛ㄥご鍒�"鍛婅锛�2026-07 浜︽甯稿嚭琛ㄣ��
+- **韪╁潙锛堝姟蹇呰浣忥級**锛氶娆″姣旂殑"0 宸紓"鏄�**鍋囩殑**鈥斺�旀棫鍚庣浠嶅崰 8090锛宍start-dev.ps1` 鍥犵鍙ｅ凡鐩戝惉鑰岃烦杩囧惎鍔紝涓斿叾鎶ュ嚭鐨� PID 涓庣湡瀹炵洃鍚� PID 涓嶄竴鑷达紝瀵艰嚧璇垽"宸叉崲鏂拌繘绋�"銆�**鍒ゆ柇鏄惁鎹簡杩涚▼锛屽繀椤荤湅 `netstat -ano` 鐨勭湡瀹炵洃鍚� PID + 鏃ュ織閲岀殑鍚姩鏃堕棿/PID锛屼笉鑳藉彧淇″惎鍋滆剼鏈緭鍑恒��**
+- **鍏跺畠纭**锛氬悗绔棩蹇椾腑鏂囦负 **GBK**锛坄Select-String` 涓枃妯″紡鍖归厤涓嶅埌锛岄渶鐢� PID/绫诲悕绛� ASCII 閿氱偣锛夛紱涓ゆ浜х墿 sha256 涓嶅悓浣� 29 涓� zip 鏉＄洰鍐呭鍏ㄥ悓锛堝樊寮備粎鍦� zip 瀹瑰櫒鍏冩暟鎹級銆�
+- **鎶ュ憡**锛堟湰鍦般�佷笉鍏ュ簱锛夛細`docs/鍔熻兘娴嬭瘯鎶ュ憡/鍔熻兘娴嬭瘯鎶ュ憡_姹囨�诲ぇ琛ㄥ垪浣嶇疆琛ㄥご鍔ㄦ�佸畾浣峗2026-10-09.md`锛涙棩缁� `docs/宸ヤ綔鏃ョ粨/宸ヤ綔鏃ョ粨_2026-10-09.md`銆�
+- **鐘舵��**锛�**銆愬緟楠屾敹銆�**锛堝彇鏁版柟寮忓睘鍙ｅ緞鐩稿叧鏀瑰姩锛夈�傛湭瀵煎叆浠讳綍涓氬姟鏁版嵁銆�
+- **涓嬩竴姝�**锛歋tep 1 鎵╁垪鍣ㄦ湰浣擄紙閰嶇疆椹卞姩锛�8 涓彲瑙佸彴璐﹂〉锛浡�5.2 涓夋潯蹇呮敼鐐癸紱浜х墿鍏堣惤 `杈撳嚭/` 寰呬汉宸ョ‘璁ゅ悗鍐嶈惤鐩樹负涓嬫湡姣嶇増锛夈��
## 鏈�鏂帮紙2026-10-06锛寊yj 绾匡級
### 10-06锛氭媺鍙栧悎骞� + 楠屾敹闂ㄧ鍒嗙骇 + 姹囨�诲ぇ琛� M0 绔嬮」
diff --git a/traffic-audit-server/src/main/java/com/trafficaudit/reportexport/service/ReportExportService.java b/traffic-audit-server/src/main/java/com/trafficaudit/reportexport/service/ReportExportService.java
index 42e5bf2..67a22b4 100644
--- a/traffic-audit-server/src/main/java/com/trafficaudit/reportexport/service/ReportExportService.java
+++ b/traffic-audit-server/src/main/java/com/trafficaudit/reportexport/service/ReportExportService.java
@@ -4085,9 +4085,8 @@
private static final int SM_WYC_CX_PAX = 16, SM_WYC_CX_TURN = 17;
private static final int SM_FREIGHT_TURN = 18;
private static final int SM_DIM = 19;
- /** 2026 骞� 1 鏈堝綋鏈堝�煎垪锛�0 鍩猴紝C 鍒楋級锛�2025 骞� 1 鏈堝綋鏈堝�煎垪锛�0 鍩猴紝V 鍒楋級 */
- private static final int SM_CUR_COL0 = 2;
- private static final int SM_LAST_COL0 = 21;
+ // 2026-10-09锛氬師鍏堝啓姝荤殑 SM_CUR_COL0=2锛�2026骞�1鏈�=C锛�/ SM_LAST_COL0=21锛�2025骞�1鏈�=V锛夊凡搴熷純锛�
+ // 鏀逛负鎸夎〃澶村姩鎬佸畾浣嶏紙瑙� smMonthCols / smYearMonthOf锛夛紝鍏煎銆屾枃鏈� / 鏃ユ湡搴忓垪鍙� / 鏃ユ湡鏍煎紡銆嶄笁绉嶈〃澶村啓娉曘��
/**
* 鍒锋柊鍥涘紶璺ㄩ〉鍚堟垚椤碉細褰撳勾绱锛�1..month 鏈堬級銆佸綋鏈堬紙month 鏈堬級鍙婂搴斿悓姣旓紱
@@ -4098,10 +4097,10 @@
int[] cumMonths = new int[month];
for (int m = 1; m <= month; m++) cumMonths[m - 1] = m;
int[] oneMonth = new int[]{month};
- Map<String, double[]> curCum = smReadLedgerMetrics(wb, true, cumMonths);
- Map<String, double[]> lastCum = smReadLedgerMetrics(wb, false, cumMonths);
- Map<String, double[]> curMon = smReadLedgerMetrics(wb, true, oneMonth);
- Map<String, double[]> lastMon = smReadLedgerMetrics(wb, false, oneMonth);
+ Map<String, double[]> curCum = smReadLedgerMetrics(wb, year, cumMonths);
+ Map<String, double[]> lastCum = smReadLedgerMetrics(wb, year - 1, cumMonths);
+ Map<String, double[]> curMon = smReadLedgerMetrics(wb, year, oneMonth);
+ Map<String, double[]> lastMon = smReadLedgerMetrics(wb, year - 1, oneMonth);
if (curCum.isEmpty()) {
log.warn("姹囨�诲ぇ琛ㄥ洓椤靛埛鏂帮細鍙拌处椤垫湭璇诲埌甯傚窞鏁版嵁锛岃烦杩囷紙淇濇寔姣嶇増鍘熷�硷級");
return 0;
@@ -4130,22 +4129,23 @@
}
/** 鍙拌处椤电疮璁″彇鏁帮細甯傚窞瑙勮寖鍚� -> 19 缁存寚鏍� */
- private Map<String, double[]> smReadLedgerMetrics(XSSFWorkbook wb, boolean curYear, int[] months) {
+ private Map<String, double[]> smReadLedgerMetrics(XSSFWorkbook wb, int blockYear, int[] months) {
Map<String, double[]> out = new LinkedHashMap<>();
- smReadCityPaxPage(wb, "鍏氦", curYear, months, out, SM_BUS_PAX, SM_BUS_TURN, SM_BUS_CX_PAX, SM_BUS_CX_TURN);
- smReadCityPaxPage(wb, "鍑虹", curYear, months, out, SM_TAXI_PAX, SM_TAXI_TURN, SM_TAXI_CX_PAX, SM_TAXI_CX_TURN);
- smReadCityPaxPage(wb, "缃戠害杞�", curYear, months, out, SM_WYC_PAX, SM_WYC_TURN, SM_WYC_CX_PAX, SM_WYC_CX_TURN);
- smReadRailFerry(wb, curYear, months, out);
- smReadBanxian(wb, curYear, months, out);
- smReadFreightTurnover(wb, curYear, months, out);
+ smReadCityPaxPage(wb, "鍏氦", blockYear, months, out, SM_BUS_PAX, SM_BUS_TURN, SM_BUS_CX_PAX, SM_BUS_CX_TURN);
+ smReadCityPaxPage(wb, "鍑虹", blockYear, months, out, SM_TAXI_PAX, SM_TAXI_TURN, SM_TAXI_CX_PAX, SM_TAXI_CX_TURN);
+ smReadCityPaxPage(wb, "缃戠害杞�", blockYear, months, out, SM_WYC_PAX, SM_WYC_TURN, SM_WYC_CX_PAX, SM_WYC_CX_TURN);
+ smReadRailFerry(wb, blockYear, months, out);
+ smReadBanxian(wb, blockYear, months, out);
+ smReadFreightTurnover(wb, blockYear, months, out);
return out;
}
/** 鍏氦/鍑虹/缃戠害杞﹂〉锛氭瘡甯傚窞 4 琛岋紙瀹㈣繍閲�/鏃呭鍛ㄨ浆閲�/鍏朵腑鍩庡競鍐呭杩愰噺/鍏朵腑鍩庡競鍐呮梾瀹㈠懆杞噺锛� */
- private void smReadCityPaxPage(XSSFWorkbook wb, String sheetName, boolean curYear, int[] months,
+ private void smReadCityPaxPage(XSSFWorkbook wb, String sheetName, int blockYear, int[] months,
Map<String, double[]> out, int paxIdx, int turnIdx, int cxPaxIdx, int cxTurnIdx) {
Sheet sh = wb.getSheet(sheetName);
if (sh == null) return;
+ Map<Integer, Integer> monthCols = smMonthCols(sh, blockYear);
int last = sh.getLastRowNum();
for (int r = sh.getFirstRowNum(); r <= last; r++) {
Row row = sh.getRow(r);
@@ -4168,10 +4168,10 @@
else if (paxRow < 0) paxRow = k;
}
}
- double totalPax = smSumMonths(sh, paxRow, curYear, months);
- double totalTurn = smSumMonths(sh, turnRow, curYear, months);
- double cityPax = smSumMonths(sh, cxPaxRow, curYear, months);
- double cityTurn = smSumMonths(sh, cxTurnRow, curYear, months);
+ double totalPax = smSumMonths(sh, paxRow, monthCols, months);
+ double totalTurn = smSumMonths(sh, turnRow, monthCols, months);
+ double cityPax = smSumMonths(sh, cxPaxRow, monthCols, months);
+ double cityTurn = smSumMonths(sh, cxTurnRow, monthCols, months);
double[] arr = out.computeIfAbsent(city, k -> new double[SM_DIM]);
arr[paxIdx] += cityPax; // 鍩庡競瀹㈣繍鍙ｅ緞鍙栤�滃煄甯傚唴鈥�
arr[turnIdx] += cityTurn;
@@ -4181,9 +4181,10 @@
}
/** 杞ㄩ亾銆佽疆娓￠〉锛氳建閬撳潡锛堟姹�/榛勭煶锛�+ 杞浮鍧楋紙姝︽眽锛� */
- private void smReadRailFerry(XSSFWorkbook wb, boolean curYear, int[] months, Map<String, double[]> out) {
+ private void smReadRailFerry(XSSFWorkbook wb, int blockYear, int[] months, Map<String, double[]> out) {
Sheet sh = wb.getSheet("杞ㄩ亾銆佽疆娓�");
if (sh == null) return;
+ Map<Integer, Integer> monthCols = smMonthCols(sh, blockYear);
int last = sh.getLastRowNum();
int ferryTitle = -1;
for (int r = sh.getFirstRowNum(); r <= last; r++) {
@@ -4192,12 +4193,12 @@
String a = smText(row.getCell(0));
if (a != null && a.contains("杞浮瀹㈣繍閲�")) { ferryTitle = r; break; }
}
- smReadRailFerryBlock(sh, curYear, months, out, sh.getFirstRowNum(),
+ smReadRailFerryBlock(sh, monthCols, months, out, sh.getFirstRowNum(),
ferryTitle < 0 ? last : ferryTitle - 1, SM_RAIL_PAX);
- if (ferryTitle >= 0) smReadRailFerryBlock(sh, curYear, months, out, ferryTitle, last, SM_FERRY_PAX);
+ if (ferryTitle >= 0) smReadRailFerryBlock(sh, monthCols, months, out, ferryTitle, last, SM_FERRY_PAX);
}
- private void smReadRailFerryBlock(Sheet sh, boolean curYear, int[] months, Map<String, double[]> out,
+ private void smReadRailFerryBlock(Sheet sh, Map<Integer, Integer> monthCols, int[] months, Map<String, double[]> out,
int start, int end, int baseIdx) {
for (int r = start; r <= end; r++) {
Row row = sh.getRow(r);
@@ -4214,15 +4215,16 @@
else if (paxRow < 0) paxRow = k;
}
double[] arr = out.computeIfAbsent(city, k -> new double[SM_DIM]);
- arr[baseIdx] += smSumMonths(sh, paxRow, curYear, months);
- arr[baseIdx + 1] += smSumMonths(sh, turnRow, curYear, months);
+ arr[baseIdx] += smSumMonths(sh, paxRow, monthCols, months);
+ arr[baseIdx + 1] += smSumMonths(sh, turnRow, monthCols, months);
}
}
/** 鐝嚎鍖呰溅椤碉細姣忓競宸� 瀹㈣繍閲� / 鏃呭鍛ㄨ浆閲忥紙鈥滃叾涓釜浣撯�濊涓嶉噸澶嶈鍏ワ級 */
- private void smReadBanxian(XSSFWorkbook wb, boolean curYear, int[] months, Map<String, double[]> out) {
+ private void smReadBanxian(XSSFWorkbook wb, int blockYear, int[] months, Map<String, double[]> out) {
Sheet sh = wb.getSheet("鐝嚎鍖呰溅");
if (sh == null) return;
+ Map<Integer, Integer> monthCols = smMonthCols(sh, blockYear);
int last = sh.getLastRowNum();
for (int r = sh.getFirstRowNum(); r <= last; r++) {
Row row = sh.getRow(r);
@@ -4239,16 +4241,17 @@
else if (b.contains("瀹㈣繍閲�") && paxRow < 0) paxRow = k;
}
double[] arr = out.computeIfAbsent(city, k -> new double[SM_DIM]);
- arr[SM_BX_PAX] += smSumMonths(sh, paxRow, curYear, months);
- arr[SM_BX_TURN] += smSumMonths(sh, turnRow, curYear, months);
+ arr[SM_BX_PAX] += smSumMonths(sh, paxRow, monthCols, months);
+ arr[SM_BX_TURN] += smSumMonths(sh, turnRow, monthCols, months);
}
}
/** 璐ц繍椤碉細姣忓競宸� 瑙勪笂璐х墿鍛ㄨ浆閲� + 瑙勪笅璐х墿鍛ㄨ浆閲忥紙鈥滆涓�+瑙勪笅鈥濊鏈韩鏄眰鍜屽叕寮忥紝涓嶇洿鎺ュ彇锛� */
- private void smReadFreightTurnover(XSSFWorkbook wb, boolean curYear, int[] months, Map<String, double[]> out) {
+ private void smReadFreightTurnover(XSSFWorkbook wb, int blockYear, int[] months, Map<String, double[]> out) {
Sheet sh = wb.getSheet(" 璐ц繍");
if (sh == null) sh = wb.getSheet("璐ц繍");
if (sh == null) return;
+ Map<Integer, Integer> monthCols = smMonthCols(sh, blockYear);
int last = sh.getLastRowNum();
for (int r = sh.getFirstRowNum(); r <= last; r++) {
Row row = sh.getRow(r);
@@ -4265,22 +4268,76 @@
else if (b.contains("瑙勪笅璐х墿鍛ㄨ浆閲�")) { if (below < 0) below = k; }
}
double[] arr = out.computeIfAbsent(city, k -> new double[SM_DIM]);
- arr[SM_FREIGHT_TURN] += smSumMonths(sh, above, curYear, months) + smSumMonths(sh, below, curYear, months);
+ arr[SM_FREIGHT_TURN] += smSumMonths(sh, above, monthCols, months) + smSumMonths(sh, below, monthCols, months);
}
}
- private double smSumMonths(Sheet sh, int rowIdx, boolean curYear, int[] months) {
- if (sh == null || rowIdx < 0) return 0;
+ private double smSumMonths(Sheet sh, int rowIdx, Map<Integer, Integer> monthCols, int[] months) {
+ if (sh == null || rowIdx < 0 || monthCols == null) return 0;
Row row = sh.getRow(rowIdx);
if (row == null) return 0;
double s = 0;
for (int m : months) {
- int col = (curYear ? SM_CUR_COL0 : SM_LAST_COL0) + 2 * (m - 1);
+ Integer col = monthCols.get(m);
+ if (col == null) continue;
s += smNum(row.getCell(col));
}
return s;
}
+ /** 鍙拌处椤点�屾煇骞� M 鏈堛�嶇殑 0 鍩哄垪鍙凤細鎸夎〃澶村姩鎬佸畾浣嶏紙涓嶅啀鍐欐 C/V锛夛紝鍏煎鏂囨湰 / 鏃ユ湡搴忓垪鍙� / 鏃ユ湡鏍煎紡涓夌鍐欐硶 */
+ private Map<Integer, Integer> smMonthCols(Sheet sh, int wantedYear) {
+ Map<Integer, Integer> cols = new LinkedHashMap<>();
+ if (sh == null) return cols;
+ int lastRow = Math.min(sh.getLastRowNum(), sh.getFirstRowNum() + 4);
+ for (int r = sh.getFirstRowNum(); r <= lastRow; r++) {
+ Row row = sh.getRow(r);
+ if (row == null) continue;
+ int lastCol = row.getLastCellNum();
+ for (int c = row.getFirstCellNum(); c >= 0 && c < lastCol; c++) {
+ Integer ym = smYearMonthOf(row.getCell(c));
+ if (ym == null || ym / 100 != wantedYear) continue;
+ int mo = ym % 100;
+ if (!cols.containsKey(mo)) cols.put(mo, c);
+ }
+ }
+ if (cols.isEmpty()) {
+ log.warn("姹囨�诲ぇ琛ㄥ洓椤靛埛鏂帮細{} 椤垫湭璇嗗埆鍒� {} 骞寸殑鏈堜唤琛ㄥご鍒楋紙鏀寔鏂囨湰/搴忓垪鍙�/鏃ユ湡涓夌褰㈠紡锛�", sh.getSheetName(), wantedYear);
+ }
+ return cols;
+ }
+
+ /** 琛ㄥご鍗曞厓鏍� -> 骞�*100+鏈堬紱鍙銆孻YYY骞碝鏈堛�嶆枃鏈垨銆屾煇鏈� 1 鍙枫�嶇殑鏃ユ湡搴忓垪鍙凤紝鎺掗櫎绱/鍚屾瘮/鐜瘮 */
+ private Integer smYearMonthOf(Cell c) {
+ if (c == null) return null;
+ try {
+ CellType t = c.getCellType();
+ if (t == CellType.STRING) {
+ String v = c.getStringCellValue();
+ if (v == null) return null;
+ v = v.trim();
+ if (v.isEmpty() || v.contains("绱") || v.contains("鍚屾瘮") || v.contains("鐜瘮")) return null;
+ java.util.regex.Matcher m = java.util.regex.Pattern
+ .compile("^(\\d{4})\\s*骞碶\s*(\\d{1,2})\\s*鏈�$").matcher(v);
+ if (!m.matches()) return null;
+ int y = Integer.parseInt(m.group(1));
+ int mo = Integer.parseInt(m.group(2));
+ return mo >= 1 && mo <= 12 ? y * 100 + mo : null;
+ }
+ if (t == CellType.NUMERIC) {
+ double v = c.getNumericCellValue();
+ if (v < 36526 || v > 73415) return null;
+ java.util.Calendar cal = java.util.Calendar.getInstance();
+ cal.setTime(org.apache.poi.ss.usermodel.DateUtil.getJavaDate(v));
+ if (cal.get(java.util.Calendar.DAY_OF_MONTH) != 1) return null;
+ return cal.get(java.util.Calendar.YEAR) * 100 + (cal.get(java.util.Calendar.MONTH) + 1);
+ }
+ } catch (Exception ignore) {
+ return null;
+ }
+ return null;
+ }
+
/** 鍙拌处椤靛崟鍏冩牸鍙栨暟锛堟暟瀛� / 鏁板瓧鏂囨湰 / 鍏紡缂撳瓨锛� */
private double smNum(Cell c) {
if (c == null) return 0;
--
Gitblit v1.9.1