From b4a86051e9bf4888fd5d01c12232a26f3874e03b Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期四, 17 十月 2024 21:30:18 +0800
Subject: [PATCH] 完善epc读取楼层
---
service/nvcs.go | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/service/nvcs.go b/service/nvcs.go
index 848ebcd..6c331de 100644
--- a/service/nvcs.go
+++ b/service/nvcs.go
@@ -253,14 +253,6 @@
runStateStr = ""
}
- // 璁剧疆osd 鏍煎紡 "1F涓� 鍥� 鏋�"
- if config.NVCSConf.OSD != "" {
- floorText := fmt.Sprintf("%s%s %s", data.Elevator[0].Status.FloorName, runStateStr, config.NVCSConf.OSD)
-
- // 璋冪敤hik api 灏嗘枃瀛楁坊鍔犲埌osd鐨勫乏涓嬭
- AddFloorToOSD(floorText)
- }
-
// correct floor when elevator stopped.
//if elevator.Status.RunDir == 0 {
// go A1CorrectFloor()
@@ -283,12 +275,20 @@
ElevatorRunFloor = elevator.Status.FloorName
if config.RFIDConf.ReadFloor && rfidReader.EPCData != "" {
ElevatorRunFloor, _ = rfid.Parse2Floor(rfidReader.EPCData)
-
- if ElevatorRunFloor != elevator.Status.FloorName {
- logger.Warn("rfid epc %s, nvcs floor %s", ElevatorRunFloor, elevator.Status.FloorName)
+ logger.Debug("rfid read epc floor %s", ElevatorRunFloor)
+ if elevator.Status.RunDir == RunStop && ElevatorRunFloor != elevator.Status.FloorName {
+ logger.Warn("A floor error has occurred rfid epc %s, nvcs floor %s", ElevatorRunFloor, elevator.Status.FloorName)
}
}
+ // 璁剧疆osd 鏍煎紡 "1F涓� 鍥� 鏋�"
+ if config.NVCSConf.OSD != "" {
+ floorText := fmt.Sprintf("%s%s %s", ElevatorRunFloor, runStateStr, config.NVCSConf.OSD)
+
+ // 璋冪敤hik api 灏嗘枃瀛楁坊鍔犲埌osd鐨勫乏涓嬭
+ AddFloorToOSD(floorText)
+ }
+
go func() {
var d = models.Positions{
DeviceId: elevator.Name,
--
Gitblit v1.8.0