修改字段名,方便检查代码

zhangzengfei

2024-04-21 0b20ad5afbbdb2e91d1985021f1f8a45d838b134

修改字段名,方便检查代码

 models/device.go

@@ -9,7 +9,7 @@
    Id         string `gorm:"column:id;primary_key;" json:"id"`
    Name       string `gorm:"column:name" json:"name"`
    Addr       string `gorm:"column:addr" json:"addr"`
    Pos        string `gorm:"column:pos" json:"pos"`
    Floor      string `gorm:"column:pos" json:"pos"`
    Ext        string `gorm:"column:ext" json:"ext"`
    Ip         string `gorm:"column:ip" json:"ip"`
    CreateTime int64  `gorm:"column:create_time;autoCreateTime;" json:"-"`
@@ -47,21 +47,21 @@
        }
    } else {
        // 记录存在，更新现有记录
        if d.Pos == "" || d.Ip == "" {
        if d.Floor == "" || d.Ip == "" {
            return nil
        }

        existingDevice.Pos = d.Pos
        existingDevice.Floor = d.Floor
        existingDevice.Ip = d.Ip

        db.Save(&existingDevice)
    }

    // 记录位置的历史, 给人脸抓拍匹配楼层
    if existingDevice.Pos != "" {
    if existingDevice.Floor != "" {
        var pos = Positions{
            DeviceId:   d.Id,
            Pos:        d.Pos,
            Pos:        d.Floor,
            CreateTime: time.Now().Unix(),
            TimeString: time.Now().Format("2006-01-02 15:04:05"),
        }

 repository/captureRepo.go

@@ -169,7 +169,7 @@
    var devPos models.Positions
    _ = devPos.FindDevicePosition(deviceId, faceAppearTime.Unix()+5) // 加5秒电梯关门的时间
    if devPos.Pos == "" {
        devPos.Pos = device.Pos
        devPos.Pos = device.Floor
    }

    pd.PicMaxImages = append(pd.PicMaxImages, bgImgBytes)

 service/nvcs.go

@@ -97,9 +97,9 @@
        }

        var d = models.Device{
            Id:  elevator.Name,
            Pos: elevator.Status.FloorName,
            Ip:  elevator.IP,
            Id:    elevator.Name,
            Floor: elevator.Status.FloorName,
            Ip:    elevator.IP,
        }

        err = d.Upsert()

 service/report.go

@@ -60,7 +60,7 @@
            Code:      dev.Id,
            Type:      "camera",
            Name:      dev.Name,
            Addr:      dev.Addr+dev.Pos,
            Addr:      dev.Addr+dev.Floor,
            IpAddr:    dev.Ip,
        }