Przeglądaj źródła

完成测报灯业务页面的MCU控制板的设备控制指令接口

niujiuru 1 dzień temu
rodzic
commit
92cecb950b

+ 7 - 10
web-ui.service/page9_handler.go

@@ -1,6 +1,7 @@
 package main
 
 import (
+	"bytes"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -70,23 +71,19 @@ func cbdWriteMCUDataHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	var req struct {
-		Data string `json:"data"`
-	}
-
-	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
+	var data json.RawMessage
+	if err := json.NewDecoder(r.Body).Decode(&data); err != nil {
 		http.Error(w, "参数错误: "+err.Error(), http.StatusBadRequest)
 		return
 	}
 
-	data := strings.TrimSpace(req.Data)
-	if data == "" || len(data) > 512 {
-		http.Error(w, "参数错误: data 不能为空或超过512字节", http.StatusBadRequest)
+	data = json.RawMessage(bytes.TrimSpace(data))
+	if len(data) == 0 || len(data) > 512 || !json.Valid(data) {
+		http.Error(w, "参数错误: 指令不能为空或超过512字节", http.StatusBadRequest)
 		return
 	}
 
-	if err := callRPCResult(r.Context(), cbdLocalRPCPort, "core.writeMCUData",
-		map[string]string{"data": data}, nil); err != nil {
+	if err := callRPCResult(r.Context(), cbdLocalRPCPort, "core.writeMCUData", data, nil); err != nil {
 		http.Error(w, "数据下发失败: "+err.Error(), http.StatusInternalServerError)
 		return
 	}

+ 82 - 0
web-ui.service/web/static/js/page9.js

@@ -200,6 +200,88 @@ function stopCBDWorkStatusRefresh() {
     }
 }
 
+function writeMCUData(data) {
+    return fetch("/api/cbd/writeMCUData", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify(data),
+    }).then(function (r) {
+        if (!r.ok) {
+            return r.text().then(function (t) {
+                throw new Error(t);
+            });
+        }
+        return r.json();
+    });
+}
+
+function sendP9CtrlCommand(type, name) {
+    writeMCUData({
+        cmd: "ctrl",
+        ext: { type: type },
+    })
+        .then(function () {
+            alert(name + "指令已发送");
+        })
+        .catch(function (err) {
+            alert(name + "指令发送失败:" + err.message);
+        });
+}
+
+function onP9Btn01Click() {
+    sendP9CtrlCommand("lamp_on", "打开灯管");
+}
+
+function onP9Btn02Click() {
+    sendP9CtrlCommand("lamp_off", "关闭灯管");
+}
+
+function onP9Btn03Click() {
+    sendP9CtrlCommand("led_on", "打开补光");
+}
+
+function onP9Btn04Click() {
+    sendP9CtrlCommand("led_off", "关闭补光");
+}
+
+function onP9Btn05Click() {
+    sendP9CtrlCommand("up_door_open", "打开上仓");
+}
+
+function onP9Btn06Click() {
+    sendP9CtrlCommand("up_door_close", "关闭上仓");
+}
+
+function onP9Btn07Click() {
+    sendP9CtrlCommand("down_door_open", "打开下仓");
+}
+
+function onP9Btn08Click() {
+    sendP9CtrlCommand("down_door_close", "关闭下仓");
+}
+
+function onP9Btn09Click() {
+    sendP9CtrlCommand("heat_on", "开始加热");
+}
+
+function onP9Btn10Click() {
+    sendP9CtrlCommand("heat_off", "停止加热");
+}
+
+function onP9Btn11Click() {
+    sendP9CtrlCommand("clear_on", "执行清扫");
+}
+
+function onP9Btn12Click() {
+    writeMCUData({ cmd: "takephoto" })
+        .then(function () {
+            alert("测试拍照指令已发送");
+        })
+        .catch(function (err) {
+            alert("测试拍照指令发送失败:" + err.message);
+        });
+}
+
 function initPage9() {
     disableP9CtrlCmdButtons();
     startCBDWorkStatusRefresh();