From f2d80dbaa80a1283bf1c0fe9ae1d280832652d7f Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期四, 02 十一月 2023 18:14:22 +0800 Subject: [PATCH] 增加问题诊断定时任务和查询接口,增加按channel查询工序开始和结束时间 --- crontask/cron_task.go | 25 +++++++++++++++++++++---- 1 files changed, 21 insertions(+), 4 deletions(-) diff --git a/crontask/cron_task.go b/crontask/cron_task.go index cd4e9e6..42dc94b 100644 --- a/crontask/cron_task.go +++ b/crontask/cron_task.go @@ -7,7 +7,9 @@ "apsClient/nsq" "apsClient/pkg/ecode" "apsClient/pkg/logx" + "apsClient/serf" "apsClient/service" + "apsClient/service/problem" "fmt" "github.com/go-co-op/gocron" "github.com/spf13/cast" @@ -79,6 +81,10 @@ s.Every(60).Seconds().Do(SyncProductionProgress) //鍚屾鐢熶骇鏁版嵁 s.Every(30).Seconds().Do(SyncTaskStatus) //鍚屾浠诲姟鐘舵�� } + + s.Every(10).Seconds().Do(QueryClusterStatus) //鏌ヨ闆嗙兢鑺傜偣鏁伴噺 + s.Every(30).Seconds().Do(ProblemCheck) //闂璇婃柇 + s.StartAsync() return nil } @@ -143,11 +149,22 @@ caller := nsq.NewCaller(fmt.Sprintf(constvar.NsqTopicPullDataRequest, conf.Conf.NsqConf.NodeId), constvar.NsqTopicPullDataResponse) err := caller.Send(msg) if err != nil { - logx.Errorf("send pull data msg error:%v", err.Error()) + logx.Errorf("send pull data msg error:%v, msg:%+v", err.Error(), msg) } - caller = nsq.NewCaller(fmt.Sprintf(constvar.NsqTopicGetPlcAddress, conf.Conf.NsqConf.NodeId), "") - err = caller.Send(common.RequestPlcAddress{DeviceId: conf.Conf.System.DeviceId}) + msg = &common.MsgPullDataRequest{DataType: common.PullDataTypeDevice} + caller = nsq.NewCaller(fmt.Sprintf(constvar.NsqTopicPullDataRequest, conf.Conf.NsqConf.NodeId), constvar.NsqTopicPullDataResponse) + err = caller.Send(msg) if err != nil { - logx.Infof("get plc address err: %v", err.Error()) + logx.Errorf("send pull data msg error:%v, msg:%+v", err.Error(), msg) } } + +func QueryClusterStatus() { + clusterStatus, nodeQuantity := serf.QueryClusterStatusAndNodeQuantity() + conf.Conf.SerfClusterStatus = clusterStatus + conf.Conf.ClusterNodeQuantity = nodeQuantity +} + +func ProblemCheck() { + problem.Check() +} -- Gitblit v1.8.0