From 20e2781f355629bd44565e2ad3b5e3c4d880fa91 Mon Sep 17 00:00:00 2001 From: lingniu Date: Sat, 4 Jul 2026 00:42:40 +0800 Subject: [PATCH] feat(platform): use vehicle keyword for data queries --- .../apps/api/internal/platform/handler.go | 3 +- .../api/internal/platform/handler_test.go | 52 ++++++++++++++++--- .../apps/api/internal/platform/service.go | 12 ++++- .../apps/web/src/pages/History.tsx | 18 +++---- .../apps/web/src/pages/Mileage.tsx | 12 ++--- .../apps/web/src/pages/Realtime.tsx | 4 +- 6 files changed, 74 insertions(+), 27 deletions(-) diff --git a/vehicle-data-platform/apps/api/internal/platform/handler.go b/vehicle-data-platform/apps/api/internal/platform/handler.go index 6e2697b1..7966a0f9 100644 --- a/vehicle-data-platform/apps/api/internal/platform/handler.go +++ b/vehicle-data-platform/apps/api/internal/platform/handler.go @@ -86,7 +86,8 @@ func (h *Handler) handleRawFramesGet(w http.ResponseWriter, r *http.Request) { q := r.URL.Query() query := RawFrameQuery{ Protocol: q.Get("protocol"), - VIN: q.Get("vin"), + VIN: firstNonEmpty(q.Get("vin"), q.Get("keyword")), + Keyword: q.Get("keyword"), DateFrom: q.Get("dateFrom"), DateTo: q.Get("dateTo"), Fields: splitCSV(q.Get("fields")), diff --git a/vehicle-data-platform/apps/api/internal/platform/handler_test.go b/vehicle-data-platform/apps/api/internal/platform/handler_test.go index fdcaeb50..99b5a07b 100644 --- a/vehicle-data-platform/apps/api/internal/platform/handler_test.go +++ b/vehicle-data-platform/apps/api/internal/platform/handler_test.go @@ -145,6 +145,27 @@ func TestHandlerVehicleRealtime(t *testing.T) { } } +func TestHandlerVehicleRealtimeAcceptsKeyword(t *testing.T) { + handler := NewHandler(NewService(NewMockStore())) + rec := httptest.NewRecorder() + req := httptest.NewRequest(http.MethodGet, "/api/realtime/vehicles?keyword=川AHTWO1&limit=10", nil) + handler.ServeHTTP(rec, req) + if rec.Code != http.StatusOK { + t.Fatalf("status = %d body=%s", rec.Code, rec.Body.String()) + } + var body struct { + Data struct { + Items []VehicleRealtimeRow `json:"items"` + } `json:"data"` + } + if err := json.Unmarshal(rec.Body.Bytes(), &body); err != nil { + t.Fatalf("response JSON should decode: %v body=%s", err, rec.Body.String()) + } + if len(body.Data.Items) != 1 || body.Data.Items[0].VIN != "LNXNEGRR7SR318212" { + t.Fatalf("realtime vehicles should accept vehicle keyword, got %+v body=%s", body.Data.Items, rec.Body.String()) + } +} + func TestHandlerHistoryMileageQualityOps(t *testing.T) { cases := []struct { path string @@ -177,12 +198,16 @@ func TestHandlerHistoryMileageQualityOps(t *testing.T) { func TestHandlerVehicleDataAPIsResolveVehicleKeyword(t *testing.T) { handler := NewHandler(NewService(NewMockStore())) cases := []struct { - name string - path string + name string + path string + wantVIN string }{ - {name: "history locations", path: "/api/history/locations?vin=粤AG18312&limit=10"}, - {name: "raw frames", path: "/api/history/raw-frames?vin=粤AG18312&limit=1"}, - {name: "daily mileage", path: "/api/mileage/daily?vin=粤AG18312&limit=10"}, + {name: "history locations vin alias", path: "/api/history/locations?vin=粤AG18312&limit=10", wantVIN: "LB9A32A24R0LS1426"}, + {name: "raw frames vin alias", path: "/api/history/raw-frames?vin=粤AG18312&limit=1", wantVIN: "LB9A32A24R0LS1426"}, + {name: "daily mileage vin alias", path: "/api/mileage/daily?vin=粤AG18312&limit=10", wantVIN: "LB9A32A24R0LS1426"}, + {name: "history locations keyword", path: "/api/history/locations?keyword=川AHTWO1&limit=10", wantVIN: "LNXNEGRR7SR318212"}, + {name: "raw frames keyword", path: "/api/history/raw-frames?keyword=川AHTWO1&limit=1", wantVIN: "LNXNEGRR7SR318212"}, + {name: "daily mileage keyword", path: "/api/mileage/daily?keyword=川AHTWO1&limit=10", wantVIN: "LNXNEGRR7SR318212"}, } for _, tc := range cases { t.Run(tc.name, func(t *testing.T) { @@ -192,8 +217,21 @@ func TestHandlerVehicleDataAPIsResolveVehicleKeyword(t *testing.T) { if rec.Code != http.StatusOK { t.Fatalf("status = %d body=%s", rec.Code, rec.Body.String()) } - if !strings.Contains(rec.Body.String(), `"vin":"LB9A32A24R0LS1426"`) { - t.Fatalf("vehicle data API should resolve plate keyword to VIN: %s", rec.Body.String()) + var body struct { + Data struct { + Items []struct { + VIN string `json:"vin"` + } `json:"items"` + } `json:"data"` + } + if err := json.Unmarshal(rec.Body.Bytes(), &body); err != nil { + t.Fatalf("response JSON should decode: %v body=%s", err, rec.Body.String()) + } + if len(body.Data.Items) == 0 { + t.Fatalf("vehicle data API should return rows for resolved keyword: %s", rec.Body.String()) + } + if body.Data.Items[0].VIN != tc.wantVIN { + t.Fatalf("vehicle data API should resolve keyword to VIN %s, got %s body=%s", tc.wantVIN, body.Data.Items[0].VIN, rec.Body.String()) } }) } diff --git a/vehicle-data-platform/apps/api/internal/platform/service.go b/vehicle-data-platform/apps/api/internal/platform/service.go index 41760217..d5dc168c 100644 --- a/vehicle-data-platform/apps/api/internal/platform/service.go +++ b/vehicle-data-platform/apps/api/internal/platform/service.go @@ -26,6 +26,7 @@ type Store interface { type RawFrameQuery struct { Protocol string `json:"protocol"` VIN string `json:"vin"` + Keyword string `json:"keyword"` DateFrom string `json:"dateFrom"` DateTo string `json:"dateTo"` Fields []string `json:"fields"` @@ -55,7 +56,11 @@ func (s *Service) VehicleCoverage(ctx context.Context, query url.Values) (Page[V } func (s *Service) VehicleRealtime(ctx context.Context, query url.Values) (Page[VehicleRealtimeRow], error) { - return s.store.VehicleRealtime(ctx, query) + resolvedQuery, err := s.resolveVehicleQuery(ctx, query) + if err != nil { + return Page[VehicleRealtimeRow]{}, err + } + return s.store.VehicleRealtime(ctx, resolvedQuery) } func (s *Service) VehicleDetail(ctx context.Context, vin string, protocol string) (VehicleDetail, error) { @@ -239,6 +244,9 @@ func (s *Service) RawFrames(ctx context.Context, query RawFrameQuery) (Page[RawF if query.Limit <= 0 || query.Limit > 500 { query.Limit = 100 } + if strings.TrimSpace(query.VIN) == "" { + query.VIN = query.Keyword + } resolvedVIN, err := s.resolveVehicleVIN(ctx, query.VIN, query.Protocol) if err != nil { return Page[RawFrameRow]{}, err @@ -279,7 +287,7 @@ func (s *Service) OpsHealth(ctx context.Context) (OpsHealth, error) { func (s *Service) resolveVehicleQuery(ctx context.Context, query url.Values) (url.Values, error) { resolved := cloneValues(query) - vin := strings.TrimSpace(resolved.Get("vin")) + vin := firstNonEmpty(resolved.Get("vin"), resolved.Get("keyword")) if vin == "" { return resolved, nil } diff --git a/vehicle-data-platform/apps/web/src/pages/History.tsx b/vehicle-data-platform/apps/web/src/pages/History.tsx index 575c541c..e93933b7 100644 --- a/vehicle-data-platform/apps/web/src/pages/History.tsx +++ b/vehicle-data-platform/apps/web/src/pages/History.tsx @@ -6,7 +6,7 @@ import type { HistoryLocationRow, Page, RawFrameRow } from '../api/types'; import { PageHeader } from '../components/PageHeader'; type HistoryFilters = { - vin?: string; + keyword?: string; protocol?: string; dateFrom?: string; dateTo?: string; @@ -15,7 +15,7 @@ type HistoryFilters = { }; const defaultFilters: HistoryFilters = { - vin: 'LB9A32A24R0LS1426', + keyword: 'LB9A32A24R0LS1426', includeFields: false }; @@ -27,7 +27,7 @@ function canOpenVehicle(vin?: string) { } export function History({ initialVin, onOpenVehicle }: { initialVin: string; onOpenVehicle: (vin: string) => void }) { - const [filters, setFilters] = useState({ ...defaultFilters, vin: initialVin || defaultFilters.vin }); + const [filters, setFilters] = useState({ ...defaultFilters, keyword: initialVin || defaultFilters.keyword }); const [locations, setLocations] = useState>(defaultPage); const [rawFrames, setRawFrames] = useState>(defaultPage); const [selectedRaw, setSelectedRaw] = useState(null); @@ -38,7 +38,7 @@ export function History({ initialVin, onOpenVehicle }: { initialVin: string; onO const buildParams = (nextFilters: HistoryFilters, limit: number, offset: number, raw: boolean) => { const params = new URLSearchParams({ limit: String(limit), offset: String(offset) }); - if (nextFilters.vin?.trim()) params.set('vin', nextFilters.vin.trim()); + if (nextFilters.keyword?.trim()) params.set('keyword', nextFilters.keyword.trim()); if (nextFilters.protocol?.trim()) params.set('protocol', nextFilters.protocol.trim()); if (nextFilters.dateFrom?.trim()) params.set('dateFrom', nextFilters.dateFrom.trim()); if (nextFilters.dateTo?.trim()) params.set('dateTo', nextFilters.dateTo.trim()); @@ -71,7 +71,7 @@ export function History({ initialVin, onOpenVehicle }: { initialVin: string; onO const submit = (values: Record) => { const nextFilters: HistoryFilters = { - vin: String(values.vin ?? ''), + keyword: String(values.keyword ?? ''), protocol: String(values.protocol ?? ''), dateFrom: String(values.dateFrom ?? ''), dateTo: String(values.dateTo ?? ''), @@ -84,14 +84,14 @@ export function History({ initialVin, onOpenVehicle }: { initialVin: string; onO }; const reset = () => { - const nextFilters = { ...defaultFilters, vin: initialVin || defaultFilters.vin }; + const nextFilters = { ...defaultFilters, keyword: initialVin || defaultFilters.keyword }; setFilters(nextFilters); loadLocations(nextFilters, 1, locationPagination.pageSize); loadRawFrames(nextFilters, 1, rawPagination.pageSize); }; useEffect(() => { - const nextFilters = { ...defaultFilters, vin: initialVin || defaultFilters.vin }; + const nextFilters = { ...defaultFilters, keyword: initialVin || defaultFilters.keyword }; setFilters(nextFilters); loadLocations(nextFilters, 1, locationPagination.pageSize); loadRawFrames(nextFilters, 1, rawPagination.pageSize); @@ -103,8 +103,8 @@ export function History({ initialVin, onOpenVehicle }: { initialVin: string; onO
-
submit(values)}> - + submit(values)}> + GB32960 JT808 diff --git a/vehicle-data-platform/apps/web/src/pages/Mileage.tsx b/vehicle-data-platform/apps/web/src/pages/Mileage.tsx index 1f7a1552..4f41c11d 100644 --- a/vehicle-data-platform/apps/web/src/pages/Mileage.tsx +++ b/vehicle-data-platform/apps/web/src/pages/Mileage.tsx @@ -16,7 +16,7 @@ function mileageParams(values: Record, pageSize?: number, offset const params = new URLSearchParams(); if (pageSize != null) params.set('limit', String(pageSize)); if (offset != null) params.set('offset', String(offset)); - if (values?.vin) params.set('vin', values.vin); + if (values?.keyword) params.set('keyword', values.keyword); if (values?.protocol) params.set('protocol', values.protocol); if (values?.dateFrom) params.set('dateFrom', values.dateFrom); if (values?.dateTo) params.set('dateTo', values.dateTo); @@ -37,7 +37,7 @@ export function Mileage({ initialVin, onOpenVehicle }: { initialVin: string; onO const [summary, setSummary] = useState(emptySummary); const [loading, setLoading] = useState(true); const [summaryLoading, setSummaryLoading] = useState(true); - const [filters, setFilters] = useState>({ vin: initialVin }); + const [filters, setFilters] = useState>({ keyword: initialVin }); const [pagination, setPagination] = useState({ currentPage: 1, pageSize: 20, total: 0 }); const loadSummary = (values: Record = filters) => { @@ -60,7 +60,7 @@ export function Mileage({ initialVin, onOpenVehicle }: { initialVin: string; onO }; useEffect(() => { - const nextFilters = { vin: initialVin }; + const nextFilters = { keyword: initialVin }; setFilters(nextFilters); loadSummary(nextFilters); load(nextFilters, 1, pagination.pageSize); @@ -70,13 +70,13 @@ export function Mileage({ initialVin, onOpenVehicle }: { initialVin: string; onO
- { + { const nextFilters = values as Record; setFilters(nextFilters); loadSummary(nextFilters); load(nextFilters, 1, pagination.pageSize); }}> - + GB32960 JT808 @@ -87,7 +87,7 @@ export function Mileage({ initialVin, onOpenVehicle }: { initialVin: string; onO