findHikSpaceUser add state=1

liuxiaolong

2020-09-01 ca10e9d776509f54cb0251b7eae44cee74d94b2c

 service/carService.go

@@ -220,33 +220,35 @@
               personMap := sv.GetHikPersonMap()
               vehicleMap := sv.GetHikVehicleMap()
               for _,sp := range spaceList {
                  su := SpaceUser{
                     SpaceNo: sp.SpaceNo,
                     PlateNo: sp.PlateNo,
                  }
                  if sp.PlateNo != "" {
                     r := []rune(sp.PlateNo)
                     ncStr := string(r[1:]) //把第一位汉字剔除掉
                     newK := strings.ReplaceAll(ncStr, "D", "*")
                     newK = strings.ReplaceAll(newK, "0", "*")
                     personId := ""
                     if v,exist := vehicleMap[newK]; exist {
                        personId = v.PersonId
                  if sp.State == 1 {
                     su := SpaceUser{
                        SpaceNo: sp.SpaceNo,
                        PlateNo: sp.PlateNo,
                     }
                     if sp.PlateNo != "" {
                        r := []rune(sp.PlateNo)
                        ncStr := string(r[1:]) //把第一位汉字剔除掉
                        newK := strings.ReplaceAll(ncStr, "D", "*")
                        newK = strings.ReplaceAll(newK, "0", "*")
                        personId := ""
                        if v,exist := vehicleMap[newK]; exist {
                           personId = v.PersonId
                        }

                     if personId != "" {
                        su.CarType = "备案车"
                        if person, in := personMap[personId]; in {
                           su.Username = person.PersonName
                           su.PhoneNum = person.PhoneNo
                        if personId != "" {
                           su.CarType = "备案车"
                           if person, in := personMap[personId]; in {
                              su.Username = person.PersonName
                              su.PhoneNum = person.PhoneNo
                           }
                        } else {
                           su.CarType = "临时车"
                        }
                     } else {
                        su.CarType = "临时车"
                        su.PlateNo = "无车牌"
                     }
                  } else {
                     su.PlateNo = "无车牌"
                     resultList = append(resultList, su)
                  }
                  resultList = append(resultList, su)
               }
            }
         }