From 9a6ec0530076fff4fa7fd2a6b4c36ed729b23120 Mon Sep 17 00:00:00 2001 From: zhizhijie <zhizhijie@users.noreply.gitee.com> Date: 星期五, 09 十月 2026 08:53:52 +0800 Subject: [PATCH] docs(汇总大表): M0 规格补第十二节（存储/展示分层与红线）+ 2025 数据现状核验（已在库，遗留口径差异） --- docs/汇总大表M0版式重建器规格_2026-10-06.md | 100 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 99 insertions(+), 1 deletions(-) diff --git "a/docs/\346\261\207\346\200\273\345\244\247\350\241\250M0\347\211\210\345\274\217\351\207\215\345\273\272\345\231\250\350\247\204\346\240\274_2026-10-06.md" "b/docs/\346\261\207\346\200\273\345\244\247\350\241\250M0\347\211\210\345\274\217\351\207\215\345\273\272\345\231\250\350\247\204\346\240\274_2026-10-06.md" index 6e4a14f..b5ed494 100644 --- "a/docs/\346\261\207\346\200\273\345\244\247\350\241\250M0\347\211\210\345\274\217\351\207\215\345\273\272\345\231\250\350\247\204\346\240\274_2026-10-06.md" +++ "b/docs/\346\261\207\346\200\273\345\244\247\350\241\250M0\347\211\210\345\274\217\351\207\215\345\273\272\345\231\250\350\247\204\346\240\274_2026-10-06.md" @@ -103,4 +103,102 @@ 3. **姣嶇増鍘嗗彶鍧戣涓�骞惰鐩�**锛氭瘝鐗堢敱 openpyxl 鍐欏嚭锛屽瓨鍦ㄩ珮鍘嬬缉锛堝凡鐢� `ZipSecureFile.setMinInflateRatio` 缁曡繃锛変笌娈嬬暀 `<is>` 闈炴硶鏍硷紙`normalizeStaleInlineStrings` 娓呯悊锛変袱绫婚棶棰橈紝閫愬垪鍏嬮殕鏃堕渶淇濇寔杩欎袱澶勫鐞嗐�� 4. **鍩庡競瀹㈣繍椤靛弬鐓х粍鏄帇缂╃粨鏋�**锛堝悓姣� + 1-X 鏈堢疮璁★級锛屼笌鍏跺畠闀胯〃椤典笉鍚岋紝闇�鍗曠嫭瑙勫垯銆� 5. **璺ㄥ勾寮�鏂版湰锛�2027锛変笉鍦� M0 鑼冨洿**锛岄渶鍙﹀畾"鏂板勾鍧�"瑙勫垯銆� -6. **鏈鐩栭〉**锛氫腑鍙ｅ緞鍒嗘瀽绛� 3 涓潤鎬侀〉浠嶆部鐢ㄦ瘝鐗堥潤鎬佸唴瀹癸紝鏈樁娈典笉鏀广�� \ No newline at end of file +6. **鏈鐩栭〉**锛氫腑鍙ｅ緞鍒嗘瀽绛� 3 涓潤鎬侀〉浠嶆部鐢ㄦ瘝鐗堥潤鎬佸唴瀹癸紝鏈樁娈典笉鏀广�� +## 鍗佷竴銆佸弬鐓у悓浜嬨�屼笓椤圭粺璁°�嶇殑璁捐鏄犲皠涓庤惤鍦拌矾绾匡紙2026-10-08锛� + +### 11.1 瀵归綈琛細浠栦负浠�涔堣兘涓�涓瘝鐗堬紝鎴戜滑瀵瑰簲鎬庝箞鍋� + +| 鍚屼簨涓撻」缁熻鐨勫仛娉� | 浠栦负浠�涔堣兘鎴愮珛 | 姹囨�诲ぇ琛ㄧ殑瀵瑰簲鍋氭硶 | +|---|---|---| +| 涓�浠芥瘝鐗堬紙`2026骞村崄涓�鏁版嵁.xlsx`锛夛紝**澶╀负琛屻�佸勾涓哄垪** | 澧為暱缁村害鏄�屽勾銆嶏紝涓�骞村姞涓�缁勫垪锛涘ぉ鏁板浐瀹� 8 | 鍐荤粨銆婇亾璺繍杈撻噺姹囨�昏〃_鏍囧噯姣嶇増.xlsx銆嬶細**12 涓湀婊＄増寮忎竴娆″埌浣�**锛屽彧璇� | +| 姣嶇増鍚屾椂鏄暟鎹鍣紙鍘嗗彶骞翠唤鐨勫�煎氨鍦ㄥ苟鎺掑勾鍒楅噷锛� | 鍘嗗彶鍊奸殢妯℃澘涓�璧疯蛋 | **鍙嶈繃鏉ュ仛**锛氬巻鍙插弬鐓у�煎叆搴擄紝姣嶇増鍙暀鐗堝紡锛屽弬鐓х粍鐢� DB 鍥炲～ | +| 琛ㄥご/琛屾爣绛捐涔夊畾浣嶏紙`findYearColumn` / `parseDayIndex`锛� | 鍒楀簭鍙樹簡涔熻兘瀵� | 鏂板椤佃鍒欒〃 `SummarySheetRule`锛氭寜琛ㄥご璁ゆ湀浠界粍銆佹寜琛屾爣绛捐甯傚窞/鎸囨爣锛屼笉鐢ㄧ‖缂栫爜鍒楅敋鐐� | +| 鏄撴紓绉诲彛寰勫缃垚琛紙`holiday_calendar` / `passenger_coefficient` / `vehicle_adjustment`锛� | 瑙勫垯涓嶆暎鍦ㄤ唬鐮佷笌鍗曞厓鏍奸噷 | 鍙傜収骞翠繚鐣欑粍鏁般�佹帓鍚嶅彛寰勶紙鍏ㄧ渷涓嶆帓鍚嶏級銆佸懆杞噺绯绘暟 B=G+L/2+Q/10銆佺己鏁扮疆绌鸿鍒� 澶栫疆 | +| `DECIMAL(30,15)` + `BigDecimal` + 鎸� Excel 鏄剧ず绮惧害鍙栧�� | 绮惧害鍙ｅ緞缁熶竴锛屾棤娴偣灏惧樊 | 鎵挎帴闀挎湡寰呭姙銆�16 寮犺〃 228 涓� double 鍒楁敼 DECIMAL + BigDecimal銆� | +| 瀵煎叆涓ら樁娈电‘璁� + 鍏ㄧ▼鍙鏍稿 | 鍘嗗彶鏁版嵁涓嶈璇鐩� | 鐢熸垚鍓嶅厛鍑虹己鏁�/宸紓娓呭崟锛屼汉宸ョ‘璁ゅ悗鍐嶅嚭琛紙鐜版湁 B4 鍩烘暟浣撴琛ラ綈锛� | +| 杈撳嚭璧版ā鏉挎枃浠讹紙docx / PNG锛� | 鐗堝紡鏉ユ簮鍗曚竴 | 淇濈暀鐜版湁鍋氭硶锛堝揩鎶ユ敼 `word/document.xml`銆丣FreeChart 鍑� PNG锛� | + +### 11.2 钀藉湴璺嚎锛堝洓闃舵锛� + +- **闃舵 1锛�= M0锛�3.5鈥�5 澶╋級**锛氭爣鍑嗘瘝鐗堝喕缁� + 婊＄増寮� + 璺ㄥ勾閲嶅缓 + 椤佃鍒欒〃銆� + 鏂板 `SummaryLayoutRebuilder` / `SummarySheetRule` / 鍗曟祴銆� + 鍑哄彛锛�7 鏈堝洖褰� diff=0锛�9 鏈堝鐓ф墜宸ョ増 diff=0锛�10 鏈堣捣鍙洿鎺ュ嚭琛ㄣ�� +- **闃舵 2锛�+1鈥�2 澶╋級**锛氭妸鐜版湁涓変唤鏂囦欢渚濊禆鍚堝苟涓轰竴浠姐�� + 鐜扮姸渚濊禆锛氭湀搴︽瘝鐗堬紙`resolveSummaryMother`锛�+ `_澶囦唤_` donor锛坄resolveSummaryDonor` / `restoreSummaryMonthlyBlocks`锛�+ 鐗堝紡鍙傜収浠讹紙`resolveSummaryLayoutRef`锛夈�� + 鐩爣锛氬彧鐣欍�婇亾璺繍杈撻噺姹囨�昏〃_鏍囧噯姣嶇増.xlsx銆嬶紝鍙傜収鍊间粠搴撳洖濉紝鍋滅敤 donor 涓庤繕鍘熸満鍒躲�� + 鍑哄彛锛歚docs/鐢熸垚姹囨�诲ぇ琛�/` 涓嬪彧鍓� 1 涓ā鏉挎枃浠� + 杈撳嚭鐩綍锛坄_bak_*` 绛夋湰鍦扮暀瀛樸�佷笉鍏ュ簱锛夈�� +- **闃舵 3锛堝彲閫夛紝+2鈥�3 澶╋級**锛氭瘝鐗堝唴鐢ㄥ懡鍚嶅尯鍩�/鍗犱綅绗︽爣娉ㄩ渶濉牸锛岀▼搴忔寜鍚嶅～鍐欙紱姣嶇増琚尓鍒�/鎻掕鏃舵槑纭姤閿欍�� +- **闃舵 4锛堝彲閫夛紝+5鈥�10 澶╋級**锛氭妸 10 涓暱琛ㄩ〉鐨勭増寮忓弬鏁板寲锛堝垪缁勮鍒� + 鍚堝苟鍖� + 鍒楀 + 鏁板瓧鏍煎紡 + 鎵撳嵃鍖猴級锛岀▼搴忎粠鐗堝紡瀹氫箟娓叉煋锛屾瘝鐗堟枃浠堕檷绾т负涓�娆℃�ф牱寮忔彁鍙栨簮锛� + 3 涓殣钘忓叕寮忛〉锛堜腑鍙ｅ緞璁＄畻杩囩▼ / 2025骞村煄甯傚杩愰噺 / 涓彛寰勫垎鏋愶級淇濈暀鏂囦欢褰㈡�併�� + +### 11.3 涓ゆ潯涓嶇収鎼� + +1. **涓嶆妸 Excel 褰撴暟鎹簮**锛氬悓浜嬮偅杈逛笟鍔℃瘡澶╁～鍚屼竴褰㈢姸鐨� Excel 鏂囦欢锛涙眹鎬诲ぇ琛ㄦ暟鎹繀椤昏蛋 DB 瀵煎叆 + 涓ら樁娈电‘璁わ紝涓嶈兘閫�鍥�"鎵嬪伐濉瘝鐗�"銆� +2. **蹇呴』鏈夈�屾柊骞寸粍銆嶉�昏緫**锛氫粬鐨勫ぉ鏁版槸甯告暟锛�8 澶╋級锛岃法骞村彧鏄姞涓�缁勫勾鍒楋紱鎴戜滑璺ㄥ勾瑕佹柊澧炰笅涓�骞村害鍒楃粍骞舵妸褰撳勾缁勯檷绾т负鍙傜収缁勶紝杩欎竴姝ヤ粬娌℃湁瀵瑰簲瀹炵幇銆� + +### 11.4 搴曠嚎涓庨闄� + +- 3 涓殣钘忓叕寮忛〉渚濊禆姣嶇増鐜版垚鍏紡锛岄樁娈� 1鈥�2 蹇呴』鍘熸牱淇濈暀锛岄樁娈� 4 鎵嶈皥閲嶅缓銆� +- 鎵撳嵃鍖恒�侀〉鐪夐〉鑴氥�佹潯浠舵牸寮忋�佸垪瀹藉繀椤婚�愰〉鏍稿锛屾槸"鑲夌溂鐗堝紡"鏈�鏄撴紡鐨勭偣銆� +- 涓氬姟鏀规寚鏍囪/椤电/杈规灞炰簬闇�姹傚彉鏇达紝浠讳綍鏂规閮借涓�娆￠�傞厤锛涙湰鏂规鎶婇鐜囦粠銆屾瘡鏈堜竴娆°�嶉檷鍒般�屽伓灏斾竴娆°�嶃�� +- 姣嶇増鏀逛负鍙锛屽彲椤哄甫瑙勯伩 WPS/openpyxl 閲嶅瓨甯︽潵鐨勯珮鍘嬬缉涓庢畫鐣� `<is>` 闈炴硶鏍间袱绫诲巻鍙插潙銆� +## 鍗佷簩銆佸瓨鍌ㄥ眰/灞曠ず灞傜害瀹氾細鍙傜収鍚屼簨銆屼簩缁磋〃銆嶆ā寮忥紙2026-10-09锛� + +### 12.1 涓夊眰鑱岃矗 + +- **瀛樺偍灞傦紙DB锛�**锛氫竴寮犲紶浜岀淮琛紝閿笌鍊兼槑纭紱瀛樹笁绫诲唴瀹光�斺�斿師濮嬪�笺�侀厤缃�笺�佷汉宸ヨ皟鏁村�笺�� +- **璁＄畻灞�**锛氬鍑烘椂鎸夊彛寰勮绠楋紙绱銆佸悓姣斻�佺幆姣斻�佸崰姣斻�佹帓鍚嶏級銆� +- **灞曠ず灞傦紙Excel锛�**锛氬彧鎶婂�煎拰鍏紡鎸夌増寮忔憜鍑烘潵锛屼笉鎵挎媴瀛樺偍鑱岃矗銆� + +### 12.2 銆屼竴琛ㄤ竴绮掑害銆嶇害瀹氾紙绀轰緥鍙栬嚜鍚屼簨鐨勪笓椤圭粺璁★級 + +| 琛� | 涓婚敭锛堢矑搴︼級 | 鍊� | 绫诲埆 | +|---|---|---|---| +| holiday_passenger_flow | 骞� + 鏃ユ湡 + 杩愯緭鏂瑰紡 | 瀹㈣繍閲� | 鍘熷鍊� | +| holiday_vehicle_flow | 骞� + 鏃ユ湡 + 閬撹矾绫诲埆 + 杞﹀瀷 | 杞︽祦閲忋�佺幆姣斿熀鏈� | 鍘熷鍊� | +| holiday_calendar | 骞� + 鑺傚亣鏃ョ被鍨� + 绗嚑鏃� | 鏃ユ湡 | 閰嶇疆鍊� | +| holiday_passenger_coefficient | 骞� + 鏃ユ湡绫诲埆 | 瀹㈣繍绯绘暟 | 閰嶇疆鍊� | +| holiday_vehicle_adjustment | 骞� + 鏃ユ湡 | 璋冩暣鍚庡�� + 鍘熷洜 | 浜哄伐璋冩暣鍊� | + +鎴戜滑鐜版湁瀵煎叆琛ㄥ悓鏍锋弧瓒宠绾﹀畾锛歚city_bus_monthly`锛堟姤琛ㄦ湡 + 鍦板尯 + 浼佷笟锛夈�乣city_taxi_monthly`锛堟姤琛ㄦ湡 + 鍦板尯锛夈�乣freight_turnover_import`锛堟姤琛ㄦ湡 + 鍦板尯锛夈�乣scale_split_transport`锛堟姤琛ㄦ湡 + 鍦板尯 + 鏈�/绱锛夈�乣h2031_enterprise_monthly`锛堟姤琛ㄦ湡 + 浼佷笟锛夈�乣h2032_enterprise_monthly`銆乣wyc_order_monthly` / `wyc_total_monthly`銆乣passenger_individual_monthly`銆傚瓨鍌ㄥ眰褰㈡�佹槸瀵圭殑銆� + +### 12.3 浜哄伐璋冩暣鍊间竴寰嬪崟鐙缓琛紙瑕嗙洊灞傦級 + +- 妯″紡锛�**鍘熷璁板綍涓嶅姩**锛屽彟琛ㄥ瓨銆岃鐩栧�� + 鍘熷洜 + 鏃堕棿銆嶏紝鍞竴閿笌鎵�瑕嗙洊瀵硅薄涓�鑷达紙鍙傜収鍚屼簨鐨� `holiday_vehicle_adjustment`锛夈�� +- 鎴戜滑鐨勯�傜敤瀵硅薄锛�2025 鍙傜収鍊间慨姝ｃ�佸紓甯哥珯鍓旈櫎銆佷笟鍔′复鏃舵敼鏁扮瓑銆� + +### 12.4 鐜扮姸鏍搁獙锛�2026-10-09 瀹炴祴锛屼慨姝ｆ棭鏈熷垽鏂級 + +瀹炴祴搴� `127.0.0.1:3308 / traffic_audit`锛圡ySQL 8.0.29锛夛細 + +| 琛� | 2025 鏈堜唤鏁� | 缁撹 | +|---|---|---| +| city_bus_monthly | 12/12 | 榻愬叏 | +| city_taxi_monthly | 12/12 | 榻愬叏 | +| wyc_order_monthly / wyc_total_monthly | 12/12 | 榻愬叏 | +| h2031_enterprise_monthly / h2032_enterprise_monthly | 12/12 | 榻愬叏 | +| passenger_individual_monthly | 12/12 | 榻愬叏 | +| freight_turnover_import | 1/12锛堜粎 2025-12锛� | **涓嶆瀯鎴愮己鍙�**锛氳〃甯� `last_freight_m01..m12` / `last_turnover_m01..m12`锛�2026 鍚勬湡鏂囦欢鑷甫鍘诲勾鍚屾湀鍊� | +| scale_split_transport | 0/12 | **涓嶆瀯鎴愮己鍙�**锛氳〃甯� `above/below/total_yoy`锛屽悓姣斿凡闅� 2026 鍚勬湡鍏ュ簱 | + +- 鏃╂湡"搴撻噷娌℃湁 2025 骞村煄甯傚杩愭暟鎹�"鐨勬敞閲婁笌鎻愮ず鏂囨锛坄ReportExportService.java:499 / 558 / 561`锛�**宸茶繃鏈�**锛岃Е鍙戞潯浠朵笉鍐嶆垚绔嬶紱鍚屾瘮鍙栨暟璧扮殑鏄簱鍐呭幓骞村悓鏈燂紙`aggOf(data, year-1, m, "婀栧寳鐪�")`锛岀害 540 琛岋級銆� +- **鐪熸閬楃暀鐨勬槸鍙ｅ緞闂锛屼笉鏄己鏁版嵁**锛氫腑鍙ｅ緞鎺掑悕/鏄庣粏鐨� 2025 鍒椾粛浠�**姣嶇増闈欐�佸畾绋垮��**涓哄噯锛坄readMidDetailLastYearCumulative`锛宍ReportExportService.java:2745` 璧凤級锛屼唬鐮佹敞閲婏紙2686-2689 琛岋級璇存槑鍘熷洜鈥斺��"鎺掑悕椤靛師鍏堟煡搴撶幇绠楋紝涓よ�呭湪 **2025-03/04 缃戠害杞︽媶鍒�**涓婁笉鍚�"銆� +- 澶勭疆锛氬厛鍋氥�屽簱鍐� 2025 vs 姣嶇増 2025銆嶉�愰」 diff锛堜腑鍙ｅ緞 4 缁勪欢 脳 17 甯傚窞 脳 12 鏈� + 绱锛夛紝浜や笟鍔＄‘璁や互鍝竟涓哄噯锛屽啀鍐冲畾鏄惁鍒囨崲璇诲簱銆� + +### 12.5 缁撴灉灞傦紙姣斿悓浜嬫洿杩涗竴姝ワ紝鍙�夛級 + +- 鍚屼簨搴撻噷**涓嶅瓨璁＄畻缁撴灉**锛氱疮璁°�佸悓姣斻�佸崰姣斻�佺幆姣斿潎瀵煎嚭鏃剁畻锛孍xcel 鍐呰〃鐜颁负鍏紡銆� +- 鎴戜滑鍙�夊鍔犱竴寮犵粨鏋滆〃锛岀矑搴� = 鏈熼棿 + 椤� + 鎸囨爣 + 甯傚窞 + 褰撴湀/绱锛汣alc 鍐欏叆銆丗iller 璇诲彇銆� +- 鏀剁泭锛氬皬琛ㄤ笌璺ㄩ〉鍚堟垚椤靛叡鐢ㄤ竴濂楃粨鏋滐紱閫愭牸 diff 鏃惰兘鐩存帴鍖哄垎銆岀畻閿欍�嶈繕鏄�屽～閿欍�嶃�� +- 绾﹀畾锛氭寜鏈熼棿**骞傜瓑閲嶇畻**锛堝厛鍒犺鏈熼棿鍐嶆彃锛夛紱鏄剧ず鍙栨暣涓嶄笅娌夊埌搴擄紝鍙湪灞曠ず灞傝垗鍏ャ�� + +### 12.6 鑷绾緥锛堢孩绾匡級 + +> **姣嶇増閲屼笉鍏佽瀛樺湪銆屽彧鏈夊畠鎵嶆湁鐨勬暟鎹�嶃��** + +鍒ゅ畾鏂规硶锛氭妸姣嶇増鎵�鏈夊�兼竻绌哄悗锛岀▼搴忚兘鍚﹂噸鏂扮敓鎴愪竴寮犲畬鍏ㄤ竴鑷寸殑琛紵鑳� 鈫� 鏁版嵁閮藉湪搴擄紱涓嶈兘 鈫� 杩樻湁鏁版嵁钘忓湪 Excel 閲岋紝缁х画寰�搴撻噷鎼�� + +### 12.7 涓� M0 鐨勫叧绯伙紙渚濊禆椤哄簭锛� + +- 12.4 鐨勫彛寰勬牳瀵逛笉闃诲 M0 闃舵 1锛堢増寮忛噸寤猴級銆� +- M0 闃舵 2銆屽仠鐢� `_澶囦唤_` donor 杩樺師銆嶇殑鏁版嵁鍓嶆彁**宸插熀鏈弧瓒�**锛�2025 宸插湪搴擄級锛涗絾浠嶉渶鍏堝叧闂� 12.4 鐨勫樊寮傦紝鍚﹀垯鍒囨崲鍙栨暟鏉ユ簮浼氳鏁板瓧鍙樺姩銆佹棤娉曢�氳繃 diff=0 鍥炲綊銆� \ No newline at end of file -- Gitblit v1.9.1