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 | 100 +++++++++++++++++++++++++++++++++---------------- 1 files changed, 67 insertions(+), 33 deletions(-) diff --git a/crontask/cron_task.go b/crontask/cron_task.go index aca64dd..7f559d8 100644 --- a/crontask/cron_task.go +++ b/crontask/cron_task.go @@ -19,6 +19,9 @@ var s *gocron.Scheduler +func init() { + s = gocron.NewScheduler(time.Local) +} func StartTask(isMaster bool) error { finishNumberTimeInterval := conf.Conf.PLC.FinishNumberTimeInterval totalNumberTimeInterval := conf.Conf.PLC.TotalNumberTimeInterval @@ -28,7 +31,6 @@ if totalNumberTimeInterval == 0 { totalNumberTimeInterval = 60 } - s = gocron.NewScheduler(time.UTC) _, err := s.Every(finishNumberTimeInterval).Seconds().Do(func() { plcConfig, code := service.NewDevicePlcService().GetDevicePlc() if code != ecode.OK { @@ -36,53 +38,43 @@ } 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 } - finishNumber := cast.ToInt64(value) + finishNumber := cast.ToInt(value) if finishNumber != 0 { - service.PlcCacheSet(addressItem.Channel, constvar.PlcCacheKeyFinishNumber, finishNumber) - _ = service.NewProgressService().UpdateProgress(addressItem.Channel, cast.ToInt64(finishNumber)) + service.PlcCacheSet(conf.Conf.CurrentDeviceID, addressItem.Channel, constvar.PlcCacheKeyFinishNumber, finishNumber) + _ = 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 } totalNumber := cast.ToInt64(value) if totalNumber != 0 { - service.PlcCacheSet(addressItem.Channel, constvar.PlcCacheKeyTotalNumber, totalNumber) - _ = service.NewProgressService().UpdateProgress(addressItem.Channel, cast.ToInt64(totalNumber)) + 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(60).Seconds().Do(SyncProductionProgress) //鍚屾鐢熶骇鏁版嵁 + 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(20).Seconds().Do(QueryClusterStatus) //鏌ヨ闆嗙兢鑺傜偣鏁伴噺 @@ -99,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 { @@ -115,23 +110,55 @@ syncOkIds := make([]uint, 0, len(records)) for _, record := range records { msg := &common.MsgTaskStatusUpdate{ - WorkOrderId: record.WorkOrderId, - ProcedureID: record.ProcedureID, - DeviceId: record.DeviceId, - IsProcessing: record.IsProcessing, - IsFinish: record.IsFinish, + WorkOrderId: record.WorkOrderId, + ProcedureID: record.ProcedureID, + DeviceId: record.DeviceId, + IsProcessing: record.IsProcessing, + IsFinish: record.IsFinish, + FinishAmount: record.FinishedQuantity, + ProductProcedureID: record.ProductProcedureID, + StartTs: record.StartTs, + FinishTs: record.FinishTs, } caller := nsq.NewCaller(fmt.Sprintf(constvar.NsqTopicTaskProcedureStatusUpdate, conf.Conf.NsqConf.NodeId), "") err = caller.Send(msg) if err != nil { logx.Errorf("sync task status send msg error:%v", err.Error()) + continue } syncOkIds = append(syncOkIds, record.ID) } if len(syncOkIds) > 0 { - err = service.NewTaskService().RemoveTaskStatusSync(syncOkIds) + err = service.NewTaskService().FinishTaskStatusSync(syncOkIds) if err != nil { logx.Errorf("sync task status delete sync ok records error:%v", err) + } + } +} + +func ReportData() { + records, err := model.NewReportsToCloudSearch(nil).SetOrder("id desc").SetPage(1, 100).FindNotTotal() + if err != nil { + logx.Errorf("ReportData get records err:%v", err) + } + okIds := make([]uint, 0, len(records)) + for _, record := range records { + msg := &common.MsgReportData{ + ReportType: record.ReportType, + Content: record.Content, + } + caller := nsq.NewCaller(fmt.Sprintf(constvar.NsqTopicApsClientReportData, conf.Conf.NsqConf.NodeId), "") + err = caller.Send(msg) + if err != nil { + logx.Errorf("sync task status send msg error:%v", err.Error()) + continue + } + okIds = append(okIds, record.ID) + } + if len(okIds) > 0 { + err = model.NewReportsToCloudSearch(nil).SetIDs(okIds).Delete() + if err != nil { + logx.Errorf("ReportData delete report ok records error:%v", err) } } } @@ -139,8 +166,15 @@ func RestartTask(isMaster bool) error { if s != nil { s.Stop() + s.Clear() } - return StartTask(isMaster) + err := StartTask(isMaster) + if err != nil { + logx.Errorf("restart task failed:%v", err) + return err + } + logx.Infof("restart task ok, isMaster:", isMaster) + return nil } // Once 涓�娆℃�т换鍔� -- Gitblit v1.8.0