@ray-js/api 1.6.3 → 1.6.5

package/lib/cloud/doorlock/temp-pwd.js

@@ -1,5 +1,10 @@
 import { THING } from '../../constants';
 import requestCloud from '../../requestCloud';
+
+/**
+ * Schedule_Ver2 - 版本2的周期设置
+ */
+
 // 5.1. 获取动态密码参数类型定义
 
 // 5.1. 获取动态密码响应类型定义
@@ -9,7 +14,7 @@ import requestCloud from '../../requestCloud';
  * @param {GetDynapwdParams} params - 包含设备Id和管理员密码的参数对象
  * @returns {Promise<GetDynapwdResponse>} - 包含动态密码数据的响应对象的 Promise
  */
-export const getDynamicPassword = params => {
+const getDynamicPassword = params => {
   return requestCloud({
     api: "".concat(THING, ".m.device.lock.dynapwd.get"),
     version: '3.0',
@@ -26,7 +31,7 @@ export const getDynamicPassword = params => {
  * @param {ValidateTempPasswordParams} params - 临时密码参数
  * @returns {Promise<ValidateTempPasswordResult>} - 校验结果的 Promise
  */
-export const validateTemporaryPassword = params => {
+const validateTemporaryPassword = params => {
   return requestCloud({
     api: "".concat(THING, ".m.device.lock.temppwd.validate"),
     version: '3.0',
@@ -34,35 +39,6 @@ export const validateTemporaryPassword = params => {
   });
 };
 
-//#region 5.3. 校验临时密码参数
-
-/**
- * Schedule_Ver2 - 版本2的周期设置
- */
-
-/**
- * ValidateUpdateTempPasswordParams - 校验临时密码参数
- */
-
-/**
- * ValidateUpdateTempPasswordResult - 校验临时密码结果
- */
-
-/**
- * 校验临时密码是否可以添加或更新
- * @param {ValidateUpdateTempPasswordParams} params - 临时密码参数
- * @returns {Promise<ValidateUpdateTempPasswordResult>} - 校验结果的 Promise
- */
-export const validateAndUpdateTemporaryPassword = params => {
-  return requestCloud({
-    api: "".concat(THING, ".m.device.lock.temppwd.validate"),
-    version: '2.0',
-    data: params
-  });
-};
-
-//#endregion
-
 //#region 5.4.  临时密码页创建临时密码
 
 /**
@@ -78,7 +54,7 @@ export const validateAndUpdateTemporaryPassword = params => {
  * @param {CreateTempPasswordParams} params - 创建临时密码参数
  * @returns {Promise<CreateTempPasswordResult>} - 创建结果的 Promise
  */
-export const createTemporaryPassword = params => {
+const createTemporaryPassword = params => {
   return requestCloud({
     api: "".concat(THING, ".m.device.lock.temppwd.create"),
     version: '8.0',
@@ -105,7 +81,7 @@ export const createTemporaryPassword = params => {
  * @param {UpdateTempPasswordParams} params - 更新临时密码参数
  * @returns {Promise<UpdateTempPasswordResult>} - 更新结果的 Promise
  */
-export const updateTempPassword = params => {
+const updateTempPassword = params => {
   return requestCloud({
     api: "".concat(THING, ".m.device.lock.temppwd.update"),
     version: '4.0',
@@ -132,7 +108,7 @@ export const updateTempPassword = params => {
  * @param {UpdateTempPasswordNameParams} params - 更新临时密码名称参数
  * @returns {Promise<UpdateTempPasswordNameResult>} - 更新结果的 Promise
  */
-export const updateTempPasswordName = params => {
+const updateTempPasswordName = params => {
   return requestCloud({
     api: "".concat(THING, ".m.device.lock.temppwd.name"),
     version: '1.0',
@@ -159,7 +135,7 @@ export const updateTempPasswordName = params => {
  * @param {DeleteTempPasswordParams} params - 删除临时密码参数
  * @returns {Promise<DeleteTempPasswordResult>} - 删除结果的 Promise
  */
-export const deleteTemporaryPassword = params => {
+const deleteTemporaryPassword = params => {
   return requestCloud({
     api: "".concat(THING, ".m.device.lock.temppwd.remove"),
     version: '5.0',
@@ -184,10 +160,13 @@ export const deleteTemporaryPassword = params => {
  * @param {ShareAvailabilityParams} params - 检查分享可用性参数
  * @returns {Promise<ShareAvailabilityResult>} - 检查结果的 Promise
  */
-export const checkShareAvailability = params => {
+const checkShareAvailability = params => {
   return requestCloud({
     api: "".concat(THING, ".m.device.lock.share.available"),
     version: '1.0',
     data: params
   });
-};
+};
+//#endregion
+
+export { getDynamicPassword, validateTemporaryPassword, createTemporaryPassword, updateTempPassword, updateTempPasswordName, deleteTemporaryPassword, checkShareAvailability };

package/lib/cloud/doorlock/unlock-method.d.ts

@@ -13,7 +13,7 @@ type CheckUnlockMethodResult = boolean;
  * @param {CheckUnlockMethodParams} params - 查询解锁方式参数
  * @returns {Promise<CheckUnlockMethodResult>} - 查询结果的 Promise
  */
-export declare const checkUnlockMethod: (params: CheckUnlockMethodParams) => Promise<CheckUnlockMethodResult>;
+declare const checkUnlockMethod: (params: CheckUnlockMethodParams) => Promise<CheckUnlockMethodResult>;
 /**
  * GetUnlockMethodListParams - 查询开锁方式列表参数
  */
@@ -40,7 +40,7 @@ type GetUnlockMethodListResult = {
  * @param {GetUnlockMethodListParams} params - 查询开锁方式列表参数
  * @returns {Promise<GetUnlockMethodListResult[]>} - 查询结果的 Promise
  */
-export declare const getUnlockMethodList: (params: GetUnlockMethodListParams) => Promise<GetUnlockMethodListResult[]>;
+declare const getUnlockMethodList: (params: GetUnlockMethodListParams) => Promise<GetUnlockMethodListResult[]>;
 /**
  * BindUnlockMethodToUserParams - 绑定解锁方式参数
  */
@@ -58,5 +58,5 @@ type BindUnlockMethodToUserResponse = boolean;
  * @param {BindUnlockMethodToUserParams} params - 绑定解锁方式参数
  * @returns {Promise<BindUnlockMethodToUserResponse>} - 绑定结果的 Promise
  */
-export declare const bindUnlockMethodToUser: (params: BindUnlockMethodToUserParams) => Promise<BindUnlockMethodToUserResponse>;
-export {};
+declare const bindUnlockMethodToUser: (params: BindUnlockMethodToUserParams) => Promise<BindUnlockMethodToUserResponse>;
+export { checkUnlockMethod, getUnlockMethodList, bindUnlockMethodToUser };

package/lib/cloud/doorlock/unlock-method.js

@@ -18,7 +18,7 @@ import requestCloud from '../../requestCloud';
  * @param {CheckUnlockMethodParams} params - 查询解锁方式参数
  * @returns {Promise<CheckUnlockMethodResult>} - 查询结果的 Promise
  */
-export const checkUnlockMethod = params => {
+const checkUnlockMethod = params => {
   return requestCloud({
     api: "".concat(THING, ".m.device.unlock.waitassign"),
     version: '1.0',
@@ -47,7 +47,7 @@ export const checkUnlockMethod = params => {
  * @param {GetUnlockMethodListParams} params - 查询开锁方式列表参数
  * @returns {Promise<GetUnlockMethodListResult[]>} - 查询结果的 Promise
  */
-export const getUnlockMethodList = params => {
+const getUnlockMethodList = params => {
   return requestCloud({
     api: "".concat(THING, ".m.device.unlock.assignlist"),
     version: '1.0',
@@ -74,7 +74,7 @@ export const getUnlockMethodList = params => {
  * @param {BindUnlockMethodToUserParams} params - 绑定解锁方式参数
  * @returns {Promise<BindUnlockMethodToUserResponse>} - 绑定结果的 Promise
  */
-export const bindUnlockMethodToUser = params => {
+const bindUnlockMethodToUser = params => {
   return requestCloud({
     api: "".concat(THING, ".m.device.user.unlock.allocate"),
     version: '1.0',
@@ -82,4 +82,6 @@ export const bindUnlockMethodToUser = params => {
   });
 };
 
-//#endregion
+//#endregion
+
+export { checkUnlockMethod, getUnlockMethodList, bindUnlockMethodToUser };

package/lib/cloud/doorlock/unlock.d.ts

@@ -8,52 +8,17 @@ type RemoteOpenResponse = boolean;
  * @param {RemoteOpenParams} params - 包含设备Id和开门状态的参数
  * @returns {Promise<RemoteOpenResponse>} - 包含执行结果和状态的响应
  */
-export declare const remoteOpenDoor: (params: RemoteOpenParams) => Promise<RemoteOpenResponse>;
-type UnlockParams = {
-    devId: string;
-    open: boolean;
-    confirm: boolean;
-};
-type UnlockResponse = boolean;
-/**
- * 远程免密解锁
- * @param {UnlockParams} params - 包含设备Id、开门状态和确认状态的参数
- * @returns {Promise<UnlockResponse>} - 包含请求结果和状态的响应
- */
-export declare const remoteUnlockDoor: (params: UnlockParams) => Promise<UnlockResponse>;
+declare const remoteOpenDoor: (params: RemoteOpenParams) => Promise<RemoteOpenResponse>;
 type CanUnlockRemoteParams = {
     devId: string;
 };
 type CanUnlockRemoteResponse = boolean;
 /**
- * 判断用户是否可以远程开门
+ * 获取分享用户在时间段内是否可以开门
  * @param {CanUnlockRemoteResponse} params - 包含设备Id的参数
  * @returns {Promise<CanUnlockRemoteResponse>} - 包含请求结果和状态的响应
  */
-export declare const checkCanRemoteUnlock: (params: CanUnlockRemoteParams) => Promise<CanUnlockRemoteResponse>;
-type UnlockRecord = {
-    userName: string;
-    opMode: string;
-    unlockName: string;
-};
-type GetLatestRecordInfoParams = {
-    devId: string;
-};
-type GetLatestRecordInfoResponse = {
-    dpId: number;
-    dpValue: string;
-    recordType: number;
-    userName: string;
-    time: number;
-    unionUnlockInfo: UnlockRecord[];
-    unReadCount: number;
-};
-/**
- * 获取最近一条记录的信息
- * @param   {GetLatestRecordInfoParams} params  - 包含设备Id的参数
- * @returns {Promise<GetLatestRecordInfoResponse>} - 包含请求结果和状态的响应
- */
-export declare const getLatestUnlockRecord: (params: GetLatestRecordInfoParams) => Promise<GetLatestRecordInfoResponse>;
+declare const checkCanRemoteUnlock: (params: CanUnlockRemoteParams) => Promise<CanUnlockRemoteResponse>;
 type QueryUnlockRecord = {
     userName: string;
     opMode: string;
@@ -85,5 +50,5 @@ type QueryRecordInfoResponse = {
  * @param { QueryRecordInfoParams} params -  包含设备Id的参数
  * @returns {Promise<QueryRecordInfoResponse[]>} - 包含请求结果和状态的响应
  */
-export declare const queryUnlockRecord: (params: QueryRecordInfoParams) => Promise<QueryRecordInfoResponse[]>;
-export {};
+declare const queryUnlockRecord: (params: QueryRecordInfoParams) => Promise<QueryRecordInfoResponse[]>;
+export { remoteOpenDoor, checkCanRemoteUnlock, queryUnlockRecord };

package/lib/cloud/doorlock/unlock.js

@@ -10,7 +10,7 @@ import requestCloud from '../../requestCloud';
  * @param {RemoteOpenParams} params - 包含设备Id和开门状态的参数
  * @returns {Promise<RemoteOpenResponse>} - 包含执行结果和状态的响应
  */
-export const remoteOpenDoor = params => {
+const remoteOpenDoor = params => {
   return requestCloud({
     api: "".concat(THING, ".m.zigbee.lock.remotepwd.execute"),
     version: '1.0',
@@ -18,47 +18,20 @@ export const remoteOpenDoor = params => {
   });
 };
 
-// 1.2. Unlock - 远程免密开门的参数和响应类型
+// 1.3. 获取分享用户在时间段内是否可以开门
 
 /**
- * 远程免密解锁
- * @param {UnlockParams} params - 包含设备Id、开门状态和确认状态的参数
- * @returns {Promise<UnlockResponse>} - 包含请求结果和状态的响应
- */
-export const remoteUnlockDoor = params => {
-  return requestCloud({
-    api: "".concat(THING, ".m.device.lock.remote.unlock"),
-    version: '2.0',
-    data: params
-  });
-};
-
-// 1.3. 判断用户是否可以远程开门
-
-/**
- * 判断用户是否可以远程开门
+ * 获取分享用户在时间段内是否可以开门
  * @param {CanUnlockRemoteResponse} params - 包含设备Id的参数
  * @returns {Promise<CanUnlockRemoteResponse>} - 包含请求结果和状态的响应
  */
-export const checkCanRemoteUnlock = params => {
+const checkCanRemoteUnlock = params => {
   return requestCloud({
     api: "".concat(THING, ".m.device.lock.remote.unlock.available"),
     version: '1.0',
     data: params
   });
 };
-/**
- * 获取最近一条记录的信息
- * @param   {GetLatestRecordInfoParams} params  - 包含设备Id的参数
- * @returns {Promise<GetLatestRecordInfoResponse>} - 包含请求结果和状态的响应
- */
-export const getLatestUnlockRecord = params => {
-  return requestCloud({
-    api: "".concat(THING, ".m.device.lock.history.latest"),
-    version: '1.0',
-    data: params
-  });
-};
 
 // 1.5. 查询开门记录
 
@@ -67,10 +40,11 @@ export const getLatestUnlockRecord = params => {
  * @param { QueryRecordInfoParams} params -  包含设备Id的参数
  * @returns {Promise<QueryRecordInfoResponse[]>} - 包含请求结果和状态的响应
  */
-export const queryUnlockRecord = params => {
+const queryUnlockRecord = params => {
   return requestCloud({
     api: "".concat(THING, ".m.device.lock.history.list"),
-    version: '2.0',
+    version: '1.0',
     data: params
   });
-};
+};
+export { remoteOpenDoor, checkCanRemoteUnlock, queryUnlockRecord };

package/lib/cloud/energy.d.ts

@@ -12,4 +12,5 @@ export declare const energy: {
     getInverterDeviceModel: typeof ty.energy.getInverterDeviceModel;
     getDevicePropertySettingTranslate: typeof ty.energy.getDevicePropertySettingTranslate;
     setDevicePropertySetting: typeof ty.energy.setDevicePropertySetting;
+    getDpHistoryDataList: typeof ty.energy.getDpHistoryDataList;
 };

package/lib/cloud/energy.js

@@ -39,6 +39,9 @@ const getDevicePropertySettingTranslate = factory('getDevicePropertySettingTrans
 const setDevicePropertySetting = factory('setDevicePropertySetting', {
   namespace: 'energy'
 });
+const getDpHistoryDataList = factory('getDpHistoryDataList', {
+  namespace: 'energy'
+});
 export const energy = {
   getDeviceDataMultipleSum,
   getInverterDeviceInfo,
@@ -52,5 +55,6 @@ export const energy = {
   getPropertySettingTranslate,
   getInverterDeviceModel,
   getDevicePropertySettingTranslate,
-  setDevicePropertySetting
+  setDevicePropertySetting,
+  getDpHistoryDataList
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/api",
-  "version": "1.6.3",
+  "version": "1.6.5",
   "description": "Ray universal api",
   "keywords": [
     "ray"
@@ -29,14 +29,14 @@
     "watch": "ray start --type=component"
   },
   "dependencies": {
-    "@ray-js/framework": "1.6.3",
-    "@ray-js/router": "1.6.3",
+    "@ray-js/framework": "1.6.5",
+    "@ray-js/router": "1.6.5",
     "@ray-js/wechat": "^0.2.19",
     "base64-browser": "^1.0.1",
     "query-string": "^7.1.3"
   },
   "devDependencies": {
-    "@ray-js/cli": "1.6.3",
+    "@ray-js/cli": "1.6.5",
     "art-template": "^4.13.2",
     "fs-extra": "^10.1.0",
     "miniprogram-api-typings": "^3.12.3",
@@ -46,5 +46,5 @@
     "access": "public",
     "registry": "https://registry.npmjs.com"
   },
-  "gitHead": "f0390bf5a5c5867f2157214b900ca656877853fd"
+  "gitHead": "228f27012c3130d2930cd25413a8c80647787fc2"
 }

package/lib/cloud/doorlock/old.d.ts

@@ -1,36 +0,0 @@
-export declare const getUiConfig: (productId: any, productConfigTimestamp?: string, productPanelPowerTimestamp?: string) => void;
-export declare const getUserRegion: () => void;
-/**
- * 获取门锁最新日志
- * @param params {devId: string}
- * @returns
- */
-export declare const getLockLatestLog: (params: {
-    devId: string;
-}) => void;
-/**
- * 获取门锁安全天数
- * @param param {devId: string}
- * @returns
- */
-export declare const getLockActivePeriod: ({ devId }: {
-    devId: string;
-}) => void;
-/**
- * 获取门锁成员信息
- * @param param {devId: string, userId?: string}
- * @returns
- */
-export declare const getLockMemberInfo: ({ devId, userId }: {
-    devId: string;
-    userId?: string;
-}) => void;
-/**
- * 远程开门
- * @param param { devId: string, open: boolean }
- * @returns
- */
-export declare const remoteLockExecute: ({ devId, open }: {
-    devId: string;
-    open: boolean;
-}) => void;

package/lib/cloud/doorlock/old.js

@@ -1,102 +0,0 @@
-// 仅用于门锁模版
-// 门锁模版中涉及到的atop接口，暂时封装，后续会根据实际情况进行封装。
-import { THING } from '../../constants';
-import requestCloud from '../../requestCloud';
-
-// 获取云能力
-export const getUiConfig = function (productId) {
-  let productConfigTimestamp = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '0';
-  let productPanelPowerTimestamp = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '0';
-  return requestCloud({
-    api: "".concat(THING, ".m.app.panel.info.get"),
-    version: '2.0',
-    data: {
-      productId,
-      productConfigTimestamp,
-      productPanelPowerTimestamp,
-      options: 'uiContent,cloudDp,powerCode'
-    }
-  });
-};
-
-// 获取当前帐号所属地区
-export const getUserRegion = () => {
-  return requestCloud({
-    api: "".concat(THING, ".m.user.region.get"),
-    version: '1.0',
-    data: {}
-  });
-};
-
-/**
- * 获取门锁最新日志
- * @param params {devId: string}
- * @returns
- */
-export const getLockLatestLog = params => {
-  return requestCloud({
-    api: "".concat(THING, ".m.device.lock.log.latest"),
-    version: '1.0',
-    data: {
-      devId: params.devId
-    }
-  });
-};
-
-/**
- * 获取门锁安全天数
- * @param param {devId: string}
- * @returns
- */
-export const getLockActivePeriod = _ref => {
-  let {
-    devId
-  } = _ref;
-  return requestCloud({
-    api: "".concat(THING, ".m.device.lock.active.period"),
-    version: '1.0',
-    data: {
-      devId
-    }
-  });
-};
-
-/**
- * 获取门锁成员信息
- * @param param {devId: string, userId?: string}
- * @returns
- */
-export const getLockMemberInfo = _ref2 => {
-  let {
-    devId,
-    userId
-  } = _ref2;
-  return requestCloud({
-    api: "".concat(THING, ".m.device.member.panel.get"),
-    version: '1.0',
-    data: {
-      devId: devId,
-      userId: userId || ''
-    }
-  });
-};
-
-/**
- * 远程开门
- * @param param { devId: string, open: boolean }
- * @returns
- */
-export const remoteLockExecute = _ref3 => {
-  let {
-    devId,
-    open
-  } = _ref3;
-  return requestCloud({
-    api: "".concat(THING, ".m.zigbee.lock.remotepwd.execute"),
-    version: '1.0',
-    data: {
-      devId: devId,
-      open
-    }
-  });
-};