调整楼层获取方式

zhangzengfei

2024-10-20 5ddd4f4ba6aaf1fe52f93c0966315d0424bd2a5f

 repository/captureRepo.go

@@ -8,9 +8,9 @@
   "gat1400Exchange/client"
   "gat1400Exchange/config"
   "gat1400Exchange/models"
   "gat1400Exchange/nvcs"
   "gat1400Exchange/pkg"
   "gat1400Exchange/pkg/logger"
   "gat1400Exchange/service"
   "gat1400Exchange/util"
   "gat1400Exchange/vo"
)
@@ -94,14 +94,8 @@

         // 处理梯控填写的楼层信息 暂时使用otherFeature字段
         if face.OtherFeature != "" && pd.CameraFloor == "" {
            pd.CameraFloor, _ = pkg.RestoreFloor(face.OtherFeature)
            pd.Direction, pd.CameraFloor, _ = pkg.RestoreFloor(face.OtherFeature)
         }

         // 尝试从faceId提取楼层
         if pd.CameraFloor == "" && config.ClientConf.AddFloorToFaceId {
            pd.CameraFloor, _ = pkg.ParseFloorFromId(face.FaceID)
         }
         //logger.Debug("device %s, CameraFloor:%s", deviceId, pd.CameraFloor)

         payload, err := json.Marshal(pd)
         if err != nil {
@@ -182,10 +176,10 @@
            pd.CameraFloor = v.BehaviorDescription
         }

         // 尝试从faceId提取楼层
         if pd.CameraFloor == "" && config.ClientConf.AddFloorToFaceId {
            pd.CameraFloor, _ = pkg.ParseFloorFromId(v.PersonID)
         }
         //// 尝试从faceId提取楼层
         //if pd.CameraFloor == "" && config.ClientConf.AddFloorToFaceId {
         //   pd.CameraFloor, _ = pkg.ParseFloorFromId(v.PersonID)
         //}
         //logger.Debug("device %s, CameraFloor:%s", deviceId, pd.CameraFloor)

         payload, err := json.Marshal(pd)
@@ -220,20 +214,17 @@

   // 判断是否需要匹配楼层
   if config.NVCSConf.Model != "" {
      // 匹配楼层
      var devPos models.Positions
      _ = devPos.FindDevicePosition(deviceId, faceAppearTime.Unix()+5) // 加5秒电梯关门的时间

      floor = devPos.Pos
      runState := nvcs.FindPositionByTime(faceAppearTime.Unix() + 3) // 加3秒电梯关门的时间
      floor = runState.Floor

      for i := 0; i < config.NVCSConf.WaitRunTime; i++ {
         if err := devPos.FindMovePosition(faceAppearTime.Unix()+5, floor); err == nil {
            switch devPos.RunDir {
            case service.RunUp:
         if runState = nvcs.FindMovePosition(faceAppearTime.Unix()+3, floor); runState.Floor != "" {
            switch runState.RunState {
            case nvcs.RunUp:
               runDir = "in"
            case service.RunDown:
            case nvcs.RunDown:
               runDir = "out"
            case service.RunStop:
            case nvcs.RunStop:
               runDir = ""
            }

@@ -273,6 +264,7 @@

func (c CaptureRepository) VIIDFaceMsgForward(msg *vo.RequestFaceList) {
   faceInfo := msg.FaceListObject.FaceObject[0]
   var floor, runDir string

   // 判断是否开启了梯控
   if config.NVCSConf.Model != "" {
@@ -283,19 +275,32 @@
         faceAppearTime = time.Now()
      }

      var devPos models.Positions
      _ = devPos.FindPositionByTime(faceAppearTime.Unix() + 5) // 加5秒电梯关门的时间
      if devPos.Pos == "" {
         devPos.Pos = "1F"
      }
      runState := nvcs.FindPositionByTime(faceAppearTime.Unix() + 3) // 加3秒电梯关门的时间
      floor = runState.Floor

      for idx, face := range msg.FaceListObject.FaceObject {
         msg.FaceListObject.FaceObject[idx].OtherFeature, _ = pkg.ParseFloor(devPos.Pos)
         if config.ClientConf.AddFloorToFaceId {
            msg.FaceListObject.FaceObject[idx].FaceID = pkg.GenerateFaceIdContainFloor(face.FaceID, devPos.Pos)
      for i := 0; i < config.NVCSConf.WaitRunTime; i++ {
         if runState = nvcs.FindMovePosition(faceAppearTime.Unix()+3, floor); runState.Floor != "" {
            switch runState.RunState {
            case nvcs.RunUp:
               runDir = "in"
            case nvcs.RunDown:
               runDir = "out"
            case nvcs.RunStop:
               runDir = ""
            }

            break
         }

         time.Sleep(1 * time.Second)
      }

      for idx, _ := range msg.FaceListObject.FaceObject {
         msg.FaceListObject.FaceObject[idx].OtherFeature, _ = pkg.ParseFloor(runDir, floor)
         //if config.ClientConf.AddFloorToFaceId {
         //   msg.FaceListObject.FaceObject[idx].FaceID = pkg.GenerateFaceIdContainFloor(face.FaceID, devPos.Pos)
         //}
      }
   }

   b, _ := json.Marshal(msg)
@@ -317,17 +322,13 @@
      appearTime = time.Now()
   }

   var devPos models.Positions
   _ = devPos.FindPositionByTime(appearTime.Unix() + 5) // 加5秒电梯关门的时间
   if devPos.Pos == "" {
      devPos.Pos = "1F"
   }
   runState := nvcs.FindPositionByTime(appearTime.Unix() + 3) // 加3秒电梯关门的时间

   for idx, v := range msg.PersonListObject.PersonObject {
      msg.PersonListObject.PersonObject[idx].BehaviorDescription = devPos.Pos
      if config.ClientConf.AddFloorToFaceId {
         msg.PersonListObject.PersonObject[idx].PersonID = pkg.GenerateFaceIdContainFloor(v.PersonID, devPos.Pos)
      }
   for idx, _ := range msg.PersonListObject.PersonObject {
      msg.PersonListObject.PersonObject[idx].BehaviorDescription = runState.Floor
      //if config.ClientConf.AddFloorToFaceId {
      //   msg.PersonListObject.PersonObject[idx].PersonID = pkg.GenerateFaceIdContainFloor(v.PersonID, devPos.Pos)
      //}
   }

   b, _ := json.Marshal(msg)