From 96d0d182e4b1e5ad094bf6d5cfaae3ba19c0d9a0 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期四, 13 六月 2024 19:13:40 +0800
Subject: [PATCH] 修复A2运行状态显示的bug
---
service/nvcs.go | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/service/nvcs.go b/service/nvcs.go
index 3b6aac5..62c9386 100644
--- a/service/nvcs.go
+++ b/service/nvcs.go
@@ -7,6 +7,7 @@
"io/ioutil"
"net"
"net/http"
+ "strings"
"time"
"gat1400Exchange/config"
@@ -167,10 +168,10 @@
type A2ElevatorData struct {
Id string `json:"id"`
State struct {
- Floor string `json:"Floor"`
- Status string `json:"Status"`
- TFloor int64 `json:"TFloor"`
- Speed float64 `json:"Speed"`
+ Floor string `json:"Floor"`
+ Status string `json:"Status"`
+ TFloor int64 `json:"TFloor"`
+ Speed string `json:"Speed"`
} `json:"State"`
}
@@ -202,7 +203,7 @@
}
if len(configData.FloorData) > 0 {
- A2BottomFloor, A2TopFloor = configData.FloorData[0], configData.FloorData[len(configData.FloorData[0])-1]
+ A2BottomFloor, A2TopFloor = configData.FloorData[0], configData.FloorData[len(configData.FloorData)-1]
}
logger.Info("A2 floor config total:%d, bottomFloor:%s, topFloor:%s", len(configData.FloorData), A2BottomFloor, A2TopFloor)
@@ -226,9 +227,9 @@
logger.Debug("Received A2 report data %+v", req)
// 璁板綍鐢垫杩愯鐘舵��, 鍙褰曚笂琛屽拰涓嬭
- if req.State.Speed > 0 {
+ if strings.Contains(req.State.Status, "涓�") {
runState = "涓�"
- } else if req.State.Speed < 0 {
+ } else if strings.Contains(req.State.Status, "涓�") {
runState = "涓�"
}
--
Gitblit v1.8.0