@ray-js/lamp-schedule-core 1.0.0-beta-5 → 1.0.1-beta-1

package/lib/conflict/ConflictResolver.js

@@ -237,7 +237,7 @@ function mergeListByOtherId(list) {
   return Object.values(mergedData);
 }
 
-// 冲突检测核心函数（修改后的版本）
+// 冲突检测核心函数
 export function checkConflicts(scheduleList, currentSchedule) {
   let rule = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : defaultRule;
   const currentRanges = convertToTimeRanges([currentSchedule]);
@@ -260,6 +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 === currentPreId && current.type === 'timer') {
+          return;
+        }
+        // FIXME:还是存在bug
         // 如果当前定时自身修改 且 与自身冲突 并且其他定时不等于当前定时id 则忽略
         if (currentPreId && currentId === currentPreId && otherId !== currentId) {
           return;

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

@@ -23,10 +23,15 @@ export const timerDataToSchedule = 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
+    endTime: data.time,
+    dps: data.dps,
+    aliasName: data.aliasName || '',
+    isAppPush: data.isAppPush || false,
+    id: (data === null || data === void 0 ? void 0 : data.id) || data.timerId
   };
+  const timerId = `${EScheduleFunctionType.TIMER}_${_data.id}`;
   return {
-    id: objectToId(_data, `${EScheduleFunctionType.TIMER}_`),
+    id: timerId || objectToId(_data, `${EScheduleFunctionType.TIMER}_`),
     type: EScheduleFunctionType.TIMER,
     data: _data
   };

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/index.d.ts

@@ -19,7 +19,7 @@ export { useWakeUpDp } from './hooks/useWakeUpDp';
 export { useRandomDp } from './hooks/useRandomDp';
 export { useCycleDp } from './hooks/useCycleDp';
 export { useWakeUpSupport } from './hooks/useWakeUpSupport';
-export { useBaseLightDp, useFetchDpDataByMesh, getDpDataByMesh, useFetchDpData } from './hooks/useBaseLightDp';
+export { useBaseLightDp, useFetchDpDataByMesh, getDpDataByMesh, useFetchDpData, } from './hooks/useBaseLightDp';
 export { useTimerReportDp, useTimerReportDpPull } from './hooks/useTimerReportDp';
 /** Conflict 冲突判断 */
 export { transScheduleListToConflictList } from './conflict/transform';

package/lib/utils/objectToId.js

@@ -24,7 +24,9 @@ export const objectToId = function (obj) {
   // 简单哈希算法
   let hash = 5381;
   for (let i = 0; i < str.length; i++) {
+    // eslint-disable-next-line no-bitwise
     hash = (hash << 5) + hash + str.charCodeAt(i);
+    // eslint-disable-next-line operator-assignment, no-bitwise
     hash = hash & hash; // 转换为32位整数
   }
 

package/package.json

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