设备信息增加设备名称字段

zhangqian

2023-11-07 e3e5b224ff6576e0266e63728dff5870d7c8877d

设备信息增加设备名称字段

 model/common/common.go

@@ -132,7 +132,8 @@
    ID                  string                 `gorm:"comment:主键ID;primaryKey;type:varchar(191);" json:"id"`
    DeviceProcedureAttr []*DeviceProcedureAttr `json:"deviceProcedureAttr"` // 设备工序属性列表
    ExtChannelAmount    int                    `gorm:"type:tinyint;comment:额外的通道数量;default:0;" json:"extChannelAmount"`
    DeviceMac           string                 `gorm:"type:varchar(191);comment:设备MAC" json:"deviceMac"`
    DeviceName          string                 `json:"deviceName"`
    DeviceMac           string                 `json:"deviceMac"`
    PlcAddressList      []*PlcAddress
    PlcConfig           *PlcConfig
}

 model/device.go

@@ -12,10 +12,11 @@
    Device struct {
        gorm.Model
        DeviceID         string   `gorm:"column:device_id;type:varchar(255);not null;unique" json:"deviceID"` //设备编号
        DeviceName       string   `gorm:"column:device_name;type:varchar(255);not null" json:"deviceName"`    //设备名称
        ExtChannelAmount int      `gorm:"type:tinyint;default:0" json:"extChannelAmount"`
        Procedures       string   `gorm:"column:procedure;type:varchar(255);not null;default ''" json:"procedures"` //设备支持的工序，用逗号分隔
        DeviceMac        string   `gorm:"type:varchar(255);" json:"deviceMac"`                                      //绑定的工控机设备ID
        ProceduresArr    []string `gorm:"-" json:"procedureAdd"`                                                    //设备支持的工序切片
        ProceduresArr    []string `gorm:"-" json:"ProceduresArr"`                                                   //设备支持的工序切片
    }

    DeviceSearch struct {

 nsq/msg_handler.go

@@ -268,6 +268,7 @@
        Procedures:       strings.Join(procedures, ","),
        ExtChannelAmount: msg.ExtChannelAmount,
        DeviceMac:        msg.DeviceMac,
        DeviceName:       msg.DeviceName,
    }

    oldRecord, err := model.NewDeviceSearch().SetDeviceId(msg.ID).First()
@@ -275,7 +276,8 @@
        err = model.NewDeviceSearch().Create(deviceRecord)
    } else if oldRecord.ExtChannelAmount != deviceRecord.ExtChannelAmount ||
        oldRecord.Procedures != deviceRecord.Procedures ||
        oldRecord.DeviceMac != deviceRecord.DeviceMac {
        oldRecord.DeviceMac != deviceRecord.DeviceMac ||
        oldRecord.DeviceName != deviceRecord.DeviceName {
        err = model.NewDeviceSearch().SetDeviceId(msg.ID).Save(deviceRecord)
    }