From 0416f060718bde06bd2826043d8344b7f7dc86a3 Mon Sep 17 00:00:00 2001 From: XieHaoLiang <806854015@qq.com> Date: Tue, 31 Dec 2024 17:51:20 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E5=86=B7?= =?UTF-8?q?=E7=94=B5=E8=A1=A8-=E6=9B=B4=E6=96=B0=E5=86=B7=E6=B0=B4?= =?UTF-8?q?=E8=A1=A8=E4=BF=A1=E6=81=AFAPI=20=E6=96=B0=E5=A2=9E=EF=BC=9A?= =?UTF-8?q?=E7=83=AD=E7=94=B5=E8=A1=A8-=E6=9B=B4=E6=96=B0=E7=83=AD?= =?UTF-8?q?=E6=B0=B4=E8=A1=A8=E4=BF=A1=E6=81=AFAPI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api.js | 20 +++++++++++++++++ star-cloud.js | 4 +++- star-cloud/coldWater.js | 20 +++++++++++++++++ star-cloud/hotWater.js | 20 +++++++++++++++++ web.md | 48 +++++++++++++++++++++++++++++++++++++++++ web/index.js | 24 +++++++++++++++++++++ 6 files changed, 135 insertions(+), 1 deletion(-) create mode 100644 star-cloud/coldWater.js create mode 100644 star-cloud/hotWater.js diff --git a/api.js b/api.js index d06c2ea..bfba570 100644 --- a/api.js +++ b/api.js @@ -196,4 +196,24 @@ export function updateElecSettingRequest(data) { method: 'POST', data }) +} + + + +//冷水表-刷新水表数据 +export function coldWaterRefreshWaterInfoRequest(data) { + return request({ + url: '/v1/coldWater/refreshWaterInfo', + method: 'POST', + data + }) +} + +//热水表-刷新水表数据 +export function hotWaterRefreshWaterInfoRequest(data) { + return request({ + url: '/v1/hotWater/refreshWaterInfo', + method: 'POST', + data + }) } \ No newline at end of file diff --git a/star-cloud.js b/star-cloud.js index 3af0cd6..2c1f8fa 100644 --- a/star-cloud.js +++ b/star-cloud.js @@ -7,6 +7,8 @@ import * as record from './star-cloud/record.js' import * as user from './star-cloud/user.js' import * as common from './common.js' import * as elec from './star-cloud/elec.js' +import * as coldWater from './star-cloud/coldWater.js' +import * as hotWater from './star-cloud/hotWater.js' import { onBLECharacteristicValueChange } from './uni/basic' /** @@ -138,7 +140,7 @@ class StarCloud { * @param {Boolean} params.isReportLog 是否上报日志 */ init(params) { - Object.assign(StarCloud.prototype, device, lock, other, password, record, user, common, elec) + Object.assign(StarCloud.prototype, device, lock, other, password, record, user, common, elec,coldWater, hotWater) const { clientId, clientSecret, env, platform, accounts,clientUrl } = params this.envVersion = 'release' diff --git a/star-cloud/coldWater.js b/star-cloud/coldWater.js new file mode 100644 index 0000000..03f6587 --- /dev/null +++ b/star-cloud/coldWater.js @@ -0,0 +1,20 @@ + +import {coldWaterRefreshWaterInfoRequest} from "../api.js"; +import {Result} from "../constant.js"; + + +/** + * 冷电表-刷新电表信息 + * @param params + * @param {Number} [params.uid] 用户ID + * @param {Number} params.waterId 冷水表ID + * @returns {Promise} + */ +export async function refreshColdWaterInfo(params) { + // 设置执行账号 + const result = await this.login(params.uid) + if (result.code !== Result.Success.code) { + return result + } + return await coldWaterRefreshWaterInfoRequest(params) +} \ No newline at end of file diff --git a/star-cloud/hotWater.js b/star-cloud/hotWater.js new file mode 100644 index 0000000..dc442a3 --- /dev/null +++ b/star-cloud/hotWater.js @@ -0,0 +1,20 @@ + +import {hotWaterRefreshWaterInfoRequest} from "../api.js"; +import {Result} from "../constant.js"; + + +/** + * 热电表-刷新电表信息 + * @param params + * @param {Number} [params.uid] 用户ID + * @param {Number} params.waterId 热水表ID + * @returns {Promise} + */ +export async function refreshHotWaterInfo(params) { + // 设置执行账号 + const result = await this.login(params.uid) + if (result.code !== Result.Success.code) { + return result + } + return await hotWaterRefreshWaterInfoRequest(params) +} \ No newline at end of file diff --git a/web.md b/web.md index 94aff6e..fa6dd46 100644 --- a/web.md +++ b/web.md @@ -348,3 +348,51 @@ updateElecSetting(params) **返回** 无 + + + +# 冷电表 + +## 冷电表-更新冷水表信息 + +**调用方法** + +```javascript +import { refreshColdWaterInfo } from 'star-cloud-web' + +refreshColdWaterInfo(params) +``` + +**入参** + +| 参数名称 | 数据类型 | 必须 | 描述 | +|---------|----------------|----|-------| +| uid | Number | N | 用户uid | +| waterId | Number | N | 冷水表ID | + +**返回** +无 + + + +# 热电表 + +## 热电表-更新热水表信息 + +**调用方法** + +```javascript +import { refreshHotWaterInfo } from 'star-cloud-web' + +refreshHotWaterInfo(params) +``` + +**入参** + +| 参数名称 | 数据类型 | 必须 | 描述 | +|---------|----------------|----|-------| +| uid | Number | N | 用户uid | +| waterId | Number | N | 热水表ID | + +**返回** +无 \ No newline at end of file diff --git a/web/index.js b/web/index.js index a170739..1c88b83 100644 --- a/web/index.js +++ b/web/index.js @@ -122,3 +122,27 @@ export const refreshElecInfo = async params => { export const updateElecSetting = async params => { return await starCloudInstance.updateElecSetting(params) } + + +/** + * 冷电表-刷新水表信息 + * @param params + * @param {Number} [params.uid] 用户ID + * @param {Number} [params.waterId] 冷水表ID + * @returns Result + */ +export const refreshColdWaterInfo = async params => { + return await starCloudInstance.refreshColdWaterInfo(params) +} + + +/** + * 热电表-刷新水表信息 + * @param params + * @param {Number} [params.uid] 用户ID + * @param {Number} [params.waterId] 热水表ID + * @returns Result + */ +export const refreshHotWaterInfo = async params => { + return await starCloudInstance.refreshHotWaterInfo(params) +} From 548b16c04989c869141d61d2c2b104626f8f2042 Mon Sep 17 00:00:00 2001 From: XieHaoLiang <806854015@qq.com> Date: Tue, 7 Jan 2025 17:45:51 +0800 Subject: [PATCH 2/2] fix --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9c14ac1..62bd7da 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { - "name": "star-cloud-web", - "version": "1.0.1", + "name": "star-cloud-uni", + "version": "1.0.2", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "star-cloud-web", - "version": "1.0.1", + "name": "star-cloud-uni", + "version": "1.0.2", "dependencies": { "buffer": "^6.0.3", "crc": "^4.3.2", diff --git a/package.json b/package.json index 51ac76e..cb9914e 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "star-cloud-uni", "version": "1.0.2", "type": "module", - "main": "./uni/index.js", + "main": "./web/index.js", "author": "zzc059", "scripts": { "web-build": "node obfuscate-web.js",