完善epc读取楼层

zhangzengfei

2024-10-17 b4a86051e9bf4888fd5d01c12232a26f3874e03b

 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,