From 24b4c282a1e91143d66f1eeed2cabffa654c7c13 Mon Sep 17 00:00:00 2001
From: zhizhijie <zhizhijie@users.noreply.gitee.com>
Date: 星期三, 16 九月 2026 13:41:57 +0800
Subject: [PATCH] feat(h2031): 适配模板新增「统一社会信用代码/填报单位」两列并入库；fix(import): 补录 2023 年货运量周转量；fix(login/report): 验证码容错、预览指标对齐、弹窗可拖动圆角、失败提示细分；docs: 新增问题与注意事项汇总
---
traffic-audit-server/src/main/java/com/trafficaudit/dataimport/controller/DataImportController.java | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/traffic-audit-server/src/main/java/com/trafficaudit/dataimport/controller/DataImportController.java b/traffic-audit-server/src/main/java/com/trafficaudit/dataimport/controller/DataImportController.java
index d8217b5..46d6e61 100644
--- a/traffic-audit-server/src/main/java/com/trafficaudit/dataimport/controller/DataImportController.java
+++ b/traffic-audit-server/src/main/java/com/trafficaudit/dataimport/controller/DataImportController.java
@@ -269,6 +269,24 @@
}
}
+ /** 缃戠害杞﹁鍗曡繍琛岀洃娴嬪垎鏋愭姤鍛婏紙docx锛氥�婄綉绾﹁溅琛屼笟YYYY骞碝鏈堣繍琛岀洃娴嬫儏鍐靛垎鏋愭姤鍛娿�嬶級 */
+ @PostMapping("/wycOrderReport")
+ public Result<String> importWycOrderReport(@RequestParam("file") MultipartFile file,
+ @RequestParam("period") String period) {
+ try {
+ DataImportService.WycOrderReportResult r = importService.importWycOrderReport(file, period);
+ StringBuilder msg = new StringBuilder("缃戠害杞﹁鍗曟姤鍛婂鍏ユ垚鍔燂細鎶ヨ〃鏈� " + r.getPeriod()
+ + "锛岃鍗曞悎璁� " + String.format("%,.0f", r.getOrderSum()) + " 鍗曪紝宸插啓鍏� " + r.getCityCount() + " 涓競宸�");
+ if (!r.getMissingCities().isEmpty()) {
+ msg.append("锛涗互涓嬪競宸炴湭鍦ㄦ姤鍛婁腑瑙ｆ瀽鍒帮紝鏈啓鍏ワ細").append(String.join("銆�", r.getMissingCities()));
+ }
+ return Result.ok(msg.toString());
+ } catch (Exception e) {
+ log.error("wycOrderReport import error", e);
+ return Result.error("瀵煎叆澶辫触: " + e.getMessage());
+ }
+ }
+
/** 鎶曡祫鏈堟姤锛堝叏鐪佹眹鎬诲ぇ琛級锛歝ategory=瀹㈣繍绔欏満/鐗╂祦鍥尯 */
@PostMapping("/investment")
public Result<String> importInvestment(@RequestParam("file") MultipartFile file,
@@ -443,14 +461,25 @@
return Result.ok(result);
}
- /** 娓呯┖鎸囧畾鎶ヨ〃鏈熷叏閮ㄥ凡瀵煎叆鏁版嵁涓庡鏍哥粨鏋滐紙鏁版嵁瀵煎叆椤�"娓呯┖"鎸夐挳璋冪敤锛夛紝渚夸簬鏁存湀閲嶆柊瀵煎叆 */
+ /**
+ * 娓呯┖鎸囧畾鎶ヨ〃鏈熷凡瀵煎叆鏁版嵁涓庡鏍哥粨鏋滐紙鏁版嵁瀵煎叆椤�"娓呯┖鏁版嵁"鍏ュ彛璋冪敤锛夛紝渚夸簬鏁存湀閲嶆柊瀵煎叆銆�
+ * types 涓虹┖琛ㄧず娓呯┖璇ユ姤琛ㄦ湡鍏ㄩ儴绫诲瀷锛涘惁鍒欏彧娓呯┖鎸囧畾鏁版嵁绫诲瀷锛堥�楀彿鍒嗛殧锛屽 h2032,cityBus锛夈��
+ */
@PostMapping("/clear")
- public Result<Map<String, Object>> clearData(@RequestParam("period") String period) {
+ public Result<Map<String, Object>> clearData(@RequestParam("period") String period,
+ @RequestParam(value = "types", required = false) String types) {
try {
- Map<String, Object> stats = importService.clearPeriod(period);
+ List<String> typeList = new java.util.ArrayList<>();
+ if (types != null) {
+ for (String t : types.split(",")) {
+ String s = t.trim();
+ if (!s.isEmpty()) typeList.add(s);
+ }
+ }
+ Map<String, Object> stats = importService.clearPeriod(period, typeList);
return Result.ok(stats);
} catch (Exception e) {
- log.error("clear period {} error", period, e);
+ log.error("clear period {} types {} error", period, types, e);
return Result.error("娓呯┖澶辫触: " + e.getMessage());
}
}
--
Gitblit v1.9.1