修复编译bug

zhangzengfei

2024-08-23 5bf9f5cc0ad2689de4e34d628d8ac3168df5142a

 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"
)
@@ -94,18 +96,26 @@
         continue
      }

      // 设置osd  格式 "1F 固 枪"
      if config.NVCSConf.OSD != "" {
         floorText := data.Elevator[0].Status.FloorName
         //if data.Elevator[0].Status.RunDir == RunStop {
         //   floorText = floorText + "停"
         //} else if data.Elevator[0].Status.RunDir == RunUp {
         //   floorText = floorText + "上"
         //} else {
         //   floorText = floorText + "下"
         //}
      var runState string
      var iRunSate int

         floorText = floorText + " " + config.NVCSConf.OSD
      // 记录电梯运行状态
      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 !config.NVCSConf.RunState {
         runState = ""
      }

      // 设置osd  格式 "1F上 固 枪"
      if config.NVCSConf.OSD != "" {
         floorText := fmt.Sprintf("%s%s %s", data.Elevator[0].Status.FloorName, runState, config.NVCSConf.OSD)

         // 调用hik api 将文字添加到osd的左下角
         AddFloorToOSD(floorText)
@@ -125,6 +135,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"),
      }
@@ -162,13 +173,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)
@@ -177,9 +230,40 @@

      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 := fmt.Sprintf("%s%s %s", req.State.Floor, runState, config.NVCSConf.OSD)

         // 调用hik api 将文字添加到osd的左下角
         AddFloorToOSD(floorText)
      }

      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"),
      }