From 10c65da3d2af7056f48d9301e83f53f102f76e18 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 30 十月 2023 14:52:11 +0800
Subject: [PATCH] fix
---
conf/config.go | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/conf/config.go b/conf/config.go
index 0216051..1888f21 100644
--- a/conf/config.go
+++ b/conf/config.go
@@ -58,6 +58,7 @@
Services struct {
ApsServer string
+ Serial string
}
nsqConf struct {
@@ -66,9 +67,18 @@
NsqlookupdAddr string
}
- PLCAddressItem struct {
- FieldName string
- Address int
+ plc struct {
+ FinishNumberTimeInterval int
+ TotalNumberTimeInterval int
+ ModbusIntType string
+ SlaveId int
+ Package string
+ StandbyTime int64
+ }
+
+ Prompt struct {
+ SafeProduce string `json:"safeProduce,omitempty"`
+ PlcNotConnected string `json:"plcNotConnected,omitempty"`
}
config struct {
@@ -87,8 +97,10 @@
//NsqConf
NsqConf nsqConf
- //PLC write address
- PLCAddresses []PLCAddressItem
+ //PLC
+ PLC plc
+
+ Prompt Prompt
}
)
@@ -111,6 +123,9 @@
if err := Viper.Unmarshal(&Conf); err != nil {
log.Fatalf("Unmarshal err:%v", err)
}
+ if Conf.PLC.StandbyTime == 0 {
+ Conf.PLC.StandbyTime = 300 //5鍒嗛挓
+ }
ShowConfig()
}
@@ -127,6 +142,7 @@
log.Println("......................................................")
log.Printf(" System: %+v", Conf.System)
log.Printf(" Log: %+v", Conf.Log)
- log.Printf(" plc address: %+v", Conf.PLCAddresses)
+ log.Printf(" plc : %+v", Conf.PLC)
+ log.Printf(" services : %+v", Conf.Services)
log.Println("......................................................")
}
--
Gitblit v1.8.0