From 5bf9f5cc0ad2689de4e34d628d8ac3168df5142a Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期五, 23 八月 2024 17:41:41 +0800
Subject: [PATCH] 修复编译bug
---
service/nvcs.go | 104 +++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 90 insertions(+), 14 deletions(-)
diff --git a/service/nvcs.go b/service/nvcs.go
index 3cbd488..d5b1f41 100644
--- a/service/nvcs.go
+++ b/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,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)
@@ -188,6 +263,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"),
}
--
Gitblit v1.8.0