From c8fef3e025f6ab28894b9f2846e4657a3ec18aaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B2=D0=BE=D0=B2=20=D0=90=D1=80=D1=82?= =?UTF-8?q?=D0=B5=D0=BC?= Date: Mon, 22 Jun 2026 03:29:36 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20=D0=BB=D0=B8?= =?UTF-8?q?=D1=88=D0=BD=D1=8E=D1=8E=20=D0=BD=D0=BE=D1=80=D0=BC=D0=B0=D0=BB?= =?UTF-8?q?=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/handlers/demo-plc.ts | 6 +++--- app/src/handlers/edge5-modbus-v2.ts | 2 +- app/src/handlers/edge5-modbus.ts | 6 +++--- app/src/mapping.ts | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/src/handlers/demo-plc.ts b/app/src/handlers/demo-plc.ts index 4e7fd06..24bafff 100644 --- a/app/src/handlers/demo-plc.ts +++ b/app/src/handlers/demo-plc.ts @@ -13,12 +13,12 @@ type DemoPlcPayload = { type DemoPlcMetric = { edge: string - timestamp: number + timestamp: string tag: string value: number } -function toMetric(payload: DemoPlcPayload, timestamp: number): DemoPlcMetric { +function toMetric(payload: DemoPlcPayload, timestamp: string): DemoPlcMetric { return { edge: EDGE, timestamp, @@ -42,6 +42,6 @@ export const handleDemoPlc: TopicHandler = async (topic, payload) => { console.log('demo.plc.received', { topic, bytes: payload.length }) const value = parseJson(payload) - const metric = toMetric(value, Date.now()) + const metric = toMetric(value, new Date().toISOString()) await postMetric(metric) } diff --git a/app/src/handlers/edge5-modbus-v2.ts b/app/src/handlers/edge5-modbus-v2.ts index 8c8335e..9c40af3 100644 --- a/app/src/handlers/edge5-modbus-v2.ts +++ b/app/src/handlers/edge5-modbus-v2.ts @@ -54,6 +54,6 @@ export const handleEdge5ModbusV2: TopicHandler = async (topic, payload) => { console.log('edge5.modbus.v2.received', { topic, bytes: payload.length }) const values = parseValues(payload) - const metrics = mapper.mapValues(values, Date.now()) + const metrics = mapper.mapValues(values, new Date().toISOString()) await postMetrics(metrics) } diff --git a/app/src/handlers/edge5-modbus.ts b/app/src/handlers/edge5-modbus.ts index 94abe24..99e3d84 100644 --- a/app/src/handlers/edge5-modbus.ts +++ b/app/src/handlers/edge5-modbus.ts @@ -8,7 +8,7 @@ const REGISTER_COUNT = 125 type Edge5ModbusMetric = { edge: string - timestamp: number + timestamp: string tag: string value: number } @@ -25,7 +25,7 @@ function assertRegisterCount(values: number[]): void { } } -function toMetrics(values: number[], timestamp: number): Edge5ModbusMetric[] { +function toMetrics(values: number[], timestamp: string): Edge5ModbusMetric[] { return values.map((value, index) => ({ edge: EDGE, timestamp, @@ -51,6 +51,6 @@ export const handleEdge5Modbus: TopicHandler = async (topic, payload) => { console.log('edge5.modbus.received', { topic, bytes: payload.length }) const values = parseValues(payload) - const metrics = toMetrics(values, Date.now()) + const metrics = toMetrics(values, new Date().toISOString()) await postMetrics(metrics) } diff --git a/app/src/mapping.ts b/app/src/mapping.ts index cbbb8ca..ad41c87 100644 --- a/app/src/mapping.ts +++ b/app/src/mapping.ts @@ -2,7 +2,7 @@ import { readFileSync } from 'node:fs' export type MappedMetric = { edge: string - timestamp: number + timestamp: string tag: string value: number } @@ -14,7 +14,7 @@ type MappingConfig = { export type MetricMapper = { edge: string - mapValues: (values: number[], timestamp: number) => MappedMetric[] + mapValues: (values: number[], timestamp: string) => MappedMetric[] } type MetricMapperOptions = {