camera表结构修改

app/dao/cameraDto.go

@@ -4,35 +4,34 @@ import "time"
 
 //CameraDevice 网关下挂载的设备, 摄像头
 type CameraDevice struct {
-	ID               string    `gorm:"type:int;comment '编号';primary_key"`
-	Name             string    `gorm:"type:varchar(64);comment '设备名称'"`
-	GatewayId        string    `gorm:"type:varchar(32);comment '所属网关'"`
-	IP               string    `gorm:"type:varchar(40);null;comment 'IP地址'"`
-	SN               string    `gorm:"type:varchar(64);comment '设备序列号'"`
-	CameraType       int       `gorm:"type:int;null;comment '摄像机类型 0=枪机,1=球机'"`
-	Brand            int       `gorm:"type:int;null; comment '设备品牌'"`
-	Model            int       `gorm:"type:int;null; comment '设备型号'"`
-	GroupId          int       `gorm:"type:int;null;comment '灯杆分组ID'"`
-	LampPoleId       int       `gorm:"type:int;null;comment '归属灯杆 灯杆ID'"`
-	LampPoleName     string    `gorm:"type:varchar(64);null;comment '灯杆名称'"`
-	LampPoleSn       string    `gorm:"type:varchar(64);null;comment '灯杆sn'"`
-	LampPoleLocation string    `gorm:"type:varchar(255);null;comment '灯杆安装位置'"`
-	LampLat          float64   `gorm:"type:double(17,14);null; comment '经度'"`
-	LampLng          float64   `gorm:"type:double(17,14) null; comment '纬度'"`
-	RatedPower       float32   `gorm:"type:float(8,2) null; comment '功率'"`
-	MonitorAddress   string    `gorm:"type:varchar(255);null;comment '监控地址 ip:端口'"`
-	DevType          int       `gorm:"type:int;null;comment '3摄像机'"`
-	Tenant           string    `gorm:"type:varchar(8);null;comment '租户ID"`
-	InstallTime      time.Time `gorm:"type:date;null;comment '安装时间'"`
-	CreateTime       time.Time `gorm:"type:datetime;null;comment '新增时间'"`
-	CreateUser       string    `gorm:"type:varchar(60);null;comment '新增记录操作用户ID'"`
-	UpdateTime       time.Time `gorm:"type:datetime;null;comment '修改时间'"`
-	UpdateUser       string    `gorm:"type:varchar(60)"`   //修改用户
-	IsDeleted        int       `gorm:"type:int"`           //是否删除 0=未删除,1=删除
-	Status           int       `gorm:"type:int"`           //状态 0=正常,1=异常
-	Tag              string    `gorm:"type:varchar(255)"`  //标签，(备用，逗号区分)
-	IsEnable         int       `gorm:"type:int;default 2"` // 启用禁用：1启用，2禁用
-	StreamId         string    `gorm:"type:varchar(100)"`  // 流id
+	ID               string    `gorm:"type:int;primary_key"`         //编号
+	DeviceName       string    `gorm:"type:varchar(64)"`             //设备名称
+	DeviceSN         string    `gorm:"type:varchar(64)"`             //设备序列号
+	CameraType       int       `gorm:"type:int"`                     //摄像机类型 0=枪机,1=球机
+	GatewayId        string    `gorm:"type:varchar(32)"`             //所属网关
+	LampPoleId       int       `gorm:"type:int"`                     //归属灯杆 灯杆ID
+	LampPoleName     string    `gorm:"type:varchar(64)"`             //灯杆名称
+	LampPoleSn       string    `gorm:"type:varchar(64)"`             //灯杆sn
+	LampPoleLocation string    `gorm:"type:varchar(255)"`            //灯杆安装位置
+	LampLat          float64   `gorm:"type:double(17,14)"`           //经度
+	LampLng          float64   `gorm:"type:double(17,14)"`           //纬度
+	GroupId          int       `gorm:"type:int"`                     //灯杆分组ID
+	BrandId          int       `gorm:"type:int"`                     //设备品牌
+	ModelId          int       `gorm:"type:int"`                     //设备型号
+	RatedPower       float32   `gorm:"type:float(8,2);default 0.00"` //功率
+	MonitorAddress   string    `gorm:"type:varchar(255)"`            //监控地址 ip:端口
+	IPAddress        string    `gorm:"type:varchar(40)"`             //IP地址
+	InstallTime      time.Time `gorm:"type:date"`                    //安装时间
+	TenantId         string    `gorm:"type:varchar(12)"`             //租户ID
+	CreateTime       time.Time `gorm:"type:datetime"`                //新增时间
+	CreateUser       string    `gorm:"type:varchar(60)"`             //新增记录操作用户ID
+	UpdateTime       time.Time `gorm:"type:datetime"`                //修改时间
+	UpdateUser       string    `gorm:"type:varchar(60)"`             //修改用户
+	IsDeleted        int       `gorm:"type:int;default 0"`           //是否删除 0=未删除,1=删除
+	Status           int       `gorm:"type:int"`                     //状态 0=正常,1=异常
+	Tag              string    `gorm:"type:varchar(255)"`            //标签，(备用，逗号区分)
+	IsEnable         int       `gorm:"type:int;default 2"`           //启用禁用：1启用，2禁用
+	StreamId         string    `gorm:"type:varchar(100)"`            //流id
 }
 
 func (CameraDevice) TableName() string {
@@ -55,8 +54,8 @@ func (c CameraDevice) SaveFromWeb() error {
 		return err
 	}
 	if has { //更新
-		return GDb.Model(&c).Updates(map[string]interface{}{"name": c.Name, "gateway_id": c.GatewayId,
-			"dev_type": c.DevType, "tenant": c.Tenant, "state": c.Status}).Error
+		return GDb.Model(&c).Updates(map[string]interface{}{"device_name": c.DeviceName, "gateway_id": c.GatewayId,
+			"tenant_id": c.TenantId, "status": c.Status}).Error
 	} else { //插入
 		return GDb.Create(&c).Error
 	}