From 71a77e721619e956cab116be691cc3ab58e18093 Mon Sep 17 00:00:00 2001 From: xyc <jc_xiong@hotmail.com> Date: 星期二, 22 九月 2026 15:35:09 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/main' --- docs/工作日结/工作日结_2026-09-22.md | 51 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 49 insertions(+), 2 deletions(-) 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" index 7869518..77011da 100644 --- "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" @@ -70,7 +70,7 @@ - 涓庢墜宸ユ牳绠椾竴鑷达細鍏氦 1-8 鏈� 110776.34 涓囦汉娆°�佽揣杩愪紒涓� 313,998,248 鍚ㄣ�佽揣杩愰噺鍛ㄨ浆閲� 130,311.89 涓囧惃銆� - 鏀跺熬锛氭寜鐢ㄦ埛瑕佹眰鎶娿�屽叏鐪佸悎璁°�嶈鎻愬埌鏈�鍓嶉潰锛堟姹夊競涔嬩笂锛夛紝瀵煎嚭 Excel 涓悎璁¤鍔犵矖銆� -### 5. 姹囨�诲ぇ琛ㄥ鍑虹粨鏋滆惤鐩樼紦瀛橈紙鐢ㄦ埛锛�"涓嬭浇杩囧氨涓嶈鍐嶇瓑寰堜箙锛岃兘涓嶈兘璁颁綇涓婃缁撴灉"锛� +### 9. 姹囨�诲ぇ琛ㄥ鍑虹粨鏋滆惤鐩樼紦瀛橈紙鐢ㄦ埛锛�"涓嬭浇杩囧氨涓嶈鍐嶇瓑寰堜箙锛岃兘涓嶈兘璁颁綇涓婃缁撴灉"锛� - **鑳屾櫙**锛氬師鏉ュ彧鏈夈��10 鍒嗛挓鍐� + 鏈熼棿鏃犳柊瀵煎叆銆嶇殑**鍐呭瓨**缂撳瓨锛岀獥鍙ｇ煭銆侀噸鍚嵆澶辨晥 鈫� 绗簩娆′笅杞借繕瑕佺瓑 13~17 绉掋�� - **鏀瑰姩**锛坄ReportExportTaskService.java` 涓轰富锛夛細 @@ -79,6 +79,32 @@ 3. 鍓嶇鏂囨锛氬懡涓紦瀛樻樉绀恒�屾湰娆＄洿鎺ユ部鐢� <鏃堕棿> 鐢熸垚鐨勭粨鏋滐紙鏈熼棿娌℃湁鏂扮殑鏁版嵁瀵煎叆锛夈�嶏紝鍏冧俊鎭敼涓恒�屼笂娆＄敓鎴愪簬 鈥︺�嶃�� - **椤哄甫淇� bug**锛氳惤鐩樺懡涓椂 `elapsedMs` 涓鸿礋鏁帮紙浠诲姟璧风偣鐢ㄧ幇鍦ㄣ�佺粨鏉熸椂闂存槸鍘嗗彶鐢熸垚鏃堕棿锛夆啋 宸叉敼涓轰互鐢熸垚鏃堕棿浣滆捣鐐广�� - **瀹炴祴**锛氶娆� 12.4 s 鍐欑紦瀛橈紱鍐嶆鎻愪氦 **164 ms** 鍛戒腑鍐呭瓨锛�**閲嶅惎鍚庣鍚庢彁浜� 1.19 s 鍛戒腑钀界洏**锛涗复鏃舵彃涓�鏉″鍏ヨ褰曞悗 `fromCache=false` 閲嶆柊鐢熸垚锛堥獙璇併�屾湁鏂板鍏ュ嵆澶辨晥銆嶏級锛涙祻瑙堝櫒鐐瑰鍑虹鍑恒�佹枃妗堜笌鎸夐挳姝ｇ‘銆佹帶鍒跺彴 0 鎶ラ敊銆� + +### 10. 瀵煎嚭缂撳瓨瀹堝崼鍗囩骇涓恒�屾暟鎹寚绾广��+ 澶辨晥鎻愮ず锛堢敤鎴凤細鎸変綘璇寸殑鍋氾級 + +- **鑳屾櫙**锛氫笂涓�鐗堢紦瀛樺畧鍗敤鍏ㄥ眬 `MAX(import_batch.id)`锛屸憼瀵煎叆鎶曡祫/鑳借�楃瓑鏃犲叧鏁版嵁浼氱櫧澶辨晥锛涒憽**涓嶅惈姣嶇増鏂囦欢**锛屾崲姣嶇増鏃朵細閿欒鍛戒腑鏃х粨鏋滐紙姝ｇ‘鎬ф紡娲烇級銆� +- **鏀瑰姩**锛坄ReportExportTaskService.java`锛夛細 + 1. 鎸囩汗 =銆屼緷璧栨簮琛� `CHECKSUM TABLE` 鏍￠獙鍜岋紙鑳芥崟鎹夊師鍦� UPDATE锛夈��+銆屾瘝鐗堢洰褰曞叏閮ㄦ枃浠� + 缃戠害杞﹁鍗� xlsx 鐨勫悕绉�/澶у皬/淇敼鏃堕棿銆嶏紝SHA-256 鍓� 8 瀛楄妭鍐欒繘缂撳瓨鏂囦欢鍚嶏紱 + 2. 婧愯〃鑼冨洿鐢�**鎺掗櫎娉�**锛氭帓闄ゆ姇璧� 3 / 鑳借�� 2 / 瀹℃牳 4 / 绯荤粺 6 / `import_batch`锛屽叾浣欏叏绾冲叆锛堝畞鍙绠椾笉鍙嚭閿欙級锛� + 3. 澶辨晥鎻愮ず锛堢 3 姝ユ彁绀虹増锛夛細娌″懡涓笖鏈夋棫缁撴灉鏃讹紝杩涘害寮圭獥鏄剧ず銆屼笂娆＄敓鎴愮殑缁撴灉宸插洜鏁版嵁鎴栨瘝鐗堝彉鍖栧け鏁堬紝鏈鎸夋渶鏂版暟鎹噸绠椼�傘�� +- **瀹炴祴**锛氭棤鍏冲鍏ワ紙鎶曡祫椤圭洰 + 瀵煎叆璁板綍鍚勬彃涓�琛岋級**浠嶅懡涓�**缂撳瓨锛涚浉鍏虫簮琛ㄥ師鍦� UPDATE銆佹敼姣嶇増 mtime **蹇呭畾澶辨晥**骞堕噸绠楋紱鍛戒腑缂撳瓨鏃朵笉鍐嶆畫鐣欐彁绀猴紱娴忚鍣ㄥ疄娴嬫彁绀鸿鏄剧ず姝ｅ父銆佹帶鍒跺彴 0 鎶ラ敊锛涙祴璇曟暟鎹凡鍏ㄩ儴杩樺師锛�419 鎵规 / 152 椤圭洰锛夈�� + +### 11. 浜ゆ帴鏀跺熬锛氬悓姝ュ悓浜嬭繘灞� + 鍓╀綑椤规牳鏌ワ紙鐢ㄦ埛鍑嗗寮�鏂颁細璇濓級 + +- **鍚屼簨杩涘睍鏍稿疄**锛堣繎涓夊ぉ xyc / zyj 璐﹀彿鐨勬彁浜わ級锛氭敼鍔�**鍏ㄩ儴闆嗕腑鍦ㄦ眹鎬诲ぇ琛ㄧ嚎**鈥斺�� + `abf468c` 涓彛寰勬帓鍚嶇疮璁″悓姣斿熀鏁版敼鐢ㄦ瘝鐗� 2025 闈欐�佸垪锛堟柟妗� A锛宍ReportExportService.java`锛夈�乣47a8734` 杞欢杈撳嚭涓庢墜宸ュ畾绋垮樊寮傛姤鍛娿�� + `ceaa5f2` AGENTS 鏀瑰叕鍙� gitea 鍗曚粨搴撱�乣a5a9545` 09-22 璁板綍涓� Codex 鍗￠】澶嶆牳銆乣zyj` 鐨� 8 鏈堟瘝鐗� 196 鏍兼枃鏈浆鏁板�� + 宸紓娓呭崟銆� +- **鍓╀綑寰呭姙閫愭潯鏍告煡锛屽悓浜嬪潎鏈Е纰�**锛堟湁璇佹嵁锛夛細 + 1. P0-2銆婁嚎鍏冩姇璧勯」鐩�嬫寜 Q7 杩藉垪 鈥斺�� `ReportExportService.java:6251` 浠嶅啓鍚屼竴鏍硷紙绗� 24 鍒楋級锛屾棤杩藉垪閫昏緫锛� + 2. P0-3 瀵煎嚭鍓嶅熀鏁颁綋妫� +銆婃暟鎹己澶辨竻鍗曘�嬮〉 鈥斺�� `getLastMidIssues()` 鍏ㄤ粨搴撴棤璋冪敤鏂癸紱 + 3. P0-4 缂� 2026-06 / 2026-09 姣嶇増 鈥斺�� 姣嶇増鐩綍鏃犺繖涓や釜鏈堟枃浠讹紱 + 4. P1-7 鎶曡祫璧勯噾娓犻亾鍒嗙粍 鈥斺�� 鏃� `fund_channel` 瀛楁锛� + 5. P1-9 鎶曡祫瀵煎嚭鎸夋湀鍒嗙洰褰� + 杩愯鏃ュ織/鏍￠獙鎶ラ敊 鈥斺�� 鏃犲疄鐜帮紱 + 6. P2-1 D 缁勩�屽閫熸帓鍚嶃�嶆帾杈� 鈥斺�� 鏃犮�屾殏涓嶆帓鍚嶃�嶉�昏緫銆� +- **浜ゆ帴鏂囨。宸插悓姝�**锛坈ommit `06b1cb7`锛夛細搂0 鏈�绱ф�ユ竻鍗� 4鈫�3 浠跺苟鍒楀嚭涓夐」宸查棴鐜紙鍗佸牥婧愭枃浠� / 涓彛寰勫熀鏁板弻杞ㄥ埗 / 瀵煎嚭缂撳瓨锛夛紱 + P1-1 琛ユ彁浜ゅ彿 `abf468c`锛浡�1.3 涓� 搂7.4 浠庛�屽弻浠撳簱銆嶆敼涓�**鍏徃 gitea 鍗曚粨搴�**锛浡�6 绱㈠紩琛ュ悓浜嬩袱浠芥枃妗ｃ�� +- **寰呮牳瀹烇紙鐣欑粰鏂颁細璇濓級**锛歅2-2銆屽煄甯傚杩愰〉琛ㄥご浠嶆槸鏃ユ湡搴忓垪鍙枫�嶅彲鑳藉凡杩囨椂鈥斺�斾唬鐮侀噷鏈� `fixCityMonthHeaderText()`锛�09-03 鍔犲叆锛� + 浼氭妸鍩庡競瀹㈣繍绫昏〃澶村簭鍒楀彿鏀瑰啓鎴愩�孻YYY骞碝鏈堛�嶏紱寤鸿璺戜竴娆� 2026-08 瀵煎嚭鏍稿瀹為檯琛ㄥご鍚庡啀鏇存柊浜ゆ帴鏂囨。銆� ## 浜屻�佹祴璇曠粨鏋滄憳瑕� @@ -89,6 +115,7 @@ - 鎶ュ憡锛歚docs/鍔熻兘娴嬭瘯鎶ュ憡/鍔熻兘娴嬭瘯鎶ュ憡_鏁版嵁鏌ョ湅鎸夊競宸炴眹鎬讳笌瀵煎嚭_2026-09-22.md`锛堟帴鍙� 10 鏉� + 鐪熸満 4 鏉″叏閫氳繃锛� - 鎶ュ憡锛歚docs/鍔熻兘娴嬭瘯鎶ュ憡/鍔熻兘娴嬭瘯鎶ュ憡_姹囨�诲ぇ琛ㄨ繘搴﹀脊绐椾紭鍖朹2026-09-22.md`锛�6 鏉＄敤渚嬮�氳繃锛氱敓鎴愪腑鐘舵�� / 瀹屾垚鎻愮ず / 鍐嶆涓嬭浇璧扮紦瀛� / 鍏抽棴 / 鏃犳帶鍒跺彴鎶ラ敊 / 鍏跺畠瀵煎嚭鏈彈褰卞搷锛� - 鎶ュ憡锛歚docs/鍔熻兘娴嬭瘯鎶ュ憡/鍔熻兘娴嬭瘯鎶ュ憡_姹囨�诲ぇ琛ㄥ鍑虹粨鏋滆惤鐩樼紦瀛樺鐢╛2026-09-22.md`锛�10 鏉＄敤渚嬮�氳繃锛氶娆＄敓鎴愬啓缂撳瓨 / 鍐呭瓨鍛戒腑 164ms / **閲嶅惎鍚庤惤鐩樺懡涓� 1.19s** / 鏈夋柊瀵煎叆鍗冲け鏁� / 鍚� key 鍙暀鏈�鏂扮増鏈� / 鏃堕暱鏄剧ず淇 / 娴忚鍣ㄧ鍒扮锛� +- 鎶ュ憡锛歚docs/鍔熻兘娴嬭瘯鎶ュ憡/鍔熻兘娴嬭瘯鎶ュ憡_瀵煎嚭缂撳瓨鏀圭敤鏁版嵁鎸囩汗_2026-09-22.md`锛�12 鏉＄敤渚嬮�氳繃锛氭棤鍏冲鍏ヤ粛鍛戒腑 / 鐩稿叧婧愯〃鍘熷湴 UPDATE 蹇呭け鏁� / **鎹㈡瘝鐗堝繀澶辨晥** / 澶辨晥鎻愮ず鏄剧ず / 鍛戒腑鏃犳彁绀� / 鏁版嵁杩樺師鏍稿锛� - 鐜锛氬悗绔� `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 绫诲洖褰掓甯搞�� @@ -114,7 +141,27 @@ - 瀹堝崼锛氳皟璇曠鍙� 9229 璇诲彇 `window.__codexPlusRetryTimerGuardInstalled=true`锛屾湰娆′細璇� `window.__codexPlusRetryTimerGuardDropped=16`銆� - 缁撹锛氳緭鍏ュ崱椤夸慨澶嶅湪閲嶅惎鍚庝粛鐢熸晥锛岄棶棰樺凡瑙ｅ喅銆� -## 鍏�佹眹鎬诲ぇ琛ㄨ蒋浠惰緭鍑轰笌鎵嬪伐瀹氱宸紓澶嶆牳锛�2026-08锛� + +## 鍏�佹姇璧勬槑缁嗚〃銆岃蒋浠剁敓鎴� vs 浜哄伐鐗堛�嶆暟鎹瘮瀵癸紙2026-08锛� + +鐢ㄦ埛瑕佹眰锛氭妸杞欢鐢熸垚鐨勩�婂杩愮珯鎶曡祫鏄庣粏琛ㄣ�嬨�婄墿娴佺珯鍦烘姇璧勬槑缁嗐�嬩笌浜哄伐缁存姢鐨勪袱浠藉畾绋块�愭牸姣斿锛屽垪鍑烘墍鏈変笉鍚屻�� + +- **姣斿鏂囦欢**锛氫汉宸ョ増 `D:\05_鏁版嵁鍒嗙被\鎶曡祫\8鏈圽8鏈堝杩愮珯鎶曡祫鏄庣粏琛�.xlsx`銆乣8鏈堢墿娴佺珯鍦烘姇璧勬槑缁�.xls` + vs 杞欢鐗� `D:\妗岄潰\鐢熸垚鏁版嵁\鐢熸垚_鎵�閫夋姤琛╛2026-08 (1)\鐢熸垚_瀹㈣繍绔欐姇璧勬槑缁嗚〃.xlsx`銆乣鐢熸垚_鐗╂祦绔欏満鎶曡祫鏄庣粏.xls`銆� +- **姣斿鏂规硶**锛氳剼鏈�愰〉绛鹃�愭牸姣斿锛坄_tmp_diff_invest_0922.py`锛夛紱鍏堟牳瀵� B 鍒楅」鐩悕閫愯瀵归綈锛�192/121 琛屽叏閮ㄤ竴鑷达紝鏃犻敊浣嶏級锛屽啀缁熻宸紓锛屾渶鍚庡洖婧簮鏂囦欢 / 鏁版嵁搴� / 搴曠妯℃澘瀹氫綅鏍瑰洜銆� +- **缁撴灉**锛氬叡 **156 鏍煎樊寮�** 鈥斺�� 瀹㈣繍銆婃槑缁嗐��12 +銆婃眹鎬汇��4锛涚墿娴併�婂垎椤圭洰鎶曡祫瀹屾垚鎯呭喌銆�108 +銆婂垎甯傚窞瑙勫垝鍐呭銆�15 +銆婂競宸炴眹鎬汇��17锛屻�婃湀2銆嬫棤宸紓銆� +- **鏍瑰洜锛堜笁鏂硅瘉鎹攣瀹氾級**锛� + 1. 杞欢瀵煎嚭 = 鍦ㄥ簳绋裤�婃ā鏉縚X鏈堚�︽姇璧勬槑缁嗐�嬩笂锛屾妸搴撳唴褰撴湀鏁版嵁**鎸夐」鐩悕绉板尮閰�**瑕嗙洊 H/J/K 涓� M锛�**鍖归厤涓嶄笂鎴栧簱鍐呮棤褰撴湀鏁板氨闈欓粯娌跨敤涓婃湡鍊�** 鈥斺�� 姝︽眽甯傜墿娴侊紙搴撳唴 0 鏉℃湀搴﹁褰曪級鏁存淇濈暀 7 鏈堝�硷紱鑽嗗窞銆屼腑鍥戒緵閿�鍏畨鍟嗚锤鐗╂祦鍥�嶏紙搴撳唴鍚嶅涓�涓偣锛屽尮閰嶅け璐ワ級淇濈暀 7 鏈堝�� 7758.5/1600.1锛堝簱鍐�/婧愯〃瀹為檯 15986/8227.5锛夈�� + 2. 搴撳唴**鍚屽悕鍙屾。**锛氬崄鍫般�屽揩閫掔墿娴佷骇涓氬洯浜屾湡銆嶆湁 `id=154`锛堢宸� 2026锛変笌 `id=181`锛堢宸� 2029锛変袱妗ｏ紝瀵煎嚭鍙栧埌鏃ф。锛屽啓浜� 7 鏈堝�� 20081/2900/214锛堝簲 20377/3196/296锛夈�� + 3. **瀵煎叆涓㈡暟**锛氬ぉ闂ㄣ�屽ぉ闂ㄥ競鐗╂祦涓績寤鸿椤圭洰銆嶅簱鍐� 2026-08 鐨勭疮璁�/鑷勾鍒�/鏈湀鍏ㄦ槸 0锛屾簮鏂囦欢鏄� 16677.7/16677.7/500锛圥1-5 鍘熻褰曘�屾簮鏂囦欢 H/J/K 鍒椾负绌恒�嶄笌鐜版枃浠朵笉绗︼級銆� + 4. 瀵煎嚭**涓嶈鐩� L锛堝缓璁鹃樁娈碉級绛夐潪閲戦鍒�** 鈫� 榛勭煶澶у喍婀栧喎閾� L=鏆傚仠銆佸崄鍫版灑绾� L=鍓嶆湡銆佽闃冲喎閾句腑蹇� L=鍦ㄥ缓銆侀殢宸炴皯鐢熺墿璧� M 鐨� 7 鏈堟枃瀛楋紝閮芥槸搴曠娈嬬暀銆� + 5. 鍗曟笭閬撳競宸炵殑**鍒嗙粍灏忚琛�**锛氳蒋浠跺～=甯傚窞鍚堣锛屼汉宸ョ増涓嶅～锛�0 涓庣┖鐧界殑鍐欐硶涓よ竟涓嶅悓锛堜笉褰卞搷閲戦锛夈�� + 6. 瀹㈣繍閮ㄥ垎宸紓涓昏鏄�**浜哄伐鐗堟墜鍐欏洓鑸嶄簲鍏�**锛�203 / 2531 / 43225.9 绛夛級锛屼互鍙� 3 澶勫舰璞¤繘搴�/寤鸿闃舵锛歁26銆丮85 浜哄伐鐗堢┖锛堣蒋浠剁増鍙栬嚜婧愯〃涓庡簱鍐呫�佹槸瀵圭殑锛夛紝L91 浜哄伐鐗堛�屽湪寤恒�嶆纭�佽蒋浠剁増鏄簳绋挎棫鍊笺�屾殏鍋滄柦宸ャ�嶃�� +- **褰卞搷閲戦**锛氳蒋浠剁増鐗╂祦銆岃嚜寮�濮嬬疮璁°�嶃�岃嚜骞村垵绱銆嶅悇灏� **34399.2 涓囧厓**銆併�屾湰鏈堝畬鎴愩�嶅皯 **6291.4 涓囧厓**銆� +- **鎶ュ憡**锛歚docs/鍔熻兘娴嬭瘯鎶ュ憡/鏁版嵁姣斿鎶ュ憡_鎶曡祫鏄庣粏琛ㄨ蒋浠剁敓鎴愪笌浜哄伐鐗坃2026-09-22.md`锛堝惈 156 鏍煎叏閲忔竻鍗� + 閫愭潯鏍稿缁撹 + 澶勭疆寤鸿锛夈�� +- **涓存椂鑴氭湰锛堜繚鐣欙級**锛歚_tmp_diff_invest_0922.py`銆乣_tmp_dump_invest_full_0922.py`銆乣_tmp_diff_invest_annot_0922.py`銆乣_tmp_diff_tables_0922.py`銆乣_tmp_src_spotcheck_0922.py`銆乣_tmp_src_spotcheck2_0922.py`銆乣_tmp_db_probe*_0922.py`銆乣_tmp_tpl_*_0922.py` 鍙婂搴� `_*.txt` 杈撳嚭銆� + +## 涓冦�佹眹鎬诲ぇ琛ㄨ蒋浠惰緭鍑轰笌鎵嬪伐瀹氱宸紓澶嶆牳锛�2026-08锛� - 姣斿鏂囦欢锛氳蒋浠惰緭鍑� `鐢熸垚_閬撹矾杩愯緭閲忔眹鎬昏〃_2026-08 (5).xlsx`锛屾墜宸ュ畾绋� `2026骞�8鏈堝杩愰噺銆佽揣杩愰噺瀹氱.xlsx`銆� - 鏂规硶锛氬厛鐢� Excel COM 瀵逛袱浠藉壇鏈叏閲忛噸绠楋紝鍐嶆寜椤电銆佹暟鎹潡銆佽鏍囩銆佸垪澶村仛璇箟瀵归綈鍚庨�愭牸姣斿锛岄伩鍏嶈鍙� XLSX 鏃х紦瀛橀�犳垚 `#VALUE!` 鍋囧樊寮傘�� -- Gitblit v1.9.1