mirror of
https://github.com/SyncrowIOT/backend.git
synced 2025-07-10 07:07:21 +00:00
fix: correct procedure names in energy consumption updates
This commit is contained in:
@ -22,21 +22,20 @@ export class PowerClampService {
|
|||||||
})
|
})
|
||||||
.replace('/', '-'); // MM-YYYY
|
.replace('/', '-'); // MM-YYYY
|
||||||
|
|
||||||
await this.executeProcedure('fact_hourly_energy_consumed_procedure', [
|
await this.executeProcedure(
|
||||||
deviceUuid,
|
'fact_hourly_device_energy_consumed_procedure',
|
||||||
dateStr,
|
[deviceUuid, dateStr, hour],
|
||||||
hour,
|
);
|
||||||
]);
|
|
||||||
|
|
||||||
await this.executeProcedure('fact_daily_energy_consumed_procedure', [
|
await this.executeProcedure(
|
||||||
deviceUuid,
|
'fact_daily_device_energy_consumed_procedure',
|
||||||
dateStr,
|
[deviceUuid, dateStr],
|
||||||
]);
|
);
|
||||||
|
|
||||||
await this.executeProcedure('fact_monthly_energy_consumed_procedure', [
|
await this.executeProcedure(
|
||||||
deviceUuid,
|
'fact_monthly_device_energy_consumed_procedure',
|
||||||
monthYear,
|
[deviceUuid, monthYear],
|
||||||
]);
|
);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.error('Failed to insert or update energy data:', err);
|
console.error('Failed to insert or update energy data:', err);
|
||||||
throw err;
|
throw err;
|
||||||
@ -47,15 +46,15 @@ export class PowerClampService {
|
|||||||
procedureFileName: string,
|
procedureFileName: string,
|
||||||
params: (string | number | null)[],
|
params: (string | number | null)[],
|
||||||
): Promise<void> {
|
): Promise<void> {
|
||||||
const query = this.loadQuery(procedureFileName);
|
const query = this.loadQuery(
|
||||||
|
'fact_device_energy_consumed',
|
||||||
|
procedureFileName,
|
||||||
|
);
|
||||||
await this.dataSource.query(query, params);
|
await this.dataSource.query(query, params);
|
||||||
|
console.log(`Procedure ${procedureFileName} executed successfully.`);
|
||||||
}
|
}
|
||||||
|
|
||||||
private loadQuery(fileName: string): string {
|
private loadQuery(folderName: string, fileName: string): string {
|
||||||
return this.sqlLoader.loadQuery(
|
return this.sqlLoader.loadQuery(folderName, fileName, SQL_PROCEDURES_PATH);
|
||||||
'fact_energy_consumed',
|
|
||||||
fileName,
|
|
||||||
SQL_PROCEDURES_PATH,
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user