From 5f9d9d62101e8762bdf2bc66d29891fe9e91c0f0 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期四, 22 八月 2024 18:30:18 +0800
Subject: [PATCH] 添加等待电梯运行时长的配置
---
config/config.go | 13 +++++++++----
repository/captureRepo.go | 2 +-
service/nvcs.go | 8 ++++++--
3 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/config/config.go b/config/config.go
index 5e15af7..95a0312 100644
--- a/config/config.go
+++ b/config/config.go
@@ -60,10 +60,11 @@
// 姊帶璁惧
type nvcs struct {
- Model string `mapstructure:"model"` // 鍨嬪彿
- Port string `mapstructure:"port"` // 绔彛
- OSD string `mapstructure:"osd"`
- RunState bool `mapstructure:"run-state"`
+ Model string `mapstructure:"model"` // 鍨嬪彿
+ Port string `mapstructure:"port"` // 绔彛
+ OSD string `mapstructure:"osd"`
+ RunState bool `mapstructure:"run-state"`
+ WaitRunTime int `mapstructure:"wait-run-time"`
}
type rateLimitConfig struct {
@@ -134,5 +135,9 @@
ImageConf.Enlarge = 100
}
+ if NVCSConf.WaitRunTime == 0 {
+ NVCSConf.WaitRunTime = 60
+ }
+
logger.SetLogLevel(LogConf.Level)
}
diff --git a/repository/captureRepo.go b/repository/captureRepo.go
index faa4b38..d1ecff6 100644
--- a/repository/captureRepo.go
+++ b/repository/captureRepo.go
@@ -227,7 +227,7 @@
floor = devPos.Pos
stopFloorId := devPos.Id
- for i := 0; i < 30; i++ {
+ for i := 0; i < config.NVCSConf.WaitRunTime; i++ {
if err := devPos.FindMovePosition(stopFloorId, floor); err == nil {
switch devPos.RunDir {
case service.RunUp:
diff --git a/service/nvcs.go b/service/nvcs.go
index 51bbba9..787716a 100644
--- a/service/nvcs.go
+++ b/service/nvcs.go
@@ -98,7 +98,7 @@
continue
}
- // 璁板綍鐢垫杩愯鐘舵��, 鍙褰曚笂琛屽拰涓嬭
+ // 璁板綍鐢垫杩愯鐘舵��
iRunSate = data.Elevator[0].Status.RunDir
if config.NVCSConf.RunState {
if data.Elevator[0].Status.RunDir == RunUp {
@@ -233,7 +233,7 @@
logger.Debug("Received A2 report data %+v", req)
- // 璁板綍鐢垫杩愯鐘舵��, 鍙褰曚笂琛屽拰涓嬭
+ // 璁板綍鐢垫杩愯鐘舵��
if strings.Contains(req.State.Status, "涓�") {
runState = "涓�"
iRunState = RunUp
@@ -252,6 +252,10 @@
// iRunState = RunDown
//}
+ if !config.NVCSConf.RunState {
+ runState = ""
+ }
+
if config.NVCSConf.OSD != "" {
floorText := fmt.Sprintf("%s%s %s", req.State.Floor, runState, config.NVCSConf.OSD)
--
Gitblit v1.8.0