From 0b20ad5afbbdb2e91d1985021f1f8a45d838b134 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期日, 21 四月 2024 23:57:21 +0800
Subject: [PATCH] 修改字段名,方便检查代码
---
models/device.go | 10 +++++-----
repository/captureRepo.go | 2 +-
service/report.go | 2 +-
service/nvcs.go | 6 +++---
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/models/device.go b/models/device.go
index 89d2fb1..1fe4e4c 100644
--- a/models/device.go
+++ b/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"),
}
diff --git a/repository/captureRepo.go b/repository/captureRepo.go
index 14adb0a..15f4c34 100644
--- a/repository/captureRepo.go
+++ b/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)
diff --git a/service/nvcs.go b/service/nvcs.go
index 455b7c8..2848e6a 100644
--- a/service/nvcs.go
+++ b/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()
diff --git a/service/report.go b/service/report.go
index 400627e..2ce077c 100644
--- a/service/report.go
+++ b/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,
}
--
Gitblit v1.8.0