shishengliang/lingniu-vehicle-ingest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(mileage): fall through ineffective priority sources

Browse Source
This commit is contained in:
lingniu
2026-07-19 21:28:11 +08:00
parent 5539c5e0c2
commit d0c2bb3316
4 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
vehicle-data-platform/apps/api/internal/platform/mysql_queries.go
View File

@@ -526,7 +526,7 @@ func buildDailyMileageSQL(query url.Values) SQLQuery {
selectionOrder := `m.daily_mileage_km DESC, m.protocol ASC`
dailyMileageExpression := `MAX(COALESCE(m.daily_mileage_km, 0))`
if len(protocols) > 0 {
selectionOrder = mileageProtocolOrder("m.protocol", protocols)
selectionOrder = mileageDailySelectionOrder("m.daily_mileage_km", "m.protocol", protocols)
dailyMileageExpression = `COALESCE(CAST(SUBSTRING_INDEX(GROUP_CONCAT(CAST(COALESCE(m.daily_mileage_km, 0) AS CHAR) ORDER BY ` + selectionOrder + `), ',', 1) AS DECIMAL(18,3)), 0)`
}
groupSQL := fromSQL + ` GROUP BY m.vin, m.stat_date`
@@ -626,7 +626,7 @@ func buildMileageStatisticsBaseSQL(query url.Values) (string, []any) {
dailyMileageExpression := `MAX(COALESCE(m.daily_mileage_km, 0))`
latestMileageExpression := `MAX(COALESCE(m.latest_total_mileage_km, 0))`
if len(protocols) > 0 {
selectionOrder := mileageProtocolOrder("m.protocol", protocols)
selectionOrder := mileageDailySelectionOrder("m.daily_mileage_km", "m.protocol", protocols)
dailyMileageExpression = `COALESCE(CAST(SUBSTRING_INDEX(GROUP_CONCAT(CAST(COALESCE(m.daily_mileage_km, 0) AS CHAR) ORDER BY ` + selectionOrder + `), ',', 1) AS DECIMAL(18,3)), 0)`
latestMileageExpression = `COALESCE(CAST(SUBSTRING_INDEX(GROUP_CONCAT(CAST(COALESCE(m.latest_total_mileage_km, 0) AS CHAR) ORDER BY ` + selectionOrder + `), ',', 1) AS DECIMAL(18,3)), 0)`
}
@@ -729,6 +729,15 @@ func mileageProtocolOrder(column string, protocols []string) string {
return strings.Join(parts, " ") + ", " + column + " ASC"
}
// mileageDailySelectionOrder keeps the configured protocol priority among
// usable daily facts while preventing a zero-increment source from masking a
// positive result reported by another enabled protocol. If every enabled
// protocol reports zero, the configured priority still decides the source.
func mileageDailySelectionOrder(mileageColumn, protocolColumn string, protocols []string) string {
return "CASE WHEN COALESCE(" + mileageColumn + ", 0) > 0 THEN 0 ELSE 1 END, " +
mileageProtocolOrder(protocolColumn, protocols)
}
func appendVINListFilter(where []string, args []any, column string, raw string) ([]string, []any) {
seen := map[string]bool{}
values := make([]string, 0)