@ray-js/lamp-schedule-core 1.0.1-beta-6 → 1.0.1-beta-8

package/lib/conflict/updateDeviceDp.js

@@ -1,7 +1,13 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 /* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 /* eslint-disable @typescript-eslint/ban-types */
-import { publishDps, publishGroupDpCodes } from '@ray-js/ray';
+import { publishDps, publishGroupDps } from '@ray-js/ray';
 import { scheduleLogger as ScheduleLogger } from '../utils/ScheduleLogger';
+const DEFAULT_OPTIONS = {
+  mode: 2,
+  options: {},
+  pipelines: []
+};
 export const updateDeviceDp = (devId, groupId, dps) => {
   if (Object.keys(dps).length === 0) {
     ScheduleLogger.warn('updateDeviceDp', 'dps is empty');
@@ -12,30 +18,26 @@ export const updateDeviceDp = (devId, groupId, dps) => {
     return;
   }
   if (groupId) {
-    publishGroupDpCodes({
+    publishGroupDps(_objectSpread(_objectSpread({}, DEFAULT_OPTIONS), {}, {
       groupId,
-      dpCodes: dps,
+      dps,
       success: () => {
-        ScheduleLogger.debug('publishGroupDpCodes dp success');
+        ScheduleLogger.debug('publishGroupDps dp success', dps);
       },
       fail: err => {
-        ScheduleLogger.error('publishGroupDpCodes dp fail', err);
+        ScheduleLogger.error('publishGroupDps dp fail', err);
       }
-    });
+    }));
     return;
   }
   ScheduleLogger.debug('updateDeviceDp publishDps dps:', dps);
-  publishDps({
+  publishDps(_objectSpread(_objectSpread({}, DEFAULT_OPTIONS), {}, {
     deviceId: devId,
-    dps,
-    mode: 2,
-    pipelines: [0, 1, 2, 3, 4, 5, 6],
-    options: {},
     success: () => {
       ScheduleLogger.debug('publishDps dp success', dps);
     },
     fail: err => {
       ScheduleLogger.error('publishDps dp fail', err);
     }
-  });
+  }));
 };

package/lib/utils/ScheduleLogger.js

@@ -68,4 +68,4 @@ export class ScheduleLogger {
   }
 }
 export const scheduleLogger = new ScheduleLogger();
-scheduleLogger.setLogLevel(LogLevel.INFO);
+scheduleLogger.setLogLevel(LogLevel.DEBUG);

package/package.json

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