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

fix(go): flatten jt808 additional fields

Browse Source
This commit is contained in:
lingniu
2026-07-02 16:23:03 +08:00
parent 5b2e1abcdd
commit d0289b1b48
4 changed files with 170 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
go/vehicle-gateway/internal/realtime/repository.go
View File

@@ -61,7 +61,7 @@ func (r *Repository) Update(ctx context.Context, env envelope.FrameEnvelope) err
protocolSnapshot.VIN = vin
}
mergeFields(&protocolSnapshot, env.Fields, eventMS)
protocolSnapshot.Parsed = mergeParsed(protocolSnapshot.Parsed, env.Parsed)
protocolSnapshot.Parsed = mergeParsedForProtocol(env.Protocol, protocolSnapshot.Parsed, env.Parsed)
if eventMS >= protocolSnapshot.EventTimeMS {
protocolSnapshot.EventTimeMS = eventMS
protocolSnapshot.EventID = env.StableEventID()
@@ -290,6 +290,27 @@ func mergeParsed(existing map[string]any, incoming map[string]any) map[string]an
return out
}
func mergeParsedForProtocol(protocol envelope.Protocol, existing map[string]any, incoming map[string]any) map[string]any {
out := mergeParsed(existing, incoming)
for _, key := range replaceParsedKeys(protocol, incoming) {
out[key] = cloneAny(incoming[key])
}
return out
}
func replaceParsedKeys(protocol envelope.Protocol, incoming map[string]any) []string {
keys := make([]string, 0, 2)
if _, ok := incoming["header"]; ok {
keys = append(keys, "header")
}
if protocol == envelope.ProtocolJT808 {
if _, ok := incoming["location"]; ok {
keys = append(keys, "location")
}
}
return keys
}
func mergeAny(existing any, incoming any) any {
switch incomingTyped := incoming.(type) {
case map[string]any: