Pārlūkot izejas kodu

1,新增监控测报灯通信状态的前后端接口和页面展示;2,优化其它页面代码, 加强安全性

niujiuru 5 dienas atpakaļ
vecāks
revīzija
b882de873f

+ 1 - 0
main.go

@@ -85,6 +85,7 @@ func (p *program) Start(s service.Service) error {
 	methods["core.doHMIUpgrade"] = doHMIUpgrade // 执行串口屏升级
 	methods["core.doMCUUpgrade"] = doMCUUpgrade // 执行控制板升级
 	methods["core.writeMCUData"] = writeMCUData // 发数据给控制板
+	methods["core.getRunStatus"] = getRunStatus // 获取运行的状态
 
 	err = p.core_server.RegisterMethods(methods)
 	if err != nil {

+ 3 - 0
mcu_ctrl_board/bridge.go

@@ -7,6 +7,7 @@ import "C"
 
 import (
 	"fmt"
+	"time"
 	"unsafe"
 
 	"hnyfkj.com.cn/rtu/linux/rtu/cbd/utils"
@@ -48,6 +49,7 @@ func go_handle_serial_json_info(jsonStr *C.char) *C.char {
 	if Board == nil {
 		return nil
 	}
+	Board.LastActiveTime.Set(time.Now())
 
 	s := C.GoString(jsonStr)
 
@@ -67,6 +69,7 @@ func go_handle_serial_text_info(textStr *C.char) *C.char {
 	if Board == nil {
 		return nil
 	}
+	Board.LastActiveTime.Set(time.Now())
 
 	s := C.GoString(textStr)
 

+ 6 - 5
mcu_ctrl_board/mcu_ctrl_board.go

@@ -18,11 +18,12 @@ var (
 
 // MCU 控制板对象
 type MCUCtrlBoard struct {
-	DataToMqttCh   chan []byte   // 数据转发给服务器
-	DataToUartCh   chan []byte   // 数据转发给控制板
-	RequestPhotoCh chan struct{} // 请求相机开始拍照
-	uartUseMu      sync.Mutex    // 串口访问的互斥锁
-	extInfo        InitInfo      // 模块的初始化信息
+	DataToMqttCh   chan []byte    // 数据转发给服务器
+	DataToUartCh   chan []byte    // 数据转发给控制板
+	RequestPhotoCh chan struct{}  // 请求相机开始拍照
+	uartUseMu      sync.Mutex     // 串口访问的互斥锁
+	extInfo        InitInfo       // 模块的初始化信息
+	LastActiveTime utils.SafeTime // 最近数据接收时间
 }
 
 type InitInfo struct {

+ 7 - 0
mqtt_reporter/data.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"os"
 	"path/filepath"
+	"time"
 
 	"hnyfkj.com.cn/rtu/linux/baseapp"
 	mcu "hnyfkj.com.cn/rtu/linux/rtu/cbd/mcu_ctrl_board"
@@ -15,6 +16,10 @@ const (
 	dataMaxNums = 1000 ///// MCU控制板 历史数据最大保存条数, 超出后采用 FIFO 覆盖策略
 )
 
+var (
+	DataReportOKTime utils.SafeTime //////////////////// 记录数据最近上报成功的时间
+)
+
 func (r *MQTTReporter) startDataWorker() {
 	go func() {
 		for { //////////////// 循环的处理控制板发来的数据上发请求 ////
@@ -52,6 +57,7 @@ func (r *MQTTReporter) forwardDataToMqttServers(data []byte) {
 			baseapp.Logger.Errorf("[%s] 向MQTT服务器发送数据: %s -> %s 失败: %v!!",
 				MODULE_NAME, logData, server.Name, err)
 		} else {
+			DataReportOKTime.Set(time.Now())
 			baseapp.Logger.Infof("[%s] 向MQTT服务器发送数据: %s -> %s 成功", MODULE_NAME, logData, server.Name)
 			continue
 		}
@@ -158,6 +164,7 @@ func (r *MQTTReporter) reportYFKJBackfillData() (int, error) {
 			break
 		}
 
+		DataReportOKTime.Set(time.Now())
 		baseapp.Logger.Infof("[%s] 向MQTT服务器补报数据: %s -> %s 成功", MODULE_NAME, logData, server.Name)
 		nums++
 	}

+ 5 - 0
mqtt_reporter/photo.go

@@ -19,6 +19,10 @@ const (
 	photoMaxNums = 1000 //// 最大保存的照片数量, 超过后删除最早的一张
 )
 
+var (
+	PhotoUploadOKTime utils.SafeTime //// 记录照片最近上传成功的时间
+)
+
 func (r *MQTTReporter) startImagWorker() {
 	go func() {
 		for { //////////////// 循环的处理控制板发来的相机拍照请求 ////
@@ -118,6 +122,7 @@ func (r *MQTTReporter) uploadPhotoToImagServers(imgFile string, isBackfill /* 
 		}
 
 		utils.PlayAudioAsync(filepath.Join(baseapp.EXEC_DIR, "voices", "pus.wav")) ////////// 图片 上传成功 语音
+		PhotoUploadOKTime.Set(time.Now())
 
 		d := time.Since(s).Milliseconds()
 		baseapp.Logger.Infof("[%s] %s %s -> %s 成功, 耗时: %dms", MODULE_NAME, action, imgFile, server.Name, d)

+ 22 - 0
rpc_handler.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"time"
 
 	"hnyfkj.com.cn/rtu/linux/baseapp"
 	"hnyfkj.com.cn/rtu/linux/rtu/cbd/mcu_ctrl_board"
@@ -118,3 +119,24 @@ func writeMCUData(ctx context.Context, req *jsonrpc2.Request) *jsonrpc2.Response
 
 	return jsonrpc2.BuildResponse(req, "success", nil)
 }
+
+func getRunStatus(ctx context.Context, req *jsonrpc2.Request) *jsonrpc2.Response {
+	formatTime := func(t time.Time) string {
+		if t.IsZero() {
+			return "--"
+		}
+		return t.Format("2006-01-02 15:04:05")
+	}
+
+	result := struct {
+		MCULastActiveTime string `json:"mcuLastActiveTime"`
+		DataReportOKTime  string `json:"dataReportOKTime"`
+		PhotoUploadOKTime string `json:"photoUploadOKTime"`
+	}{
+		MCULastActiveTime: formatTime(mcu_ctrl_board.Board.LastActiveTime.Get()),
+		DataReportOKTime:  formatTime(mqtt_reporter.DataReportOKTime.Get()),
+		PhotoUploadOKTime: formatTime(mqtt_reporter.PhotoUploadOKTime.Get()),
+	}
+
+	return jsonrpc2.BuildResponse(req, result, nil)
+}

+ 3 - 0
test.txt

@@ -29,3 +29,6 @@ curl -s -X POST http://127.0.0.1:7200/rpc -H "Content-Type: application/json" -d
 
 // 发数据给控制板
 curl -s -X POST http://127.0.0.1:7200/rpc -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","method":"core.writeMCUData","params":{"cmd": "takephoto"},"id":10}'
+
+// 获取运行的状态
+curl -s -X POST http://127.0.0.1:7200/rpc -H "Content-Type: application/json" -d '{"jsonrpc":"2.0","method":"core.getRunStatus","params":{},"id":11}'

+ 18 - 0
utils/utils.go

@@ -14,6 +14,7 @@ import (
 	"sort"
 	"strconv"
 	"strings"
+	"sync"
 	"time"
 
 	"hnyfkj.com.cn/rtu/linux/baseapp"
@@ -372,3 +373,20 @@ func MoveFile(src, dst string) error {
 	}
 	return os.Remove(src)
 }
+
+type SafeTime struct {
+	mu sync.RWMutex
+	t  time.Time
+}
+
+func (s *SafeTime) Set(t time.Time) {
+	s.mu.Lock()
+	defer s.mu.Unlock()
+	s.t = t
+}
+
+func (s *SafeTime) Get() time.Time {
+	s.mu.RLock()
+	defer s.mu.RUnlock()
+	return s.t
+}

+ 27 - 0
web-ui.service/page9_handler.go

@@ -169,3 +169,30 @@ func cbdUploadFirmwareHandler(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	json.NewEncoder(w).Encode(map[string]string{"result": "success"})
 }
+
+func cbdServerCfgHandler(w http.ResponseWriter, r *http.Request) {
+	switch r.Method {
+	case http.MethodGet:
+		callRPCResponse(w, r, cbdLocalRPCPort, "core.getServerCfg", nil)
+
+	case http.MethodPost:
+		var params json.RawMessage
+		if err := json.NewDecoder(r.Body).Decode(&params); err != nil {
+			http.Error(w, "服务器配置无效: "+err.Error(), http.StatusBadRequest)
+			return
+		}
+		callRPCResponse(w, r, cbdLocalRPCPort, "core.setServerCfg", params)
+
+	default:
+		http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
+	}
+}
+
+func cbdRunStatusHandler(w http.ResponseWriter, r *http.Request) {
+	if r.Method != http.MethodGet {
+		http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
+		return
+	}
+
+	callRPCResponse(w, r, cbdLocalRPCPort, "core.getRunStatus", nil)
+}

+ 1 - 1
web-ui.service/web/pages/page2.html

@@ -65,7 +65,7 @@
           <div class="card-header">
             <h2>联网服务</h2>
             <div class="log-actions">
-              <select class="log-level-select" id="logLevel" title="当前服务日志级别" onchange="setNetLogLevel()">
+              <select class="log-level-select" id="logLevelP2" title="当前服务日志级别" onchange="setNetLogLevel()">
                 <option value="trace">trace</option>
                 <option value="debug">debug</option>
                 <option value="info" selected>info</option>

+ 1 - 1
web-ui.service/web/pages/page3.html

@@ -43,7 +43,7 @@
         <div class="card-header">
           <h2>时间服务</h2>
           <div class="log-actions">
-            <select class="log-level-select" id="logLevel" title="当前服务日志级别" onchange="setTimeLogLevel()">
+            <select class="log-level-select" id="logLevelP3" title="当前服务日志级别" onchange="setTimeLogLevel()">
               <option value="trace">trace</option>
               <option value="debug">debug</option>
               <option value="info" selected>info</option>

+ 1 - 1
web-ui.service/web/pages/page4.html

@@ -43,7 +43,7 @@
         <div class="card-header">
           <h2>定位服务</h2>
           <div class="log-actions">
-            <select class="log-level-select" id="logLevel" title="当前服务日志级别" onchange="setGnssLogLevel()">
+            <select class="log-level-select" id="logLevelP4" title="当前服务日志级别" onchange="setGnssLogLevel()">
               <option value="trace">trace</option>
               <option value="debug">debug</option>
               <option value="info" selected>info</option>

+ 1 - 1
web-ui.service/web/pages/page5.html

@@ -104,7 +104,7 @@
           <div class="card-header">
             <h2>相机服务</h2>
             <div class="log-actions">
-              <select class="log-level-select" id="logLevel" title="当前服务日志级别" onchange="setCameraLogLevel()">
+              <select class="log-level-select" id="logLevelP5" title="当前服务日志级别" onchange="setCameraLogLevel()">
                 <option value="trace">trace</option>
                 <option value="debug">debug</option>
                 <option value="info" selected>info</option>

+ 1 - 1
web-ui.service/web/pages/page6.html

@@ -107,7 +107,7 @@
           <div class="card-header">
             <h2>安装服务</h2>
             <div class="log-actions">
-              <select class="log-level-select" id="logLevel" title="当前服务日志级别" onchange="setAppInstallLogLevel()">
+              <select class="log-level-select" id="logLevelP6" title="当前服务日志级别" onchange="setAppInstallLogLevel()">
                 <option value="trace">trace</option>
                 <option value="debug">debug</option>
                 <option value="info" selected>info</option>

+ 30 - 17
web-ui.service/web/pages/page9.html

@@ -1,3 +1,4 @@
+
 <!doctype html>
 <html lang="zh-CN">
 
@@ -12,11 +13,35 @@
       <div class="panes">
         <!-- 左栏 -->
         <div class="left-pane">
+
+          <!-- 设备状态 -->
+          <div class="card status-card">
+            <div class="card-header">
+              <h2>设备状态</h2>
+            </div>
+            <div class="status-content">
+              <div class="status-group">
+                <div class="status-item">
+                  <span>控制板最近的活动时间</span>
+                  <strong id="text1">--</strong>
+                </div>
+                <div class="status-item">
+                  <span>数据平台最近上报时间</span>
+                  <strong id="text2">--</strong>
+                </div>
+                <div class="status-item">
+                  <span>虫情照片最近上传时间</span>
+                  <strong id="text3">--</strong>
+                </div>
+              </div>
+            </div>
+          </div>
+
           <!-- 设备控制 -->
           <div class="card command-card">
             <div class="card-header">
               <h2>设备控制</h2>
-              <button class="btn auth-btn" id="p9AuthBtn" title="点击授权解锁操作" onclick="enableP9Buttons()">
+              <button class="btn auth-btn" id="p9AuthBtn" title="点击授权解锁操作" onclick="enableP9CtrlCmdButtons()">
                 <svg class="icon">
                   <use href="#i-unlock" xlink:href="#i-unlock"/>
                 </svg>
@@ -24,18 +49,6 @@
             </div>
 
             <div class="command-content">
-              <!-- 通信状态 -->
-              <div class="comm-status">
-                <div class="comm-item">
-                  <span>控制板最近活动时间</span>
-                  <strong id="text1">--</strong>
-                </div>
-                <div class="comm-item">
-                  <span>服务器最近交互时间</span>
-                  <strong id="text2">--</strong>
-                </div>
-              </div>
-
               <!-- 灯光控制 -->
               <div class="command-group">
                 <h3>灯光控制</h3>
@@ -102,7 +115,7 @@
             <div class="card-header">
               <h2>应用日志</h2>
               <div class="log-actions">
-                <select class="log-level-select" id="logLevel" title="当前服务日志级别" onchange="setCBDLogLevel()">
+                <select class="log-level-select" id="logLevelP9" title="当前服务日志级别" onchange="setCBDLogLevel()">
                   <option value="trace">trace</option>
                   <option value="debug">debug</option>
                   <option value="info" selected>info</option>
@@ -110,16 +123,16 @@
                   <option value="fatal">fatal</option>
                 </select>
                 <span style="margin:0 1px;"></span>
-                <button class="btn" title="复制当前屏显日志" onclick="copyLog('text4')">复制</button>
+                <button class="btn" title="复制当前屏显日志" onclick="copyLog('text5')">复制</button>
                 <span style="margin:0 1px;"></span>
-                <button class="btn" title="清除当前屏显日志" onclick="clearLog('text4')">清除</button>
+                <button class="btn" title="清除当前屏显日志" onclick="clearLog('text5')">清除</button>
                 <span style="margin:0 1px;"></span>
                 <button class="btn" title="下载服务日志文件" onclick="downloadCBDLogFile(event)">下载</button>
                 <span style="margin:0 1px;"></span>
                 <button class="btn" title="点击重启用户应用" onclick="restartCBDService(event)">重启</button>
               </div>
             </div>
-            <div class="output" id="text4">自动实时获取数据...</div>
+            <div class="output" id="text5">自动实时获取数据...</div>
           </div>
         </div>
       </div>

+ 50 - 23
web-ui.service/web/static/css/page9.css

@@ -33,17 +33,24 @@
     overflow: hidden;
 }
 
-/* 设备控制:占2/3 */
+/* 设备状态:固定高度 */
+.page-cbd .status-card {
+    flex: none;
+    height: 160px;
+}
+
+/* 设备控制:占剩余空间的3/4 */
 .page-cbd .command-card {
-    flex: 2;
+    flex: 3;
 }
 
-/* 固件升级:占1/3 */
+/* 固件升级:占剩余空间的1/4 */
 .page-cbd .firmware-card {
     flex: 1;
 }
 
 /* 左侧内容区域 */
+.page-cbd .status-content,
 .page-cbd .command-content,
 .page-cbd .firmware-content {
     flex: 1;
@@ -51,20 +58,23 @@
     overflow: auto;
 }
 
-/* 设备控制内容 */
-.page-cbd .command-content {
-    padding: 0;
+/* 设备状态内容 */
+.page-cbd .status-content {
+    display: flex;
+    align-items: center;
+    padding: 12px;
 }
 
-/* 通信状态 */
-.page-cbd .comm-status {
+/* 设备状态 */
+.page-cbd .status-group {
     display: grid;
-    grid-template-columns: repeat(2, minmax(0, 1fr));
+    grid-template-columns: repeat(3, minmax(0, 1fr));
     gap: 10px;
-    margin-bottom: 12px;
+    width: 100%;
+    margin-bottom: 0;
 }
 
-.page-cbd .comm-item {
+.page-cbd .status-item {
     display: flex;
     flex-direction: column;
     justify-content: center;
@@ -77,13 +87,15 @@
     background: #151f33;
 }
 
-.page-cbd .comm-item span {
-    color: #94a3b8;
-    font-size: 12px;
+/* 设备状态及控制分组标题 */
+.page-cbd .status-item span,
+.page-cbd .command-group h3 {
+    color: #e2e8f0;
+    font-size: 14px;
     font-weight: 500;
 }
 
-.page-cbd .comm-item strong {
+.page-cbd .status-item strong {
     color: #60a5fa;
     font-size: 16px;
     font-weight: 600;
@@ -91,6 +103,11 @@
     overflow-wrap: anywhere;
 }
 
+/* 设备控制内容 */
+.page-cbd .command-content {
+    padding: 0;
+}
+
 /* 控制分组 */
 .page-cbd .command-group {
     padding: 14px;
@@ -109,10 +126,6 @@
     margin: 0 0 12px;
     padding-left: 9px;
     border-left: 3px solid #3b82f6;
-    color: #dbeafe;
-    font-size: 14px;
-    font-weight: 600;
-    line-height: 18px;
 }
 
 /* 指令按钮布局 */
@@ -216,6 +229,24 @@
         overflow: visible;
     }
 
+    .page-cbd .status-card {
+        flex: none;
+        height: auto;
+        min-height: 140px;
+    }
+
+    .page-cbd .status-content {
+        flex: none;
+        min-height: auto;
+        align-items: stretch;
+        overflow: visible;
+    }
+
+    .page-cbd .status-group {
+        flex: none;
+        grid-template-columns: 1fr;
+    }
+
     .page-cbd .command-card {
         flex: none;
         min-height: 240px;
@@ -237,10 +268,6 @@
         grid-template-columns: 1fr;
     }
 
-    .page-cbd .comm-status {
-        grid-template-columns: 1fr;
-    }
-
     .page-cbd .log-actions {
         gap: 4px;
     }

+ 4 - 4
web-ui.service/web/static/js/page2.js

@@ -61,7 +61,7 @@ function getNetInfo3() {
 var netLogLevel = "";
 
 function setNetLogLevel() {
-    var level = logLevel.value;
+    var level = logLevelP2.value;
     fetch("/api/network/loglevel", {
         method: "POST",
         headers: { "Content-Type": "application/json" },
@@ -76,7 +76,7 @@ function setNetLogLevel() {
             netLogLevel = level;
         })
         .catch(function (e) {
-            logLevel.value = netLogLevel;
+            logLevelP2.value = netLogLevel;
         });
 }
 
@@ -92,11 +92,11 @@ function getNetLogLevel() {
         })
         .then(function (d) {
             netLogLevel = d.log_level;
-            logLevel.value = d.log_level;
+            logLevelP2.value = d.log_level;
         })
         .catch(function (e) {
             netLogLevel = "";
-            logLevel.value = "";
+            logLevelP2.value = "";
         });
 }
 

+ 4 - 4
web-ui.service/web/static/js/page3.js

@@ -1,7 +1,7 @@
 var timeLogLevel = "";
 
 function setTimeLogLevel() {
-    var level = logLevel.value;
+    var level = logLevelP3.value;
     fetch("/api/time/loglevel", {
         method: "POST",
         headers: { "Content-Type": "application/json" },
@@ -16,7 +16,7 @@ function setTimeLogLevel() {
             timeLogLevel = level;
         })
         .catch(function (e) {
-            logLevel.value = timeLogLevel;
+            logLevelP3.value = timeLogLevel;
         });
 }
 
@@ -32,11 +32,11 @@ function getTimeLogLevel() {
         })
         .then(function (d) {
             timeLogLevel = d.log_level;
-            logLevel.value = d.log_level;
+            logLevelP3.value = d.log_level;
         })
         .catch(function (e) {
             timeLogLevel = "";
-            logLevel.value = "";
+            logLevelP3.value = "";
         });
 }
 

+ 4 - 4
web-ui.service/web/static/js/page4.js

@@ -1,7 +1,7 @@
 var gnssLogLevel = "";
 
 function setGnssLogLevel() {
-    var level = logLevel.value;
+    var level = logLevelP4.value;
     fetch("/api/gnss/loglevel", {
         method: "POST",
         headers: { "Content-Type": "application/json" },
@@ -16,7 +16,7 @@ function setGnssLogLevel() {
             gnssLogLevel = level;
         })
         .catch(function (e) {
-            logLevel.value = gnssLogLevel;
+            logLevelP4.value = gnssLogLevel;
         });
 }
 
@@ -32,11 +32,11 @@ function getGnssLogLevel() {
         })
         .then(function (d) {
             gnssLogLevel = d.log_level;
-            logLevel.value = d.log_level;
+            logLevelP4.value = d.log_level;
         })
         .catch(function (e) {
             gnssLogLevel = "";
-            logLevel.value = "";
+            logLevelP4.value = "";
         });
 }
 

+ 4 - 4
web-ui.service/web/static/js/page5.js

@@ -1,7 +1,7 @@
 var cameraLogLevel = "";
 
 function setCameraLogLevel() {
-    var level = logLevel.value;
+    var level = logLevelP5.value;
     fetch("/api/camera/loglevel", {
         method: "POST",
         headers: { "Content-Type": "application/json" },
@@ -16,7 +16,7 @@ function setCameraLogLevel() {
             cameraLogLevel = level;
         })
         .catch(function (e) {
-            logLevel.value = cameraLogLevel;
+            logLevelP5.value = cameraLogLevel;
         });
 }
 
@@ -32,11 +32,11 @@ function getCameraLogLevel() {
         })
         .then(function (d) {
             cameraLogLevel = d.log_level;
-            logLevel.value = d.log_level;
+            logLevelP5.value = d.log_level;
         })
         .catch(function (e) {
             cameraLogLevel = "";
-            logLevel.value = "";
+            logLevelP5.value = "";
         });
 }
 

+ 4 - 4
web-ui.service/web/static/js/page6.js

@@ -1,7 +1,7 @@
 var appInsLogLevel = "";
 
 function setAppInstallLogLevel() {
-    var level = logLevel.value;
+    var level = logLevelP6.value;
     fetch("/api/app-install/loglevel", {
         method: "POST",
         headers: { "Content-Type": "application/json" },
@@ -16,7 +16,7 @@ function setAppInstallLogLevel() {
             appInsLogLevel = level;
         })
         .catch(function (e) {
-            logLevel.value = appInsLogLevel;
+            logLevelP6.value = appInsLogLevel;
         });
 }
 
@@ -32,11 +32,11 @@ function getAppInstallLogLevel() {
         })
         .then(function (d) {
             appInsLogLevel = d.log_level;
-            logLevel.value = d.log_level;
+            logLevelP6.value = d.log_level;
         })
         .catch(function (e) {
             appInsLogLevel = "";
-            logLevel.value = "";
+            logLevelP6.value = "";
         });
 }
 

+ 50 - 9
web-ui.service/web/static/js/page9.js

@@ -1,7 +1,7 @@
 var cbdLogLevel = "";
 
 function setCBDLogLevel() {
-    var level = logLevel.value;
+    var level = logLevelP9.value;
     fetch("/api/cbd/loglevel", {
         method: "POST",
         headers: { "Content-Type": "application/json" },
@@ -16,7 +16,7 @@ function setCBDLogLevel() {
             cbdLogLevel = level;
         })
         .catch(function (e) {
-            logLevel.value = cbdLogLevel;
+            logLevelP9.value = cbdLogLevel;
         });
 }
 
@@ -32,11 +32,11 @@ function getCBDLogLevel() {
         })
         .then(function (d) {
             cbdLogLevel = d.log_level;
-            logLevel.value = d.log_level;
+            logLevelP9.value = d.log_level;
         })
         .catch(function (e) {
             cbdLogLevel = "";
-            logLevel.value = "";
+            logLevelP9.value = "";
         });
 }
 
@@ -100,13 +100,13 @@ function restartCBDService(event) {
         });
 }
 
-function disableP9Buttons() {
+function disableP9CtrlCmdButtons() {
     for (var i = 1; i <= 12; i++) {
         setBtnStatus("p9btn" + (i < 10 ? "0" : "") + i, false, "page9");
     }
 }
 
-function enableP9Buttons() {
+function enableP9CtrlCmdButtons() {
     var password = prompt("请输入操作密码:");
     if (password === null) {
         return;
@@ -120,13 +120,54 @@ function enableP9Buttons() {
     }
     setBtnStatus("p9AuthBtn", false, "page9"); // 解锁成功后禁用开锁按钮
 }
+var cbdWorkStatusTimer = null;
+
+function getCBDWorkStatus() {
+    fetch("/api/cbd/getWorkStatus")
+        .then(function (r) {
+            if (!r.ok) {
+                throw new Error("HTTP " + r.status);
+            }
+            return r.json();
+        })
+        .then(function (data) {
+            setText("text1", data.mcuLastActiveTime, "page9");
+            setText("text2", data.dataReportOKTime,  "page9");
+            setText("text3", data.photoUploadOKTime, "page9");
+        })
+        .catch(function (e) {
+            console.error("getCBDWorkStatus() failed:", e);
+            setText("text1", null, "page9");
+            setText("text2", null, "page9");
+            setText("text3", null, "page9");
+        });
+    getCBDLogLevel()
+}
+
+function startCBDWorkStatusRefresh() {
+    if (cbdWorkStatusTimer) {
+        return;
+    }
+    getCBDWorkStatus();
+    cbdWorkStatusTimer = setInterval(function () {
+        getCBDWorkStatus();
+    }, 1000);
+}
+
+function stopCBDWorkStatusRefresh() {
+    if (cbdWorkStatusTimer) {
+        clearInterval(cbdWorkStatusTimer);
+        cbdWorkStatusTimer = null;
+    }
+}
 
 function initPage9() {
-  disableP9Buttons()
-  connectLog("yfkj-user-app.service", "text4");
-  getCBDLogLevel()
+  disableP9CtrlCmdButtons()
+  startCBDWorkStatusRefresh()
+  connectLog("yfkj-user-app.service", "text5");
 }
 
 function exitPage9() {
+  stopCBDWorkStatusRefresh()
   disconnectLog();
 }

+ 10 - 0
web-ui.service/web_route.go

@@ -291,6 +291,16 @@ var routes = []Route{
 	},
 
 	{
+		"/api/cbd/serverCfg",
+		cbdServerCfgHandler,
+	},
+
+	{
+		"/api/cbd/getWorkStatus",
+		cbdRunStatusHandler,
+	},
+
+	{
 		"/api/cbd/writeMCUData",
 		cbdWriteMCUDataHandler,
 	},