@ledvance/ui-biz-bundle 1.1.150 → 1.1.151

package/package.json

@@ -4,7 +4,7 @@
   "name": "@ledvance/ui-biz-bundle",
   "pid": [],
   "uiid": "",
-  "version": "1.1.150",
+  "version": "1.1.151",
   "scripts": {},
   "dependencies": {
     "@ledvance/base": "^1.x",

package/src/newModules/energyConsumption/EnergyConsumptionActions.ts

@@ -10,10 +10,11 @@ import {
   getSpecifiedTimeDpReportLogs
 } from '@ledvance/base/src/models/TuyaApi'
 import { exportCsvFile, localeNumber, loopsText, monthFormat, monthFormatShort } from '@ledvance/base/src/utils/common'
-import { overDays } from '@ledvance/base/src/utils'
+import { overDays, xLog } from '@ledvance/base/src/utils'
 import dayjs from 'dayjs'
 import CustomParseFormat from 'dayjs/plugin/customParseFormat'
 import { isEmpty } from 'lodash'
+import { TYSdk } from 'tuya-panel-kit'
 import { DateType } from './co2Data'
 import { EnergyData } from './component/EnergyModal'
 import { OverviewItem } from './EnergyConsumptionPage'
@@ -39,6 +40,11 @@ export async function updatePrice(devId: string, energyData: EnergyData) {
   return await NativeApi.putJson(devId, 'energiepreise', JSON.stringify(energyData))
 }
 
+export async function resetElectricity(devId) {
+  const res = await TYSdk.apiRequest('tuya.m.dp.statistics.reset', {devId}, '1.0')
+  xLog('resetElectricity res', res)
+}
+
 export async function getElectricity(devId: string, addEleDpCode: string, date: string, dateType: DateType): Promise<OverviewItem[]> {
   let res: OverviewItem[] = []
   switch (dateType) {
@@ -175,83 +181,37 @@ function createZeroPaddingPoint(timePoint: dayjs.Dayjs): PowerDataItem {
 }
 
 /**
- * 获取设备功率数据（智能填充，高性能，避免在小间隔内插入0值）
+ * 获取设备功率数据
  * @param devId 设备ID
  * @param powerDpCode 功率数据点编码
  * @param interval 时间区间（分钟）
  * @returns 按时间排序的完整数据
  */
-export async function getPowerData(
-  devId: string,
-  powerDpCode: string,
-  interval: number
-): Promise<PowerDataItem[]> {
-  try {
-    const now = dayjs();
-    const endTime = now;
-    const startTime = now.add(-interval, TIME_UNIT);
-    const endTimeMs = endTime.valueOf();
-    const startTimeMs = startTime.valueOf();
-    const paddingIntervalMs = DATA_POINT_INTERVAL_SEC * 1000;
-    // 1. 请求已排序的实际数据
-    const dpResult = await getSpecifiedTimeDpReportLogs(
-      devId,
-      [powerDpCode],
-      'ASC',
-      startTimeMs.toString(),
-      endTimeMs.toString(),
-      RETRY_CONFIG
-    );
-    const validDpResult = Array.isArray(dpResult) ? (dpResult as DpReportSataData[]) : [];
-    const actualData: PowerDataItem[] = validDpResult
-      .map((dp) => {
-        const timeMs = dp.timeStamp * 1000;
-        if (timeMs < startTimeMs || timeMs > endTimeMs) return null;
-        return {
-          key: dayjs.unix(dp.timeStamp).format('HH:mm:ss'),
-          chartTitle: dayjs.unix(dp.timeStamp).format('MM/DD/YYYY HH:mm:ss'),
-          time: timeMs,
-          value: parseFloat(dp.value) / 10,
-        };
-      })
-      .filter((item): item is PowerDataItem => item !== null);
-    // 如果没有任何真实数据，则生成完整的预设0值数据作为兜底
-    if (actualData.length === 0) {
-      const finalData: PowerDataItem[] = [];
-      let currentTime = startTime;
-      while (currentTime.valueOf() < endTimeMs) {
-        finalData.push(createZeroPaddingPoint(currentTime));
-        currentTime = currentTime.add(DATA_POINT_INTERVAL_SEC, 'second');
-      }
-      return finalData;
+export async function getPowerData(devId: string, powerDpCode: string, interval: number): Promise<PowerDataItem[]> {
+  const now = dayjs()
+  const startTime = now.add(-1 * interval, 'minute').valueOf().toString()
+  const endTime = now.valueOf().toString()
+  const dpResult = await getSpecifiedTimeDpReportLogs(
+    devId,
+    [powerDpCode],
+    'ASC',
+    startTime,
+    endTime,
+    {
+      maxRetries: 5,
+      initialDelay: 1000,
+      maxDelay: 30000,
+      backoffFactor: 2
     }
-    // 2. 高性能线性填充
-    const finalData: PowerDataItem[] = [];
-    let lastTimeMs = startTimeMs; // 游标从查询区间的开始时间算起
-    // 遍历所有真实数据点
-    actualData.forEach((currentPoint) => {
-      // 从上一个点的时间开始，用 while 循环填充，直到下一个真实数据点之前
-      let paddingTimeMs = lastTimeMs + paddingIntervalMs;
-      while (paddingTimeMs < currentPoint.time) {
-        finalData.push(createZeroPaddingPoint(dayjs(paddingTimeMs)));
-        paddingTimeMs += paddingIntervalMs;
-      }
-
-      // 添加当前的真实数据点
-      finalData.push(currentPoint);
-      lastTimeMs = currentPoint.time; // 更新游标
-    });
-    // 3. 填充查询末尾的空白区域（从最后一个真实数据点到查询结束时间）
-    let paddingTimeMs = lastTimeMs + paddingIntervalMs;
-    while (paddingTimeMs < endTimeMs) {
-      finalData.push(createZeroPaddingPoint(dayjs(paddingTimeMs)));
-      paddingTimeMs += paddingIntervalMs;
+  ) as DpReportSataData[]
+  return dpResult.map(dp => {
+    return {
+      key: dp.timeStr,
+      chartTitle: dayjs.unix(dp.timeStamp).format('MM/DD/YYYY HH:mm:ss'),
+      time: dp.timeStamp * 1000,
+      value: parseFloat(dp.value) / 10
     }
-    return finalData;
-  } catch (error) {
-    console.error(`[getPowerData] 失败：devId=${devId}, powerDpCode=${powerDpCode}`, error);
-    return [];
-  }
+  })
 }
 
 export const exportEnergyCsv = (values: any[][], unit: string) => {