From 018e41d5d5f5c5175f22e957b33f69a8df6cf03f Mon Sep 17 00:00:00 2001 From: louwenzhi Date: Thu, 2 Sep 2021 11:17:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=AD=97=E6=AE=B5=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- meta/base/Printer.meta.go | 6 +++++- models/base/Printer.model.go | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/base/Printer.meta.go b/meta/base/Printer.meta.go index 2ab9ad3..7ec972a 100644 --- a/meta/base/Printer.meta.go +++ b/meta/base/Printer.meta.go @@ -25,6 +25,8 @@ var Printer_IpAddress = grmi.NewField("IpAddress", "Printer.IpAddress", "ipaddre var Printer_Active = grmi.NewField("Active", "Printer.Active", "active", grmi.TypeInt) var Printer_PrinterSpec = grmi.NewField("PrinterSpec", "Printer.PrinterSpec", "printerspec", grmi.TypeString) var Printer_PageSize = grmi.NewField("PageSize", "Printer.PageSize", "pagesize", grmi.TypeString) +var Printer_SerialName = grmi.NewField("SerialName", "[Printer].SerialName", "serialname", grmi.TypeString) +var Printer_SerialPort = grmi.NewField("SerialPort", "[Printer].SerialPort", "serialport", grmi.TypeInt) var Printer_Port = grmi.NewField("Port", "Printer.Port", "port", grmi.TypeInt) var Printer_PrintInterval = grmi.NewField("PrintInterval", "Printer.PrintInterval", "printinterval", grmi.TypeInt) var Printer_LastModify = grmi.NewField("LastModify", "Printer.LastModify", "lastmodify", grmi.TypeDateTime) @@ -53,6 +55,8 @@ var Printer = grmi.NewEntity( Printer_Active.Name: Printer_Active, Printer_PrinterSpec.Name: Printer_PrinterSpec, Printer_PageSize.Name: Printer_PageSize, + Printer_SerialName.Name: Printer_SerialName, + Printer_SerialPort.Name: Printer_SerialPort, Printer_Port.Name: Printer_Port, Printer_PrintInterval.Name: Printer_PrintInterval, Printer_LastModify.Name: Printer_LastModify, @@ -60,4 +64,4 @@ var Printer = grmi.NewEntity( Printer_CreateTime.Name: Printer_CreateTime, }, []string{"PlantNr"}, - []string{"Descr", "PrinterType", "PrinterName", "IpAddress", "Active", "PrinterSpec", "PageSize", "Port", "PrintInterval", "LastUser"}) + []string{"Descr", "PrinterType", "PrinterName", "IpAddress", "Active", "PrinterSpec", "PageSize", "SerialName", "SerialPort", "Port", "PrintInterval", "LastUser"}) diff --git a/models/base/Printer.model.go b/models/base/Printer.model.go index a03e4f2..dac0322 100644 --- a/models/base/Printer.model.go +++ b/models/base/Printer.model.go @@ -29,6 +29,8 @@ type Printer struct { Active int `xorm:"smallint 'Active' not null" json:"Printer-Active"` PrinterSpec string `xorm:"varchar(30) 'PrinterSpec' not null" json:"Printer-PrinterSpec"` PageSize string `xorm:"varchar(18) 'PageSize' not null" json:"Printer-PageSize"` + SerialName string `xorm:"varchar(100) 'SerialName' not null" json:"Printer-SerialName"` + SerialPort int `xorm:"int 'SerialPort' not null" json:"Printer-SerialPort"` Port int `xorm:"int 'Port' not null" json:"Printer-Port"` PrintInterval int `xorm:"int 'PrintInterval' not null" json:"Printer-PrintInterval"` LastModify grmi.DateTime `xorm:"datetime 'LastModify' not null updated" json:"Printer-LastModify"`