@ray-js/lamp-schedule-core 1.0.0-beta-4 → 1.0.0

package/lib/conflict/ConflictResolver.js

@@ -128,11 +128,12 @@ function convertToTimeRanges(schedules) {
           const isCrossDay = endMinutes < startMinutes;
 
           // 如果定时状态为关闭，则设置星期，忽略冲突判断
-          const dayOfWeek = schedule.data.status ? daysOfWeek[isCrossDay ? (week + 1) % 7 : week] : null;
+          const dayOfWeek = daysOfWeek[isCrossDay ? (week + 1) % 7 : week];
           return [{
             id: schedule.id,
             type: schedule.type,
             dayOfWeek: dayOfWeek,
+            status: schedule.data.status,
             startMinutes,
             endMinutes,
             originalSchedule: schedule,
@@ -157,17 +158,12 @@ function convertToTimeRanges(schedules) {
           const start = parseTimeToMinutes(startTimeStr);
           const end = parseTimeToMinutes(endTimeStr);
           const isCrossDay = end < start;
-
-          // 如果定时状态为关闭，则设置星期，忽略冲突判断
-          if (!schedule.data.status) {
-            return;
-          }
-
           // 添加当前星期的时间范围
           result.push({
             id: schedule.id,
             type: schedule.type,
             dayOfWeek: day,
+            status: schedule.data.status,
             startMinutes: start,
             endMinutes: end,
             originalSchedule: schedule,
@@ -186,6 +182,7 @@ function convertToTimeRanges(schedules) {
               id: schedule.id,
               type: schedule.type,
               dayOfWeek: nextDay,
+              status: schedule.data.status,
               startMinutes: 0,
               // 从午夜开始
               endMinutes: end,
@@ -263,11 +260,11 @@ export function checkConflicts(scheduleList, currentSchedule) {
         const currentPreId = current === null || current === void 0 || (_current$originalSche = current.originalSchedule) === null || _current$originalSche === void 0 ? void 0 : _current$originalSche.prevId;
         const currentId = current === null || current === void 0 || (_current$originalSche2 = current.originalSchedule) === null || _current$originalSche2 === void 0 ? void 0 : _current$originalSche2.id;
         const otherId = other.id;
-        // 如果当前定时自身修改 且 与自身冲突 则忽略
-        if (currentPreId && currentId === otherId || otherId === currentPreId) {
+        // 如果当前定时自身修改 且 与自身冲突 并且其他定时不等于当前定时id 则忽略
+        if (currentPreId && currentId === currentPreId && otherId !== currentId) {
           return;
         }
-        if (current.dayOfWeek && current.dayOfWeek === other.dayOfWeek && rule.isConflict(current, other)) {
+        if (current.dayOfWeek && current.status && other.status && current.dayOfWeek === other.dayOfWeek && rule.isConflict(current, other)) {
           conflicts.push({
             current: current.originalSchedule,
             other: other.originalSchedule

package/lib/conflict/__test__/transform.test.js

@@ -43,16 +43,14 @@ describe('transform', () => {
         aliasName: 'aliasName',
         isAppPush: false
       });
-      expect(result).toEqual({
-        id: `${EScheduleFunctionType.TIMER}_10:00_1000000`,
-        type: EScheduleFunctionType.TIMER,
-        data: {
-          status: true,
-          weeks: [1, 0, 0, 0, 0, 0, 0],
-          startTime: '10:00',
-          endTime: '10:00'
-        }
+      expect(result.type).toBe(EScheduleFunctionType.TIMER);
+      expect(result.data).toEqual({
+        status: true,
+        weeks: [1, 0, 0, 0, 0, 0, 0],
+        startTime: '10:00',
+        endTime: '10:00'
       });
+      expect(result.id).toMatch(/^timer_/);
     });
     it('应该处理缺少状态的定时数据', () => {
       const result = timerDataToSchedule({
@@ -86,8 +84,10 @@ describe('transform', () => {
         isAppPush: false
       }]);
       expect(result.length).toBe(2);
-      expect(result[0].id).toBe(`${EScheduleFunctionType.TIMER}_10:00_1000000`);
-      expect(result[1].id).toBe(`${EScheduleFunctionType.TIMER}_12:00_0100000`);
+      expect(result[0].type).toBe(EScheduleFunctionType.TIMER);
+      expect(result[1].type).toBe(EScheduleFunctionType.TIMER);
+      expect(result[0].id).toMatch(/^timer_/);
+      expect(result[1].id).toMatch(/^timer_/);
     });
   });
   describe('wakeUpNodeToSchedule', () => {
@@ -106,16 +106,14 @@ describe('transform', () => {
         temperature: 1000,
         index: 1
       });
-      expect(result).toEqual({
-        id: `${EScheduleFunctionType.WAKEUP}_08_30_1000000`,
-        type: EScheduleFunctionType.WAKEUP,
-        data: {
-          status: true,
-          weeks: [1, 0, 0, 0, 0, 0, 0],
-          startTime: '8:20',
-          endTime: '8:45'
-        }
+      expect(result.type).toBe(EScheduleFunctionType.WAKEUP);
+      expect(result.data).toEqual({
+        status: true,
+        weeks: [1, 0, 0, 0, 0, 0, 0],
+        startTime: '8:20',
+        endTime: '8:45'
       });
+      expect(result.id).toMatch(/^wakeup_/);
     });
   });
   describe('wakeUpDataToScheduleList', () => {
@@ -148,8 +146,10 @@ describe('transform', () => {
         index: 2
       }]);
       expect(result.length).toBe(2);
-      expect(result[0].id).toBe(`${EScheduleFunctionType.WAKEUP}_08_30_1000000`);
-      expect(result[1].id).toBe(`${EScheduleFunctionType.WAKEUP}_09_00_0100000`);
+      expect(result[0].type).toBe(EScheduleFunctionType.WAKEUP);
+      expect(result[1].type).toBe(EScheduleFunctionType.WAKEUP);
+      expect(result[0].id).toMatch(/^wakeup_/);
+      expect(result[1].id).toMatch(/^wakeup_/);
     });
   });
   describe('sleepNodeToSchedule', () => {
@@ -168,16 +168,14 @@ describe('transform', () => {
         temperature: 1000,
         index: 2
       });
-      expect(result).toEqual({
-        id: `${EScheduleFunctionType.SLEEP}_22_20_1000000`,
-        type: EScheduleFunctionType.SLEEP,
-        data: {
-          status: true,
-          weeks: [1, 0, 0, 0, 0, 0, 0],
-          startTime: '22:10',
-          endTime: '22:30'
-        }
+      expect(result.type).toBe(EScheduleFunctionType.SLEEP);
+      expect(result.data).toEqual({
+        status: true,
+        weeks: [1, 0, 0, 0, 0, 0, 0],
+        startTime: '22:10',
+        endTime: '22:30'
       });
+      expect(result.id).toMatch(/^sleep_/);
     });
   });
   describe('sleepDataToScheduleList', () => {
@@ -210,8 +208,10 @@ describe('transform', () => {
         index: 2
       }]);
       expect(result.length).toBe(2);
-      expect(result[0].id).toBe(`${EScheduleFunctionType.SLEEP}_22_20_1000000`);
-      expect(result[1].id).toBe(`${EScheduleFunctionType.SLEEP}_23_20_0100000`);
+      expect(result[0].type).toBe(EScheduleFunctionType.SLEEP);
+      expect(result[1].type).toBe(EScheduleFunctionType.SLEEP);
+      expect(result[0].id).toMatch(/^sleep_/);
+      expect(result[1].id).toMatch(/^sleep_/);
     });
   });
   describe('countdownToSchedule', () => {
@@ -278,16 +278,14 @@ describe('transform', () => {
           temperature: 1000
         }
       });
-      expect(result).toEqual({
-        id: `${EScheduleFunctionType.RANDOM}_600_720_1000000`,
-        type: EScheduleFunctionType.RANDOM,
-        data: {
-          status: true,
-          weeks: [1, 0, 0, 0, 0, 0, 0],
-          startTime: '10:00',
-          endTime: '12:00'
-        }
+      expect(result.type).toBe(EScheduleFunctionType.RANDOM);
+      expect(result.data).toEqual({
+        status: true,
+        weeks: [1, 0, 0, 0, 0, 0, 0],
+        startTime: '10:00',
+        endTime: '12:00'
       });
+      expect(result.id).toMatch(/^random_/);
     });
   });
   describe('randomDataToScheduleList', () => {
@@ -326,8 +324,10 @@ describe('transform', () => {
         }
       }]);
       expect(result.length).toBe(2);
-      expect(result[0].id).toBe(`${EScheduleFunctionType.RANDOM}_600_720_1000000`);
-      expect(result[1].id).toBe(`${EScheduleFunctionType.RANDOM}_780_840_0100000`);
+      expect(result[0].type).toBe(EScheduleFunctionType.RANDOM);
+      expect(result[1].type).toBe(EScheduleFunctionType.RANDOM);
+      expect(result[0].id).toMatch(/^random_/);
+      expect(result[1].id).toMatch(/^random_/);
     });
   });
   describe('cycleNodeToSchedule', () => {
@@ -351,16 +351,14 @@ describe('transform', () => {
           temperature: 1000
         }
       });
-      expect(result).toEqual({
-        id: `${EScheduleFunctionType.CYCLE}_600_720_1000000`,
-        type: EScheduleFunctionType.CYCLE,
-        data: {
-          status: true,
-          weeks: [1, 0, 0, 0, 0, 0, 0],
-          startTime: '10:00',
-          endTime: '12:00'
-        }
+      expect(result.type).toBe(EScheduleFunctionType.CYCLE);
+      expect(result.data).toEqual({
+        status: true,
+        weeks: [1, 0, 0, 0, 0, 0, 0],
+        startTime: '10:00',
+        endTime: '12:00'
       });
+      expect(result.id).toMatch(/^cycle_/);
     });
   });
   describe('cycleDataToScheduleList', () => {
@@ -403,8 +401,10 @@ describe('transform', () => {
         }
       }]);
       expect(result.length).toBe(2);
