修复运行方向的bug

zhangzengfei

2024-08-22 6f26cb4297ebaab4394e05e1a498e347ce290bb5

 service/nvcs.go

@@ -4,16 +4,18 @@
   "bytes"
   "encoding/json"
   "fmt"
   "github.com/gin-gonic/gin"
   "io/ioutil"
   "net"
   "net/http"
   "strings"
   "time"

   "gat1400Exchange/config"
   "gat1400Exchange/models"
   "gat1400Exchange/pkg/logger"
   "gat1400Exchange/util"

   "github.com/gin-gonic/gin"
   "golang.org/x/text/encoding/simplifiedchinese"
   "golang.org/x/text/transform"
)
@@ -66,6 +68,7 @@
   logger.Info("UDP server listening on port %s...", port)

   var runState string
   var iRunSate int
   // 无限循环等待接收数据
   for {
      // 创建一个缓冲区来存储接收的数据
@@ -95,19 +98,22 @@
         continue
      }

      // 记录电梯运行状态, 只记录上行和下行
      if data.Elevator[0].Status.RunDir == RunUp {
         runState = "上"
      } else if data.Elevator[0].Status.RunDir == RunDown {
         runState = "下"
      }
      // 记录电梯运行状态
      iRunSate = data.Elevator[0].Status.RunDir
      if config.NVCSConf.RunState {
         if data.Elevator[0].Status.RunDir == RunUp {
            runState = "上"
         } else if data.Elevator[0].Status.RunDir == RunDown {
            runState = "下"
         }

      // 已到最下层
      if data.Elevator[0].Status.Floor == 0 {
         runState = "上"
      }
      if data.Elevator[0].Status.Floor == data.Elevator[0].Status.TotalFloors {
         runState = "下"
         // 已到最下层
         if data.Elevator[0].Status.Floor == 0 {
            runState = "上"
         }
         if data.Elevator[0].Status.Floor == data.Elevator[0].Status.TotalFloors {
            runState = "下"
         }
      }

      // 设置osd  格式 "1F上 固 枪"
@@ -132,6 +138,7 @@
      var d = models.Positions{
         DeviceId:   elevator.Name,
         Pos:        elevator.Status.FloorName,
         RunDir:     iRunSate,
         CreateTime: time.Now().Unix(),
         TimeString: time.Now().Format("2006-01-02 15:04:05"),
      }
@@ -169,13 +176,55 @@
      Floor  string `json:"Floor"`
      Status string `json:"Status"`
      TFloor int64  `json:"TFloor"`
      Speed  string `json:"Speed"`
   } `json:"State"`
}

type A2ElevatorConfig struct {
   FloorData []string `json:"floordata"`
}

var A2TopFloor string
var A2BottomFloor string

func GetA2ElevatorConfig() {
   url := "http://192.168.10.253/cgi-bin/liftnum.cgi"
   payload := []byte("{\"display\":1}")
   header := map[string]string{
      "Cookie": "eyJuYW1lIjoiYWRtaW4iLCAicGFzZCI6ImFkbWluMTIzIn0=",
   }

   rsp, err := util.HttpPost(url, header, payload)
   if err != nil {
      logger.Warn("Get A2 floor data failure,%s", err.Error())
      return
   }

   var configData A2ElevatorConfig
   err = json.Unmarshal(rsp, &configData)
   if err != nil {
      logger.Warn("Unmarshal A2 floor data failure,%s", err.Error())
      return
   }

   if len(configData.FloorData) > 0 {
      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)
}

func NVCSA2WebServer() {
   // 先获取总楼层数, 记录最高层
   //GetA2ElevatorConfig()

   r := gin.Default()

   r.POST("/", func(c *gin.Context) {
      var req A2ElevatorData
      var runState string
      var iRunState int

      err := c.BindJSON(&req)
      if err != nil {
         c.JSON(http.StatusBadRequest, nil)
@@ -184,9 +233,31 @@

      logger.Debug("Received A2 report data %+v", req)

      // 记录电梯运行状态
      if strings.Contains(req.State.Status, "上") {
         runState = "上"
         iRunState = RunUp
      } else if strings.Contains(req.State.Status, "下") {
         runState = "下"
         iRunState = RunDown
      }

      //// 已到最下层
      //if req.State.Floor == A2BottomFloor {
      //   runState = "上"
      //   iRunState = RunUp
      //}
      //if req.State.Floor == A2TopFloor {
      //   runState = "下"
      //   iRunState = RunDown
      //}

      if !config.NVCSConf.RunState {
         runState = ""
      }

      if config.NVCSConf.OSD != "" {
         floorText := req.State.Floor
         floorText = floorText + " " + config.NVCSConf.OSD
         floorText := fmt.Sprintf("%s%s %s", req.State.Floor, runState, config.NVCSConf.OSD)

         // 调用hik api 将文字添加到osd的左下角
         AddFloorToOSD(floorText)
@@ -195,6 +266,7 @@
      var d = models.Positions{
         DeviceId:   req.Id,
         Pos:        req.State.Floor,
         RunDir:     iRunState,
         CreateTime: time.Now().Unix(),
         TimeString: time.Now().Format("2006-01-02 15:04:05"),
      }