From 8324f872ef3a4d0c978a9b1d062800c6a1701c12 Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期五, 01 十二月 2023 09:58:17 +0800 Subject: [PATCH] fix --- crontask/cron_task.go | 63 +++++++++++++++++++++++++------ 1 files changed, 50 insertions(+), 13 deletions(-) diff --git a/crontask/cron_task.go b/crontask/cron_task.go index 153182a..dcc64c0 100644 --- a/crontask/cron_task.go +++ b/crontask/cron_task.go @@ -43,10 +43,10 @@ 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) } @@ -71,8 +71,7 @@ } 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) } @@ -81,10 +80,10 @@ }) 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) //鏌ヨ闆嗙兢鑺傜偣鏁伴噺 @@ -117,16 +116,21 @@ 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) } @@ -138,12 +142,45 @@ } } +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) + } + } +} + 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