From b1114569135bbcbab8a095ebe37f4800183d2c5f Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 09 四月 2024 10:17:57 +0800
Subject: [PATCH] fix
---
crontask/cron_task.go | 36 +++++++++++++++---------------------
1 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/crontask/cron_task.go b/crontask/cron_task.go
index 2ee7286..d599a87 100644
--- a/crontask/cron_task.go
+++ b/crontask/cron_task.go
@@ -38,7 +38,7 @@
}
for _, addressItem := range plcConfig.Details {
if addressItem.FieldName == constvar.PlcStartAddressTypeFinishNumber {
- value, err := service.PlcReadDirect(plcConfig, addressItem.StartAddress, addressItem.Length, addressItem.Type)
+ value, err := service.PlcReadDirect(plcConfig, addressItem)
if err != nil {
logx.Infof("plc read finish number err: %v", err)
continue
@@ -49,22 +49,9 @@
_ = service.NewProgressService().UpdateProgress(conf.Conf.CurrentDeviceID, addressItem.Channel, finishNumber)
}
logx.Infof("plc read finish number: %v", finishNumber)
- }
- }
-
- })
- if err != nil {
- return err
- }
-
- s.Every(totalNumberTimeInterval).Seconds().Do(func() {
- plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
- if code != ecode.OK {
- return
- }
- for _, addressItem := range plcConfig.Details {
- if addressItem.FieldName == constvar.PlcStartAddressTypeTotalNumber {
- value, err := service.PlcReadDirect(plcConfig, addressItem.StartAddress, addressItem.Length, addressItem.Type)
+ time.Sleep(time.Second * 1)
+ } else if addressItem.FieldName == constvar.PlcStartAddressTypeTotalNumber {
+ value, err := service.PlcReadDirect(plcConfig, addressItem)
if err != nil {
logx.Infof("plc read total number err: %v", err)
continue
@@ -74,16 +61,20 @@
service.PlcCacheSet(conf.Conf.CurrentDeviceID, addressItem.Channel, constvar.PlcCacheKeyTotalNumber, totalNumber)
}
logx.Infof("plc read total number: %v", totalNumber)
+ time.Sleep(time.Second * 1)
}
- }
+ }
})
+ if err != nil {
+ return err
+ }
if isMaster {
s.Every(20).Seconds().Do(SyncProductionProgress) //鍚屾鐢熶骇鏁版嵁
- //s.Every(30).Seconds().Do(SyncTaskStatus) //鍚屾浠诲姟鐘舵��
- s.Every(10).Seconds().Do(CheckNsqConn) //鏌ヨnsq杩炴帴
- s.Every(30).Seconds().Do(ReportData) //涓婃姤鏁版嵁
+ s.Every(30).Seconds().Do(SyncTaskStatus) //鍚屾浠诲姟鐘舵��
+ s.Every(10).Seconds().Do(CheckNsqConn) //鏌ヨnsq杩炴帴
+ s.Every(30).Seconds().Do(ReportData) //涓婃姤鏁版嵁
}
s.Every(20).Seconds().Do(QueryClusterStatus) //鏌ヨ闆嗙兢鑺傜偣鏁伴噺
@@ -100,6 +91,9 @@
return
}
for _, progress := range progressList {
+ if progress.FinishedQuantity == 0 {
+ continue
+ }
caller := nsq.NewCaller(fmt.Sprintf(constvar.NsqTopicSyncTaskProgress, conf.Conf.NsqConf.NodeId), "")
err = caller.Send(progress)
if err != nil {
--
Gitblit v1.8.0