From 50d488d3df805ccb4ab7984a40ff74bda9b21a40 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 28 十一月 2023 09:57:42 +0800
Subject: [PATCH] 报工保存生产进度
---
model/device_plc.go | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/model/device_plc.go b/model/device_plc.go
index 94eda3c..a6e7331 100644
--- a/model/device_plc.go
+++ b/model/device_plc.go
@@ -13,15 +13,20 @@
// DevicePlc 璁惧鐨凱LC閰嶇疆
DevicePlc struct {
gorm.Model
- DeviceID string `gorm:"column:device_id;type:varchar(255);not null;default ''" json:"deviceID"` //璁惧缂栧彿
+ DeviceID string `gorm:"column:device_id;type:varchar(255);not null;unique" json:"deviceID"` //璁惧缂栧彿
Brand string `gorm:"type:varchar(191)" json:"brand"`
Method constvar.PlcMethod `gorm:"type:varchar(191)" json:"method"`
Address string `gorm:"type:varchar(191)" json:"address"` //plc ip鍦板潃锛� method = modbusTCP鐢�
Port int `json:"port"` //plc 绔彛鍙凤紝 method = modbusTCP鐢�
BaudRate int `json:"baudRate"` //涓插彛娉㈢壒鐜囷紝 method = serial鏃� 鐢�
SerialName string `json:"serialName"` //涓插彛鍚嶇О锛宮ethod = serial鏃� 鐢�
- IsOpen bool `json:"isOpen"`
- Detail string `gorm:"type:varchar(2048)" json:"-"`
+
+ DataBit int `gorm:"type:int(11)" json:"dataBit"` //鏁版嵁浣嶏紝method = modbusRTU 鐢�
+ StopBit int `gorm:"type:int(11)" json:"stopBit"` //鍋滄浣嶏紝method = modbusRTU 鐢�
+ Parity constvar.Parity `gorm:"type:int(11)" json:"parity"` //鏍￠獙鏂瑰紡锛宮ethod = modbusRTU 鐢�
+
+ IsOpen bool `json:"isOpen"`
+ Detail string `gorm:"type:varchar(2048)" json:"-"`
Details []*DevicePlcAddress `gorm:"-" json:"details"`
@@ -52,12 +57,15 @@
}
func (slf *DevicePlc) AfterFind(tx *gorm.DB) error {
- details := make([]*DevicePlcAddress, 0)
- err := json.Unmarshal([]byte(slf.Detail), &details)
- if err != nil {
- return err
+ if slf.Detail != "" {
+ details := make([]*DevicePlcAddress, 0)
+ err := json.Unmarshal([]byte(slf.Detail), &details)
+ if err != nil {
+ return err
+ }
+ slf.Details = details
}
- slf.Details = details
+
return nil
}
--
Gitblit v1.8.0