From 2d74b99f1cb1ba745e32f5cfdfed82a8fb22f37f Mon Sep 17 00:00:00 2001
From: zhizhijie <zhizhijie@users.noreply.gitee.com>
Date: 星期二, 22 九月 2026 09:49:41 +0800
Subject: [PATCH] feat(数据查看): 补齐网约车总数/网约车订单/个体客运三类查看（含市州派生）+ 测试报告与日结
---
docs/功能测试报告/功能测试报告_数据查看补齐网约车与个体客运类型_2026-09-22.md | 76 +++++++++++++++++++
docs/工作日结/工作日结_2026-09-22.md | 44 +++++++++++
traffic-audit-web/src/views/DataView.vue | 7 +
traffic-audit-server/src/main/java/com/trafficaudit/dataimport/controller/DataViewController.java | 85 +++++++++++++++++++++
4 files changed, 210 insertions(+), 2 deletions(-)
diff --git "a/docs/\345\212\237\350\203\275\346\265\213\350\257\225\346\212\245\345\221\212/\345\212\237\350\203\275\346\265\213\350\257\225\346\212\245\345\221\212_\346\225\260\346\215\256\346\237\245\347\234\213\350\241\245\351\275\220\347\275\221\347\272\246\350\275\246\344\270\216\344\270\252\344\275\223\345\256\242\350\277\220\347\261\273\345\236\213_2026-09-22.md" "b/docs/\345\212\237\350\203\275\346\265\213\350\257\225\346\212\245\345\221\212/\345\212\237\350\203\275\346\265\213\350\257\225\346\212\245\345\221\212_\346\225\260\346\215\256\346\237\245\347\234\213\350\241\245\351\275\220\347\275\221\347\272\246\350\275\246\344\270\216\344\270\252\344\275\223\345\256\242\350\277\220\347\261\273\345\236\213_2026-09-22.md"
new file mode 100644
index 0000000..eae6b78
--- /dev/null
+++ "b/docs/\345\212\237\350\203\275\346\265\213\350\257\225\346\212\245\345\221\212/\345\212\237\350\203\275\346\265\213\350\257\225\346\212\245\345\221\212_\346\225\260\346\215\256\346\237\245\347\234\213\350\241\245\351\275\220\347\275\221\347\272\246\350\275\246\344\270\216\344\270\252\344\275\223\345\256\242\350\277\220\347\261\273\345\236\213_2026-09-22.md"
@@ -0,0 +1,76 @@
+# 鍔熻兘娴嬭瘯鎶ュ憡锛氭暟鎹煡鐪嬭ˉ榻愮綉绾﹁溅涓庝釜浣撳杩愮被鍨嬶紙2026-09-22锛�
+
+> 鏃ユ湡锛�2026-09-22銆�妯″潡锛氭暟鎹煡鐪嬶紙鍓嶇 DataView + 鍚庣 DataViewController锛夈��娴嬭瘯浜猴細Codex
+> 璇夋眰鏉ユ簮锛氭暟鎹煡鐪嬬殑鏁版嵁绫诲瀷搴斿仛鍒�"鑳藉鍏ヤ粈涔堟暟鎹氨鑳界湅鍒颁粈涔堟暟鎹�"锛岀敤浜庢牳瀵瑰鍏ユ槸鍚﹀畬鏁淬��
+
+## 涓�銆佸姛鑳借鏄�
+
+鏁版嵁鏌ョ湅椤靛師鍏堝彧鏈� 15 涓暟鎹被鍨嬶紝缃戠害杞︿笌涓綋瀹㈣繍铏界劧宸叉湁瀵煎叆鎺ュ彛鍜屾ā鏉匡紝浣�**娌℃湁鏌ョ湅鍏ュ彛**锛屽鍏ュ悗鍙兘鏌ユ暟鎹簱銆傛湰娆¤ˉ榻� 3 涓被鍨嬶細
+
+| 鏂板绫诲瀷 | 椤甸潰鍚嶇О | 鏁版嵁琛� | 鍒楁暟 |
+| --- | --- | --- | --- |
+| `wycTotal` | 缃戠害杞︽�绘暟 | `wyc_total_monthly` | 5 |
+| `wycOrder` | 缃戠害杞﹁鍗曞強鍏ㄧ渷鎬婚噺 | `wyc_order_monthly` | 23锛堝惈 17 甯傚窞璁㈠崟鍒楋級 |
+| `passengerIndividual` | 涓綋瀹㈣繍閲�/鍛ㄨ浆閲� | `passenger_individual_monthly` | 7锛堝惈鐢卞尯鍒掍唬鐮佹淳鐢熺殑"甯傚窞"鍒楋級 |
+
+鏀瑰姩鐐癸細
+- 鍚庣 `traffic-audit-server/src/main/java/com/trafficaudit/dataimport/controller/DataViewController.java`锛氭柊澧� 3 涓� `switch` 鍒嗘敮銆�3 缁勫垪瀹氫箟銆�3 涓� Mapper 娉ㄥ叆锛沗passengerIndividual` 鐢� `RegionUtil.cityByCode` 鎶� 6 浣嶅尯鍒掍唬鐮佹淳鐢熶负甯傚窞鍚嶃��
+- 鍓嶇 `traffic-audit-web/src/views/DataView.vue`锛氬叕璺梾瀹㈡ā鍧楀姞"涓綋瀹㈣繍閲�/鍛ㄨ浆閲�"锛屽煄甯傚杩愭ā鍧楀姞"缃戠害杞︽�绘暟""缃戠害杞﹁鍗曞強鍏ㄧ渷鎬婚噺"銆�
+
+## 浜屻�佹祴璇曠幆澧�
+
+- 鍚庣锛歚mvn spring-boot:run -f traffic-audit-server/pom.xml`锛�8090锛屾棩蹇楀嚭鐜� `Started TrafficAuditApplication`銆乣Tomcat started on port(s): 8090`
+- 鍓嶇锛歚npm run serve`锛坱raffic-audit-web锛夛紝8080锛宍Compiled successfully in 4769ms`
+- 鏁版嵁搴擄細鏈満 MySQL `localhost:3308/traffic_audit`锛坢ysql CLI 鐩存煡鏍稿锛�
+- 鐧诲綍锛歚POST /api/auth/login`锛坅dmin/123456锛夊彇 JWT锛屽悗缁帴鍙ｅ甫 `Authorization: Bearer <token>`
+
+## 涓夈�佺敤渚嬭〃
+
+### 3.1 姝ｅ悜鐢ㄤ緥
+
+| 缂栧彿 | 杈撳叆 | 棰勬湡 | 瀹為檯 | 缁撹 |
+| --- | --- | --- | --- | --- |
+| TC-1 | `GET /api/data/list?type=wycTotal` | 20 琛屻��5 鍒楋紝鍒楀悕涓庢ā鏉夸竴鑷� | total=20锛屽垪锛氭姤琛ㄦ湡/鍏ㄧ渷缃戠害杞﹀杩愰噺/鍏朵腑鍩庡競鍐呭杩愰噺/鍏ㄧ渷缃戠害杞﹀懆杞噺/鍏朵腑鍩庡競鍐呭懆杞噺锛涢琛� 2025-01锛�2467.79 / 2325.25 / 14910.54 / 12202.49 | 閫氳繃 |
+| TC-2 | `type=wycOrder` | 20 琛屻��23 鍒楋紙鍚� 17 甯傚窞锛� | total=20锛�23 鍒楋紱棣栬 2025-09锛歰rderSum=17652159锛屾姹� 8076610銆侀粍鐭� 676644鈥︾鍐滄灦 1424 | 閫氳繃 |
+| TC-3 | `type=passengerIndividual` | 139 琛屻��7 鍒楋紝鍚淳鐢熷競宸� | total=139锛涢琛� 2025-01锛歳egionCode=420900 鈫� 甯傚窞=瀛濇劅甯傦紝涓綋瀹㈣繍閲� 6442銆佸懆杞噺 117502.08 | 閫氳繃 |
+| TC-4 | `type=wycOrder&period=2026-08` | 浠� 2026-08 涓�琛� | total=1锛宺ows=1锛宑ols=23 | 閫氳繃 |
+| TC-5 | `type=passengerIndividual&period=2026-08` | 浠� 2026-08 | total=6 | 閫氳繃 |
+| TC-6 | `type=passengerIndividual&keyword=瀛濇劅` | 浠呭瓭鎰熺浉鍏宠 | total=40 | 閫氳繃 |
+| TC-7 | 鍓嶇涓嬫媺 | 鍏矾鏃呭 3 椤广�佸煄甯傚杩� 5 椤� | 涓嬫媺鏂板 3 椤癸紝`npm run serve` 缂栬瘧鎴愬姛 | 閫氳繃 |
+
+### 3.2 璐熷悜鐢ㄤ緥
+
+| 缂栧彿 | 杈撳叆 | 棰勬湡 | 瀹為檯 | 缁撹 |
+| --- | --- | --- | --- | --- |
+| TC-8 | `type=notExist` | 绌虹粨鏋溿�佷笉鎶ラ敊 | total=0銆乺ecords=0銆乧olumns=0 | 閫氳繃 |
+| TC-9 | `type=wycOrder&period=1999-01`锛堟棤鏁版嵁鐨勬湡锛� | 绌虹粨鏋� | total=0銆乺ecords=0銆佸垪瀹氫箟姝ｅ父杩斿洖 | 閫氳繃 |
+| TC-10 | 涓嶅甫 token 璁块棶 `/api/data/list` | 401锛堟棦鏈夊畨鍏ㄧ瓥鐣ワ級 | 401 | 閫氳繃锛堥潪缂洪櫡锛� |
+| TC-11 | `type=wycTotal&keyword=xx` | 璇ヨ〃鏃犲悕绉板垪锛屽叧閿瓧涓嶇敓鏁� | 浠嶈繑鍥� 20 琛� | 閫氳繃锛堣閬楃暀 1锛� |
+
+### 3.3 鍏ュ簱鎶芥煡锛堟帴鍙ｆ潯鏁� vs 搴撳唴琛屾暟锛�
+
+| 琛� | 搴撳唴琛屾暟 | 鎺ュ彛 total | 缁撹 |
+| --- | --- | --- | --- |
+| `wyc_total_monthly` | 20 | 20 | 涓�鑷� |
+| `wyc_order_monthly` | 20 | 20 | 涓�鑷� |
+| `passenger_individual_monthly` | 139 | 139 | 涓�鑷� |
+
+### 3.4 鍥炲綊锛堝師鏈� 15 绫讳笉鍙楀奖鍝嶏級
+
+`h2032` 13056 / `transportAuth` 1270 / `trackMileage` 628 / `scaleSplit` 288 / `freightTurnover` 234 / `h2031` 15811 / `passengerAuth` 0 / `cityBus` 2860 / `cityTaxi` 340 / `cityTaxiAuth` 85272 / `investmentProject` 152 / `investmentMonthly` 284 / `investmentSystem` 277 / `energyVehicle` 2568 / `energyAuth` 1203 鈥斺�� 鍧囨甯歌繑鍥烇紝鍒楁暟涓嶅彉銆�
+
+## 鍥涖�佸彂鐜扮殑闂涓庡缃�
+
+1. `wycTotal` / `wycOrder` 娌℃湁鍚嶇О绫诲瓧娈碉紝椤甸潰涓�"浼佷笟/甯傚窞鍚嶇О"鍏抽敭瀛楁瀵瑰畠鏃犳晥锛堣繑鍥炲叏閲忥級銆傚睘鏃㈡湁浜や簰鐨勪竴鑷存�ч棶棰橈紝鏈湪鏈鏀瑰姩锛屽垪鍏ュ緟浼樺寲銆�
+2. 缃戠害杞﹁鍗曡〃涓哄琛紙17 甯傚窞鍚勪竴鍒楋級锛屾槑缁嗛〉妯悜 23 鍒楋紝闇�瑕佹í鍚戞粴鍔ㄦ煡鐪嬶紱鏈仛杞疆锛屼繚鎸佷笌瀵煎叆鏂囦欢鍒楀簭涓�鑷达紝渚夸簬鏍稿銆�
+
+## 浜斻�佺粨璁�
+
+3 涓柊澧炵被鍨嬪叏閮ㄩ�氳繃姝ｅ悜銆佽礋鍚戜笌鍏ュ簱鎶芥煡鐢ㄤ緥锛屽師鏈� 15 绫绘棤鍥炲綊銆傛暟鎹煡鐪嬬幇宸茶鐩�**鍏ㄩ儴鍙鍏ョ殑鏁版嵁绫诲瀷**锛屽彲鐢ㄤ簬鏍稿瀵煎叆瀹屾暣鎬с��
+
+## 鍏�侀檮锛氳法鏈熸眹鎬诲彛寰勶紙涓嬩竴姝ュ緟鍋氬姛鑳界殑鍙ｅ緞渚濇嵁锛�
+
+鏈堟姤鍚勮〃鐨勬湀鍊煎潎涓�**褰撴湀鍊�**銆傛寜甯傚窞鍋�"浠绘剰璧锋鏈�"姹囨�绘椂锛屽垪鎸夋�ц川鍒嗕笁绫诲鐞嗭細
+- 娴侀噺绫伙紙瀹㈣繍閲忋�佸懆杞噺銆佽揣杩愰噺銆佽鍗曟暟锛夆啋 閫愭湀姹傚拰锛�
+- 鏃剁偣绫伙紙杩愯惀杞﹁締鏁般�佽惀杩愯溅杈嗘暟銆佷紒涓氭暟锛夆啋 涓嶆眰鍜岋紝鍙栨湡鏈�硷紙濡傛姹夊叕浜よ繍钀ヨ溅杈� 2026 鍚勬湀 8476鈫�7861锛岄�愭湀鐩稿姞浼氬緱鍒� 64879 杈嗭紝瀹為檯 8 鏈堟湯鍙湁 7861 杈嗭級锛�
+- 姣旂巼绫伙紙鐜瘮銆佸悓姣斻�佸钩鍧囪繍璺濄�佸崰姣旓級鈫� 涓嶆眰鍜岋紝鎸夌疮璁″彛寰勯噸绠椼��
diff --git "a/docs/\345\267\245\344\275\234\346\227\245\347\273\223/\345\267\245\344\275\234\346\227\245\347\273\223_2026-09-22.md" "b/docs/\345\267\245\344\275\234\346\227\245\347\273\223/\345\267\245\344\275\234\346\227\245\347\273\223_2026-09-22.md"
new file mode 100644
index 0000000..f922a1b
--- /dev/null
+++ "b/docs/\345\267\245\344\275\234\346\227\245\347\273\223/\345\267\245\344\275\234\346\227\245\347\273\223_2026-09-22.md"
@@ -0,0 +1,44 @@
+# 宸ヤ綔鏃ョ粨_2026-09-22
+
+## 涓�銆佷粖澶╁仛浜嗕粈涔�
+
+### 1. 鏁版嵁鏌ョ湅椤佃ˉ榻愮綉绾﹁溅涓庝釜浣撳杩愮被鍨嬶紙"鑳藉鍏ュ氨鑳界湅"锛�
+
+鐢ㄦ埛璇夋眰锛氭暟鎹煡鐪嬬殑鏁版嵁绫诲瀷搴斿仛鍒�"鑳藉鍏ヤ粈涔堟暟鎹氨鑳界湅鍒颁粈涔堟暟鎹�"锛岀敤浜庢牳瀵瑰鍏ユ槸鍚﹀畬鏁淬��
+鍘熷厛缃戠害杞︽�绘暟銆佺綉绾﹁溅璁㈠崟銆佷釜浣撳杩愪笁寮犺〃**鏈夊鍏ユ帴鍙ｅ拰妯℃澘浣嗘病鏈夋煡鐪嬪叆鍙�**锛屽鍏ュ悗鍙兘鏌ユ暟鎹簱銆�
+
+- 鍚庣 `DataViewController`锛氭柊澧� `wycTotal` / `wycOrder` / `passengerIndividual` 涓変釜鍒嗘敮 + 涓夌粍鍒楀畾涔� + 涓変釜 Mapper 娉ㄥ叆锛�
+ `passengerIndividual` 鐢� `RegionUtil.cityByCode` 鎶� 6 浣嶅尯鍒掍唬鐮佹淳鐢熶负"甯傚窞"鍒楋紙濡� 420900 鈫� 瀛濇劅甯傦級銆�
+- 鍓嶇 `DataView.vue`锛氬叕璺梾瀹㈡ā鍧楀姞"涓綋瀹㈣繍閲�/鍛ㄨ浆閲�"锛屽煄甯傚杩愭ā鍧楀姞"缃戠害杞︽�绘暟""缃戠害杞﹁鍗曞強鍏ㄧ渷鎬婚噺"锛堣鍗曡〃 23 鍒楋紝17 甯傚窞鍚勪竴鍒楋紝淇濇寔涓庡鍏ユ枃浠跺垪搴忎竴鑷达級銆�
+
+### 2. 璺ㄦ湡"鎸夊競宸炴眹鎬�"鐨勫彛寰勮皟鐮� + 鏍蜂緥
+
+- 鐢熸垚鏍蜂緥 `D:\妗岄潰\鎸夊競宸炴眹鎬籣2026骞�1-8鏈堢疮璁鏍蜂緥.xlsx`锛氬叕浜ゃ�佸贰娓稿嚭绉熴�佽揣杩愯涓婁紒涓氫笁寮犺〃锛�17 甯傚窞 + 鍏ㄧ渷鍚堣琛� + "鍙ｅ緞璇存槑"椤点��
+- 鏍稿疄鍚勮〃鏈堝�煎彛寰勪负**褰撴湀鍊�**锛堝叕浜� 2025 鍚勬湀鍏ㄧ渷 1.2~1.5 浜夸汉娆￠噺绾э級锛屾晠璺ㄦ湡姹囨�绘寜鍒楁�ц川鍒嗕笁绫伙細
+ - 娴侀噺绫伙紙瀹㈣繍閲�/鍛ㄨ浆閲�/璐ц繍閲�/璁㈠崟鏁帮級鈫� 姹傚拰锛�
+ - 鏃剁偣绫伙紙杩愯惀杞﹁締鏁�/钀ヨ繍杞﹁締鏁�/浼佷笟鏁帮級鈫� 鍙栨湡鏈紙姝︽眽鍏氦 2026 鍚勬湀 8476鈫�7861锛岄�愭湀鐩稿姞寰� 64879 杈嗭紝瀹為檯 8 鏈堟湯浠� 7861 杈嗭級锛�
+ - 姣旂巼绫伙紙鐜瘮/鍚屾瘮/骞冲潎杩愯窛/鍗犳瘮锛夆啋 鎸夌疮璁″彛寰勯噸绠椼��
+- 璐ц繍浼佷笟琛ㄧ殑甯傚窞鐢� 6 浣嶅尯鍒掍唬鐮佸墠 4 浣嶅綊骞讹紙4290xx 鐩寸甯傛寜 6 浣嶄紭鍏堬級锛�17 甯傚窞鍏ㄩ儴璇嗗埆锛屾棤"鏈瘑鍒�"銆�
+
+### 3. 鏍告煡"鏁版嵁鏌ョ湅宸插姞姹囨�诲姛鑳�"鐨勭幇鐘�
+
+鐢ㄦ埛鍦ㄥ埆澶勭湅鍒�"姹囨��"鎸夐挳锛屽疄闄呮牳鏌ワ細鍓嶇 `DataView.vue` 鍏ㄦ枃鏃�"姹囨��/瀵煎嚭"锛坄ReportExport.vue` 鎵嶆湁锛夛紝鍚庣鍙湁 `/api/data/list`锛屽叏浠� + `traffic-audit-web/dist` + 閮ㄧ讲 jar + gitea 杩滅 `main` 鍧囨棤鐩稿叧浠ｇ爜銆傚凡鍚戠敤鎴疯鏄庯紝鎸�"灏氭湭瀹炵幇銆佺敱鏈粨瀹炵幇"鎺ㄨ繘銆�
+
+## 浜屻�佹祴璇曠粨鏋滄憳瑕�
+
+- 鎶ュ憡锛歚docs/鍔熻兘娴嬭瘯鎶ュ憡/鍔熻兘娴嬭瘯鎶ュ憡_鏁版嵁鏌ョ湅琛ラ綈缃戠害杞︿笌涓綋瀹㈣繍绫诲瀷_2026-09-22.md`
+- 鐜锛氬悗绔� `mvn spring-boot:run`锛�8090锛宍Started TrafficAuditApplication`锛夛紱鍓嶇 `npm run serve`锛�8080锛宍Compiled successfully in 4769ms`锛夛紱MySQL `localhost:3308/traffic_audit`锛涚櫥褰� admin/123456 鍙� JWT銆�
+- 缁撴灉锛�3 涓柊绫诲瀷姝ｅ悜锛堝惈鏈熼棿/鍏抽敭瀛楃瓫閫夛級銆佽礋鍚戯紙鏈煡绫诲瀷銆佹棤鏁版嵁鏈熴�佹棤 token锛夊叏閮ㄩ�氳繃锛涘叆搴撴娊鏌ユ潯鏁颁笌搴撳唴涓�鑷达紙20 / 20 / 139锛夛紱鍘熸湁 15 绫诲洖褰掓甯搞��
+
+## 涓夈�侀仐鐣欓棶棰樹笌寰呭姙
+
+1. 銆愪笅涓�姝ヤ富浣撳伐浣溿�戞暟鎹煡鐪�"鎸夊競宸炴眹鎬�"锛氫换鎰忚捣姝㈡湀 + 17 甯傚窞 + 鍚堣琛岋紱鏃剁偣鍒楀彇鏈熸湯锛涙瘮鐜囧垪鎸夌疮璁″彛寰勯噸绠楋紱骞舵敮鎸佸鍑� Excel銆�
+2. 姹囨�诲彛寰勭粏鍒欏緟涓氬姟纭锛氭帓鍚嶅瓧娈佃法鏈熼渶閲嶆柊鎺掑悕锛堝厛鐣欑┖锛夛紱绱鍚屾瘮闇�瑕佽嚜鍔ㄥ彇涓婂勾鍚屾湡鏈熼棿銆�
+3. 鍏抽敭瀛楁瀵规棤鍚嶇О鍒楃殑琛紙缃戠害杞︽�绘暟銆佺綉绾﹁溅璁㈠崟锛夋棤鏁堬紝寰呬紭鍖栥��
+4. `scale_split_transport`锛堣涓�/瑙勪笅鎷嗗垎锛�288 琛屾暟鍊煎叏涓� NULL锛岃嫢鍝紶鎶ヨ〃渚濊禆瀹冩寜甯傚窞鍑烘暟浼氬彇涓嶅埌鍊硷紝寤鸿涓庡悓浜嬬‘璁ゅ鍏ユ潵婧愩��
+5. Codex 妗岄潰绔ā鍨嬫樉绀猴紙09-21 鏅氶仐鐣欙級锛氬凡鍐� `model_catalog_json` 娓呭崟锛屽緟鐢ㄦ埛閲嶅惎瀹㈡埛绔‘璁ょ晫闈㈡樉绀� `deepseek-flash`銆�
+
+## 鍥涖�佹槑澶╄鍒�
+
+1. 寮�宸�"鎸夊競宸炴眹鎬� + 瀵煎嚭 Excel"锛氬悗绔姞 `/api/data/summary` 涓� `/api/data/export`锛屽墠绔姞"鏄庣粏/姹囨��"鍒囨崲涓庡鍑烘寜閽��
+2. 姹囨�荤粨鏋滀笌鎶ヨ〃/鎵嬪伐浣滀笟鎶芥牱鏍稿锛�1-8 鏈堝叕浜ゃ�佸贰娓稿嚭绉熴�佽揣杩愯涓婁紒涓氾級銆�
diff --git a/traffic-audit-server/src/main/java/com/trafficaudit/dataimport/controller/DataViewController.java b/traffic-audit-server/src/main/java/com/trafficaudit/dataimport/controller/DataViewController.java
index 1725e4e..79aba3a 100644
--- a/traffic-audit-server/src/main/java/com/trafficaudit/dataimport/controller/DataViewController.java
+++ b/traffic-audit-server/src/main/java/com/trafficaudit/dataimport/controller/DataViewController.java
@@ -19,6 +19,10 @@
import com.trafficaudit.dataimport.entity.InvestmentSystem;
import com.trafficaudit.dataimport.entity.EnergyVehicleQuarterly;
import com.trafficaudit.dataimport.entity.EnergyAuthVehicle;
+import com.trafficaudit.dataimport.entity.PassengerIndividualMonthly;
+import com.trafficaudit.dataimport.entity.WycOrderMonthly;
+import com.trafficaudit.dataimport.entity.WycTotalMonthly;
+import com.trafficaudit.common.util.RegionUtil;
import com.trafficaudit.dataimport.mapper.FreightTurnoverImportMapper;
import com.trafficaudit.dataimport.mapper.H2032EnterpriseMonthlyMapper;
import com.trafficaudit.dataimport.mapper.PassengerAuthVehicleMapper;
@@ -34,6 +38,9 @@
import com.trafficaudit.dataimport.mapper.InvestmentSystemMapper;
import com.trafficaudit.dataimport.mapper.EnergyVehicleQuarterlyMapper;
import com.trafficaudit.dataimport.mapper.EnergyAuthVehicleMapper;
+import com.trafficaudit.dataimport.mapper.PassengerIndividualMonthlyMapper;
+import com.trafficaudit.dataimport.mapper.WycOrderMonthlyMapper;
+import com.trafficaudit.dataimport.mapper.WycTotalMonthlyMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -84,6 +91,12 @@
private EnergyVehicleQuarterlyMapper energyVehicleMapper;
@Resource
private EnergyAuthVehicleMapper energyAuthMapper;
+ @Resource
+ private PassengerIndividualMonthlyMapper passengerIndividualMapper;
+ @Resource
+ private WycOrderMonthlyMapper wycOrderMapper;
+ @Resource
+ private WycTotalMonthlyMapper wycTotalMapper;
@GetMapping("/list")
public Result<Map<String, Object>> list(@RequestParam("type") String type,
@@ -289,6 +302,43 @@
fillPage(result, r);
break;
}
+ case "passengerIndividual": {
+ LambdaQueryWrapper<PassengerIndividualMonthly> w = new LambdaQueryWrapper<PassengerIndividualMonthly>()
+ .eq(notEmpty(period), PassengerIndividualMonthly::getReportPeriod, period)
+ .like(!kw.isEmpty(), PassengerIndividualMonthly::getEnterpriseName, kw)
+ .orderByDesc(PassengerIndividualMonthly::getId);
+ Page<PassengerIndividualMonthly> p = new Page<>(safePage, safeSize);
+ Page<PassengerIndividualMonthly> r = passengerIndividualMapper.selectPage(p, w);
+ List<Map<String, Object>> rows = toMaps(r.getRecords(), propsOf(PAX_INDIVIDUAL_COLUMNS));
+ for (Map<String, Object> row : rows) {
+ Object rc = row.get("regionCode");
+ String cityName = rc == null ? null : RegionUtil.cityByCode(String.valueOf(rc));
+ row.put("city", cityName == null ? "" : cityName);
+ }
+ result.put("records", rows);
+ fillPage(result, r);
+ break;
+ }
+ case "wycTotal": {
+ LambdaQueryWrapper<WycTotalMonthly> w = new LambdaQueryWrapper<WycTotalMonthly>()
+ .eq(notEmpty(period), WycTotalMonthly::getReportPeriod, period)
+ .orderByDesc(WycTotalMonthly::getId);
+ Page<WycTotalMonthly> p = new Page<>(safePage, safeSize);
+ Page<WycTotalMonthly> r = wycTotalMapper.selectPage(p, w);
+ result.put("records", toMaps(r.getRecords(), propsOf(WYC_TOTAL_COLUMNS)));
+ fillPage(result, r);
+ break;
+ }
+ case "wycOrder": {
+ LambdaQueryWrapper<WycOrderMonthly> w = new LambdaQueryWrapper<WycOrderMonthly>()
+ .eq(notEmpty(period), WycOrderMonthly::getReportPeriod, period)
+ .orderByDesc(WycOrderMonthly::getId);
+ Page<WycOrderMonthly> p = new Page<>(safePage, safeSize);
+ Page<WycOrderMonthly> r = wycOrderMapper.selectPage(p, w);
+ result.put("records", toMaps(r.getRecords(), propsOf(WYC_ORDER_COLUMNS)));
+ fillPage(result, r);
+ break;
+ }
default:
result.put("records", new ArrayList<>());
result.put("total", 0L);
@@ -346,6 +396,9 @@
case "investmentSystem": return INVEST_SYSTEM_COLUMNS;
case "energyVehicle": return ENERGY_VEHICLE_COLUMNS;
case "energyAuth": return ENERGY_AUTH_COLUMNS;
+ case "passengerIndividual": return PAX_INDIVIDUAL_COLUMNS;
+ case "wycTotal": return WYC_TOTAL_COLUMNS;
+ case "wycOrder": return WYC_ORDER_COLUMNS;
default: return new ArrayList<>();
}
}
@@ -374,6 +427,9 @@
private static final List<Map<String, Object>> INVEST_SYSTEM_COLUMNS = new ArrayList<>();
private static final List<Map<String, Object>> ENERGY_VEHICLE_COLUMNS = new ArrayList<>();
private static final List<Map<String, Object>> ENERGY_AUTH_COLUMNS = new ArrayList<>();
+ private static final List<Map<String, Object>> PAX_INDIVIDUAL_COLUMNS = new ArrayList<>();
+ private static final List<Map<String, Object>> WYC_TOTAL_COLUMNS = new ArrayList<>();
+ private static final List<Map<String, Object>> WYC_ORDER_COLUMNS = new ArrayList<>();
static {
H2032_COLUMNS.add(col("reportPeriod", "鎶ヨ〃鏈�", 100));
@@ -604,5 +660,34 @@
ENERGY_AUTH_COLUMNS.add(col("markedTonnage", "鏍囪鍚ㄤ綅", 100));
ENERGY_AUTH_COLUMNS.add(col("tractionQuality", "鐗靛紩璐ㄩ噺", 110));
+ PAX_INDIVIDUAL_COLUMNS.add(col("reportPeriod", "鎶ヨ〃鏈�", 100));
+ PAX_INDIVIDUAL_COLUMNS.add(col("regionCode", "鎵�灞炲湴鍖�", 110));
+ PAX_INDIVIDUAL_COLUMNS.add(col("city", "甯傚窞", 110));
+ PAX_INDIVIDUAL_COLUMNS.add(col("enterpriseCode", "浼佷笟浠ｇ爜", 130));
+ PAX_INDIVIDUAL_COLUMNS.add(col("enterpriseName", "浼佷笟鍚嶇О", 220));
+ PAX_INDIVIDUAL_COLUMNS.add(col("passengerCount", "涓綋瀹㈣繍閲�", 130));
+ PAX_INDIVIDUAL_COLUMNS.add(col("turnover", "涓綋鏃呭鍛ㄨ浆閲�", 150));
+
+ WYC_TOTAL_COLUMNS.add(col("reportPeriod", "鎶ヨ〃鏈�", 100));
+ WYC_TOTAL_COLUMNS.add(col("pinK", "鍏ㄧ渷缃戠害杞﹀杩愰噺(涓囦汉娆�)", 210));
+ WYC_TOTAL_COLUMNS.add(col("pinCK", "鍏朵腑鍩庡競鍐呭杩愰噺(涓囦汉娆�)", 210));
+ WYC_TOTAL_COLUMNS.add(col("pinZ", "鍏ㄧ渷缃戠害杞﹀懆杞噺(涓囦汉鍏噷)", 220));
+ WYC_TOTAL_COLUMNS.add(col("pinCZ", "鍏朵腑鍩庡競鍐呭懆杞噺(涓囦汉鍏噷)", 220));
+
+ WYC_ORDER_COLUMNS.add(col("reportPeriod", "鎶ヨ〃鏈�", 100));
+ WYC_ORDER_COLUMNS.add(col("pinK", "鍏ㄧ渷瀹㈣繍閲�(涓囦汉娆�)", 170));
+ WYC_ORDER_COLUMNS.add(col("pinCK", "鍏朵腑鍩庡競鍐呭杩愰噺", 170));
+ WYC_ORDER_COLUMNS.add(col("pinZ", "鍏ㄧ渷鍛ㄨ浆閲�(涓囦汉鍏噷)", 180));
+ WYC_ORDER_COLUMNS.add(col("pinCZ", "鍏朵腑鍩庡競鍐呭懆杞噺", 170));
+ WYC_ORDER_COLUMNS.add(col("orderSum", "璁㈠崟鍚堣(鍗�)", 130));
+ String[] wycOrderCityProps = { "orderWuhan", "orderHuangshi", "orderShiyan", "orderYichang", "orderXiangyang",
+ "orderEzhou", "orderJingmen", "orderXiaogan", "orderJingzhou", "orderHuanggang", "orderXianning",
+ "orderSuizhou", "orderEnshi", "orderXiantao", "orderQianjiang", "orderTianmen", "orderShennong" };
+ String[] wycOrderCityNames = { "姝︽眽", "榛勭煶", "鍗佸牥", "瀹滄槍", "瑗勯槼", "閯傚窞", "鑽嗛棬", "瀛濇劅", "鑽嗗窞", "榛勫唸",
+ "鍜稿畞", "闅忓窞", "鎭╂柦", "浠欐", "娼滄睙", "澶╅棬", "绁炲啘鏋�" };
+ for (int i = 0; i < wycOrderCityProps.length; i++) {
+ WYC_ORDER_COLUMNS.add(col(wycOrderCityProps[i], wycOrderCityNames[i] + "璁㈠崟(鍗�)", 120));
+ }
+
}
}
\ No newline at end of file
diff --git a/traffic-audit-web/src/views/DataView.vue b/traffic-audit-web/src/views/DataView.vue
index be4d1c9..7b0d59e 100644
--- a/traffic-audit-web/src/views/DataView.vue
+++ b/traffic-audit-web/src/views/DataView.vue
@@ -71,14 +71,17 @@
{
key: 'passenger', name: '鍏矾鏃呭', types: [
{ value: 'h2031', label: '鍏矾鏃呭杩愯緭鏈堝害鐢熶骇鎯呭喌' },
- { value: 'passengerAuth', label: '杩愭斂杞﹁締鏁�' }
+ { value: 'passengerAuth', label: '杩愭斂杞﹁締鏁�' },
+ { value: 'passengerIndividual', label: '涓綋瀹㈣繍閲�/鍛ㄨ浆閲�' }
]
},
{
key: 'city', name: '鍩庡競瀹㈣繍', types: [
{ value: 'cityBus', label: '鍩庡競鍏叡浜ら�氭湀搴﹁繍钀ユ儏鍐�' },
{ value: 'cityTaxi', label: '宸℃父鍑虹姹借溅杩愯惀鏈嶅姟鎯呭喌鏈堟姤' },
- { value: 'cityTaxiAuth', label: '鍑虹杞﹁繍鏀胯溅杈�' }
+ { value: 'cityTaxiAuth', label: '鍑虹杞﹁繍鏀胯溅杈�' },
+ { value: 'wycTotal', label: '缃戠害杞︽�绘暟' },
+ { value: 'wycOrder', label: '缃戠害杞﹁鍗曞強鍏ㄧ渷鎬婚噺' }
]
},
{
--
Gitblit v1.9.1