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(数据查看): 补齐网约车总数/网约车订单/个体客运三类查看（含市州派生）+ 测试报告与日结
---
traffic-audit-server/src/main/java/com/trafficaudit/dataimport/controller/DataViewController.java | 85 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 85 insertions(+), 0 deletions(-)
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
--
Gitblit v1.9.1