From cc59dc159d6c223107df8637245ba1c3c877d304 Mon Sep 17 00:00:00 2001 From: zhangjiming Date: Tue, 18 Feb 2025 20:04:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=BD=E4=BB=A4=E9=87=8D=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/services/debug/debugApi.ts | 48 ------------------------------------- src/services/globalCmd/globalCmd.ts | 48 +++++++++++++++++++++++++++++++++++++ src/services/socket.ts | 1 - src/services/txn.ts | 28 +++++++++++----------- src/views/debug/debug.vue | 4 ++-- 5 files changed, 64 insertions(+), 65 deletions(-) delete mode 100644 src/services/debug/debugApi.ts create mode 100644 src/services/globalCmd/globalCmd.ts diff --git a/src/services/debug/debugApi.ts b/src/services/debug/debugApi.ts deleted file mode 100644 index c4d4ee5..0000000 --- a/src/services/debug/debugApi.ts +++ /dev/null @@ -1,48 +0,0 @@ -import httpRequest, { type BaseResponse } from "../httpRequest"; -import { addTxnRecord } from "../txn"; - -export const CmdDescMap: { [k in DebugCmd]: string } = { - upTray: "抬起托盘", - downTray: "降下托盘", - injectFluid: "注入溶液", - moveToActionArea: "移至操作区", - startShakeUp: "开始摇匀", - stopShakeUp: "结束摇匀", - startHeat: "开始加热", - stopHeat: "停止加热", - keepHeat: "恒温", - takePhoto: "拍照", - // moveToUnusual: "移至异常区", - moveToHeatArea: "移至加热区", - takeOffCap: "取下拍子", - putBackCap: "装回拍子", - openClaw: "张开夹爪", - closeClaw: "收合夹爪", - moveMachineArm: "移动机械臂", - moveTube: "移动试管", -}; - -export type DebugCmd = - | "upTray" // 抬起托盘 - | "downTray" // 降下托盘 - | "injectFluid" // 注入溶液 - | "moveToActionArea" // 移至操作区 - | "startShakeUp" // 开始摇匀 - | "stopShakeUp" // 结束摇匀 - | "startHeat" // 开始加热 - | "stopHeat" // 停止加热 - | "keepHeat" // 恒温 - | "takePhoto" // 拍照 - // | "moveToUnusual" // 移至异常区 - | "moveToHeatArea" // 移至加热区 - | "takeOffCap" // 取下拍子 - | "putBackCap" // 装回拍子 - | "openClaw" // 张开夹爪 - | "closeClaw" // 收合夹爪 - | "moveMachineArm" // 移动机械臂 - | "moveTube"; // 移动试管 - -export function debugCmd(params: { command: DebugCmd; params: Record }) { - const commandId = addTxnRecord({ ...params, category: "debug" }); - return httpRequest>({ url: "/api/cmd/", params: { ...params, commandId }, method: "POST" }); -} diff --git a/src/services/globalCmd/globalCmd.ts b/src/services/globalCmd/globalCmd.ts new file mode 100644 index 0000000..19bb440 --- /dev/null +++ b/src/services/globalCmd/globalCmd.ts @@ -0,0 +1,48 @@ +import httpRequest, { type BaseResponse } from "../httpRequest"; +import { addTxnRecord } from "../txn"; + +export const CmdDescMap: { [k in OperationCmd]: string } = { + upTray: "抬起托盘", + downTray: "降下托盘", + injectFluid: "注入溶液", + moveToActionArea: "移至操作区", + startShakeUp: "开始摇匀", + stopShakeUp: "结束摇匀", + startHeat: "开始加热", + stopHeat: "停止加热", + keepHeat: "恒温", + takePhoto: "拍照", + // moveToUnusual: "移至异常区", + moveToHeatArea: "移至加热区", + takeOffCap: "取下拍子", + putBackCap: "装回拍子", + openClaw: "张开夹爪", + closeClaw: "收合夹爪", + moveMachineArm: "移动机械臂", + moveTube: "移动试管", +}; + +export type OperationCmd = + | "upTray" // 抬起托盘 + | "downTray" // 降下托盘 + | "injectFluid" // 注入溶液 + | "moveToActionArea" // 移至操作区 + | "startShakeUp" // 开始摇匀 + | "stopShakeUp" // 结束摇匀 + | "startHeat" // 开始加热 + | "stopHeat" // 停止加热 + | "keepHeat" // 恒温 + | "takePhoto" // 拍照 + // | "moveToUnusual" // 移至异常区 + | "moveToHeatArea" // 移至加热区 + | "takeOffCap" // 取下拍子 + | "putBackCap" // 装回拍子 + | "openClaw" // 张开夹爪 + | "closeClaw" // 收合夹爪 + | "moveMachineArm" // 移动机械臂 + | "moveTube"; // 移动试管 + +export function debugCmd(params: { command: OperationCmd; params: Record }) { + const commandId = addTxnRecord({ ...params, category: "debug" }); + return httpRequest>({ url: "/api/cmd/", params: { ...params, commandId }, method: "POST" }); +} diff --git a/src/services/socket.ts b/src/services/socket.ts index 9a2c4a4..9daeadb 100644 --- a/src/services/socket.ts +++ b/src/services/socket.ts @@ -1,5 +1,4 @@ import { Subject } from "rxjs"; -import type { DebugCmd } from "./debug/debugApi"; export type CmdSuccess = "D0000"; export type CmdFailure = "D1111"; diff --git a/src/services/txn.ts b/src/services/txn.ts index 5286065..c6f9f73 100644 --- a/src/services/txn.ts +++ b/src/services/txn.ts @@ -1,4 +1,4 @@ -import type { DebugCmd } from "./debug/debugApi"; +import type { OperationCmd } from "./globalCmd/globalCmd"; let _lastTimestamp = 0; export function generateTxnNo() { @@ -17,27 +17,27 @@ export function generateTxnNo() { } type DebugCmdRecord = { - category: 'debug'; - command: DebugCmd; - params: Record -} + category: "debug"; + command: OperationCmd; + params: Record; +}; -type TxnRecord = DebugCmdRecord // | xxxRecord +type TxnRecord = DebugCmdRecord; // | xxxRecord const txnCmdMap: Record = {}; export function addTxnRecord(val: TxnRecord) { const txn = generateTxnNo().toString(); txnCmdMap[txn] = val; - return txn + return txn; } -export function getTxnRecord(txn: string, category: TxnRecord['category']) { +export function getTxnRecord(txn: string, category: TxnRecord["category"]) { const record = txnCmdMap[txn]; - // 只有属于指定category时，才返回，且返回后删除记录，节约内存 - if (record.category === category) { - delete txnCmdMap[txn]; - return record - } - return undefined + // 只有属于指定category时，才返回，且返回后删除记录，节约内存 + if (record.category === category) { + delete txnCmdMap[txn]; + return record; + } + return undefined; } diff --git a/src/views/debug/debug.vue b/src/views/debug/debug.vue index 2729deb..7b960b3 100644 --- a/src/views/debug/debug.vue +++ b/src/views/debug/debug.vue @@ -169,7 +169,7 @@