From 5abbb114d703b40d2a42e9e3eecdadcb6d341dcf Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期一, 29 四月 2024 03:51:11 +0800
Subject: [PATCH] 修复keepalive地址
---
service/nvcs.go | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/service/nvcs.go b/service/nvcs.go
index 7a4605b..b2e9124 100644
--- a/service/nvcs.go
+++ b/service/nvcs.go
@@ -6,6 +6,7 @@
"fmt"
"io/ioutil"
"net"
+ "strings"
"gat1400Exchange/config"
"gat1400Exchange/models"
@@ -54,7 +55,7 @@
}
defer conn.Close()
- logger.Debug("UDP server listening on port %s...", port)
+ logger.Info("UDP server listening on port %s...", port)
// 鏃犻檺寰幆绛夊緟鎺ユ敹鏁版嵁
for {
@@ -85,11 +86,24 @@
continue
}
+ if data.Elevator[0].Status.RunDir > 0 {
+ continue
+ }
+
elevator := data.Elevator[0]
+
+ // 绋嬪簭閮ㄧ讲鍦ㄨ澶囩, 瀛楃鍙犲姞鍣ㄤ笂鎶ョ殑鍚嶇О鍏佽涓虹┖. 鍦ㄤ簯绔�, 鍚嶇О蹇呴』涓庢憚鍍忔満鐩稿悓
+ if !config.ClientConf.Enable {
+ elevator.Name = strings.Trim(elevator.Name, " ")
+ if elevator.Name == "" {
+ continue
+ }
+ }
+
var d = models.Device{
- Id: elevator.Name,
- Pos: elevator.Status.FloorName,
- Ip: elevator.IP,
+ Id: elevator.Name,
+ Floor: elevator.Status.FloorName,
+ Ip: elevator.IP,
}
err = d.Upsert()
--
Gitblit v1.8.0