From 07404c7cab7849a802bb37924700b0269e622280 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 28 十一月 2023 17:55:15 +0800
Subject: [PATCH] fix
---
conf/config.go | 64 +++++++++++++++++++++++++++++---
1 files changed, 58 insertions(+), 6 deletions(-)
diff --git a/conf/config.go b/conf/config.go
index 0216051..53632ae 100644
--- a/conf/config.go
+++ b/conf/config.go
@@ -4,8 +4,11 @@
"apsClient/pkg/convertx"
"apsClient/pkg/logx"
"apsClient/pkg/sqlitex"
+ "apsClient/pkg/timex"
+ "apsClient/utils"
"github.com/spf13/viper"
"log"
+ "time"
)
var (
@@ -58,6 +61,7 @@
Services struct {
ApsServer string
+ Serial string
}
nsqConf struct {
@@ -66,9 +70,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 +100,18 @@
//NsqConf
NsqConf nsqConf
- //PLC write address
- PLCAddresses []PLCAddressItem
+ //PLC
+ PLC plc
+
+ Prompt Prompt
+
+ CurrentDeviceID string //璁剧疆褰撳墠闈㈡澘鎺у埗鐨勮澶�
+
+ SerfClusterStatus string //闆嗙兢鐘舵��
+
+ ClusterNodeQuantity int //闆嗙兢鑺傜偣鏁伴噺
+
+ SystemDeviceRunSince int64 //绯荤粺寮�濮嬭繍琛屾椂闂存埑
}
)
@@ -111,6 +134,22 @@
if err := Viper.Unmarshal(&Conf); err != nil {
log.Fatalf("Unmarshal err:%v", err)
}
+ if Conf.PLC.StandbyTime == 0 {
+ Conf.PLC.StandbyTime = 300 //5鍒嗛挓
+ }
+
+ uptimeStr, err := utils.Exec("uptime -s")
+ if err == nil {
+ t, err := timex.StringToTime(uptimeStr)
+ if err == nil {
+ Conf.SystemDeviceRunSince = t.Unix()
+ }
+ } else {
+ Conf.SystemDeviceRunSince = time.Now().Unix()
+ }
+
+ SetUpTime()
+
ShowConfig()
}
@@ -127,6 +166,19 @@
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("......................................................")
}
+
+func SetUpTime() {
+ uptimeStr, err := utils.Exec("uptime -s")
+ if err == nil {
+ t, err := timex.StringToTime(uptimeStr)
+ if err == nil {
+ Conf.SystemDeviceRunSince = t.Unix()
+ }
+ } else {
+ Conf.SystemDeviceRunSince = time.Now().Unix()
+ }
+}
--
Gitblit v1.8.0