-      expect(result[0].id).toBe(`${EScheduleFunctionType.CYCLE}_600_720_1000000`);
-      expect(result[1].id).toBe(`${EScheduleFunctionType.CYCLE}_780_840_0100000`);
+      expect(result[0].type).toBe(EScheduleFunctionType.CYCLE);
+      expect(result[1].type).toBe(EScheduleFunctionType.CYCLE);
+      expect(result[0].id).toMatch(/^cycle_/);
+      expect(result[1].id).toMatch(/^cycle_/);
     });
   });
   describe('transScheduleListToConflictList', () => {

package/lib/conflict/transform.js

@@ -2,6 +2,7 @@ import "core-js/modules/esnext.iterator.constructor.js";
 import "core-js/modules/esnext.iterator.for-each.js";
 import "core-js/modules/esnext.iterator.map.js";
 import dayjs from 'dayjs';
+import { objectToId } from '../utils/objectToId';
 import { getBackwardOffsetTimeByHourMins, getPreOffsetTimeByHourMins, getTimerStrByMinutes } from '../utils/time';
 import { EScheduleFunctionType } from '../types';
 import { scheduleLogger } from '../utils/ScheduleLogger';
@@ -18,15 +19,16 @@ const numAddZero = num => {
 export const timerDataToSchedule = data => {
   var _data$status;
   scheduleLogger.debug('timerDataToSchedule:', data);
+  const _data = {
+    status: (_data$status = data.status) !== null && _data$status !== void 0 ? _data$status : false,
+    weeks: data.loops.split('').map(item => Number(item)),
+    startTime: data.time,
+    endTime: data.time
+  };
   return {
-    id: `${EScheduleFunctionType.TIMER}_${data.time}_${data.loops}`,
+    id: objectToId(_data, `${EScheduleFunctionType.TIMER}_`),
     type: EScheduleFunctionType.TIMER,
-    data: {
-      status: (_data$status = data.status) !== null && _data$status !== void 0 ? _data$status : false,
-      weeks: data.loops.split('').map(item => Number(item)),
-      startTime: data.time,
-      endTime: data.time
-    }
+    data: _data
   };
 };
 
@@ -51,15 +53,16 @@ export const wakeUpNodeToSchedule = data => {
   const startTime = getPreOffsetTimeByHourMins(data.hour, data.minute, data.step * 5 || 0);
   const endTime = getBackwardOffsetTimeByHourMins(data.hour, data.minute, data.duration * 5);
   scheduleLogger.debug('wakeUpNodeToSchedule:', data);
+  const _data = {
+    status: data.onOff,
+    weeks: data.loops.split('').map(item => Number(item)),
+    startTime,
+    endTime
+  };
   return {
-    id: `${EScheduleFunctionType.WAKEUP}_${numAddZero(data.hour)}_${numAddZero(data.minute)}_${data.loops}`,
+    id: objectToId(_data, `${EScheduleFunctionType.WAKEUP}_`),
     type: EScheduleFunctionType.WAKEUP,
-    data: {
-      status: data.onOff,
-      weeks: data.loops.split('').map(item => Number(item)),
-      startTime,
-      endTime
-    }
+    data: _data
   };
 };
 
@@ -83,15 +86,16 @@ export const wakeUpDataToScheduleList = data => {
 export const sleepNodeToSchedule = data => {
   const startTime = getPreOffsetTimeByHourMins(data.hour, data.minute, data.step * 5);
   scheduleLogger.debug('sleepNodeToSchedule:', data);
+  const _data = {
+    status: data.onOff,
+    weeks: data.loops.split('').map(item => Number(item)),
+    startTime,
+    endTime: data.time
+  };
   return {
-    id: `${EScheduleFunctionType.SLEEP}_${numAddZero(data.hour)}_${numAddZero(data.minute)}_${data.loops}`,
+    id: objectToId(_data, `${EScheduleFunctionType.SLEEP}_`),
     type: EScheduleFunctionType.SLEEP,
-    data: {
-      status: data.onOff,
-      weeks: data.loops.split('').map(item => Number(item)),
-      startTime,
-      endTime: data.time
-    }
+    data: _data
   };
 };
 
@@ -155,15 +159,16 @@ export const randomNodeToSchedule = data => {
   } = data;
   const startTimeStr = getTimerStrByMinutes(startTime);
   const endTimeStr = getTimerStrByMinutes(endTime);
+  const _data = {
+    status: data.onOff,
+    weeks: data.loops.split('').map(item => Number(item)),
+    startTime: startTimeStr,
+    endTime: endTimeStr
+  };
   return {
-    id: `${EScheduleFunctionType.RANDOM}_${data.startTime}_${data.endTime}_${data.loops}`,
+    id: objectToId(_data, `${EScheduleFunctionType.RANDOM}_`),
     type: EScheduleFunctionType.RANDOM,
-    data: {
-      status: data.onOff,
-      weeks: data.loops.split('').map(item => Number(item)),
-      startTime: startTimeStr,
-      endTime: endTimeStr
-    }
+    data: _data
   };
 };
 
@@ -191,15 +196,16 @@ export const cycleNodeToSchedule = data => {
   } = data;
   const startTimeStr = getTimerStrByMinutes(startTime);
   const endTimeStr = getTimerStrByMinutes(endTime);
+  const _data = {
+    status: data.onOff,
+    weeks: data.loops.split('').map(item => Number(item)),
+    startTime: startTimeStr,
+    endTime: endTimeStr
+  };
   return {
-    id: `${EScheduleFunctionType.CYCLE}_${data.startTime}_${data.endTime}_${data.loops}`,
+    id: objectToId(_data, `${EScheduleFunctionType.CYCLE}_`),
     type: EScheduleFunctionType.CYCLE,
-    data: {
-      status: data.onOff,
-      weeks: data.loops.split('').map(item => Number(item)),
-      startTime: startTimeStr,
-      endTime: endTimeStr
-    }
+    data: _data
   };
 };
 

package/lib/conflict/type.d.ts

@@ -35,6 +35,7 @@ export interface ConflictResult {
 export interface UnifiedTimeRange {
     id: string;
     type: EScheduleFunctionType;
+    status: boolean;
     dayOfWeek: DayOfWeek;
     startMinutes: number;
     endMinutes: number;

package/lib/hooks/__test__/useCountdownDp.test.js

@@ -1,6 +1,6 @@
 import { renderHook, act } from '@testing-library/react-hooks';
 import { useCountdownDp, useCountdownDpPull } from '../useCountdownDp';
-import { useBaseLightDp, useFetchDpDataByMesh } from '../useBaseLightDp';
+import { useBaseLightDp, useFetchDpData } from '../useBaseLightDp';
 import { scheduleDpCodes } from '../../config/dpCodes';
 // Mock dependencies
 jest.mock('../useBaseLightDp');
@@ -51,7 +51,7 @@ describe('useCountdownDpPull', () => {
   const mockRefresh = jest.fn();
   beforeEach(() => {
     jest.clearAllMocks();
-    useFetchDpDataByMesh.mockReturnValue({
+    useFetchDpData.mockReturnValue({
       refresh: mockRefresh
     });
   });
@@ -72,11 +72,11 @@ describe('useCountdownDpPull', () => {
   });
   it('should use correct dpCode', () => {
     renderHook(() => useCountdownDpPull());
-    expect(useFetchDpDataByMesh).toHaveBeenCalledWith([scheduleDpCodes.COUNTDOWN]);
+    expect(useFetchDpData).toHaveBeenCalledWith([scheduleDpCodes.COUNTDOWN]);
   });
   it('should handle custom dpCode', () => {
     const customDpCode = scheduleDpCodes.COUNTDOWN;
     renderHook(() => useCountdownDpPull(customDpCode));
-    expect(useFetchDpDataByMesh).toHaveBeenCalledWith([customDpCode]);
+    expect(useFetchDpData).toHaveBeenCalledWith([customDpCode]);
   });
 });

package/lib/hooks/__test__/useTimerReportDp.test.js

@@ -1,6 +1,6 @@
 import { renderHook, act } from '@testing-library/react-hooks';
 import { useTimerReportDp, useTimerReportDpPull } from '../useTimerReportDp';
-import { useBaseLightDp, useFetchDpDataByMesh } from '../useBaseLightDp';
+import { useBaseLightDp, useFetchDpData } from '../useBaseLightDp';
 import { useSupport } from '../useCommonSupport';
 import { scheduleDpCodes } from '../../config/dpCodes';
 import { timerReportParser } from '../../dpParser';
@@ -66,7 +66,7 @@ describe('useTimerReportDpPull', () => {
   const mockRefresh = jest.fn();
   beforeEach(() => {
     jest.clearAllMocks();
-    useFetchDpDataByMesh.mockReturnValue({
+    useFetchDpData.mockReturnValue({
       refresh: mockRefresh
     });
   });
@@ -88,6 +88,6 @@ describe('useTimerReportDpPull', () => {
   });
   it('should use correct dpCode', () => {
     renderHook(() => useTimerReportDpPull());
-    expect(useFetchDpDataByMesh).toHaveBeenCalledWith([scheduleDpCodes.TIMER_REPORT]);
+    expect(useFetchDpData).toHaveBeenCalledWith([scheduleDpCodes.TIMER_REPORT]);
   });
 });

package/lib/utils/objectToId.d.ts

@@ -0,0 +1 @@
+export declare const objectToId: (obj: any, prefix?: string) => string;

package/lib/utils/objectToId.js

@@ -0,0 +1,33 @@
+import "core-js/modules/esnext.iterator.constructor.js";
+import "core-js/modules/esnext.iterator.for-each.js";
+import "core-js/modules/esnext.iterator.map.js";
+export const objectToId = function (obj) {
+  let prefix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
+  // 递归排序对象键以确保一致性
+  function sortObjectKeys(obj) {
+    if (obj === null || typeof obj !== 'object') return obj;
+    if (Array.isArray(obj)) {
+      return obj.map(sortObjectKeys);
+    }
+    const sortedKeys = Object.keys(obj).sort();
+    const sortedObj = {};
+    sortedKeys.forEach(key => {
+      sortedObj[key] = sortObjectKeys(obj[key]);
+    });
+    return sortedObj;
+  }
+
+  // 转换为字符串
+  const sortedObj = sortObjectKeys(obj);
+  const str = JSON.stringify(sortedObj);
+
+  // 简单哈希算法
+  let hash = 5381;
+  for (let i = 0; i < str.length; i++) {
+    hash = (hash << 5) + hash + str.charCodeAt(i);
+    hash = hash & hash; // 转换为32位整数
+  }
+
+  // 转换为正数并生成字符串
+  return prefix + Math.abs(hash).toString(36);
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/lamp-schedule-core",
-  "version": "1.0.0-beta-4",
+  "version": "1.0.0",
   "description": "照明计划模块核心能力",
   "main": "./lib/index.js",
   "files": [