From 2d6875c93b25d0b7336c7fa11e066d213259fe2e Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期四, 25 四月 2024 10:02:01 +0800 Subject: [PATCH] 更改定时任务时区设置 --- crontask/cron_task.go | 38 ++++++++++++++++---------------------- 1 files changed, 16 insertions(+), 22 deletions(-) diff --git a/crontask/cron_task.go b/crontask/cron_task.go index 2ee7286..7f559d8 100644 --- a/crontask/cron_task.go +++ b/crontask/cron_task.go @@ -20,7 +20,7 @@ var s *gocron.Scheduler func init() { - s = gocron.NewScheduler(time.UTC) + s = gocron.NewScheduler(time.Local) } func StartTask(isMaster bool) error { finishNumberTimeInterval := conf.Conf.PLC.FinishNumberTimeInterval @@ -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