diff --git a/src/events/events.service.ts b/src/events/events.service.ts index d064c75..38561f7 100644 --- a/src/events/events.service.ts +++ b/src/events/events.service.ts @@ -7,7 +7,10 @@ import { classToPlain } from 'class-transformer'; export class EventsService { async CompareStatus(parameter: MetricK2) : Promise { let diff = Math.floor(Math.random() * (2)) + 1; - console.log(diff); + // let testStr: string = '2685 ч 44 мин 30 сек'; + // let tstspl: string[] = testStr.split(' '); + // let uptime: number = (+tstspl[0])*3600+(+tstspl[2])*60+(+tstspl[4]); + // console.log(tstspl[0],tstspl[2],tstspl[4],uptime); if(parameter.status != (parameter.status + diff) ){ await this.RecordChangedMetricToClicHouse(parameter.id, parameter.name, parameter.value, parameter, parameter.status, parameter.status + diff); } diff --git a/src/zvksmetrics/zvksmetrics.service.ts b/src/zvksmetrics/zvksmetrics.service.ts index 76c3048..4383222 100644 --- a/src/zvksmetrics/zvksmetrics.service.ts +++ b/src/zvksmetrics/zvksmetrics.service.ts @@ -59,11 +59,14 @@ var prev: K2Metrics; //Prevous K2 @Injectable() export class ZvksmetricsService { async useStatusModel(inputData: any): Promise { + + // inputData = inputData.replace('\\','0'); + let inp: K2Metrics = new K2Metrics(); inp = inputData; let complex: K2Metrics = new K2Metrics(); - complex.service_name = inputData.service_name; + complex.service_name = inp.service_name; complex.metrics = []; let model: ComplexMetricsCalculation[] = []; @@ -84,10 +87,11 @@ export class ZvksmetricsService { let copmplexParameterBody: string = JSON.stringify(ctp); let rtp: any = classToPlain(inp); let rawParameterBody: string = JSON.stringify(rtp); + // rawParameterBody = rawParameterBody.replace('\\', '0'); // console.log(rawParameterBody); - let abc = new ClickhouseService(); - await abc.ClickHouseAddRecords('raw', rawParameterBody); - await abc.ClickHouseAddRecords('complex', copmplexParameterBody); + let recordToDB = new ClickhouseService(); + await recordToDB.ClickHouseAddRecords('raw', rawParameterBody); + await recordToDB.ClickHouseAddRecords('complex', copmplexParameterBody); // const val = JSON.parse(JSON.stringify(model[0].values)); @@ -136,7 +140,14 @@ export class ZvksmetricsService { let compare = new EventsService(); // const jsonData = require('../conf/devices.json'); - // console.log(jsonData); + // console.log(jsonData); + let uptimeElements = inputData.metrics.filter(element=> element.name == 'upTime'); + if(uptimeElements){ + for(let uptime of uptimeElements){ + let uptStr: any = uptime?.value.toString().split(' '); + uptime.value = (+uptStr[0])*3600+(uptStr[2])*60+(+uptStr[4]); + } + } for (let d = 0; d < device_len; d++) { for (let i = 0; i < length; i++) { let metr = { "source": "" };