From 6afbcd88bf9c2c14a16a7c01f6f2e269d4ea2883 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 01 十一月 2023 15:53:30 +0800
Subject: [PATCH] fix
---
crontask/cron_task.go | 64 +++++++++++++++++++-------------
1 files changed, 38 insertions(+), 26 deletions(-)
diff --git a/crontask/cron_task.go b/crontask/cron_task.go
index 2bdb2c2..66ddf9b 100644
--- a/crontask/cron_task.go
+++ b/crontask/cron_task.go
@@ -7,6 +7,7 @@
"apsClient/nsq"
"apsClient/pkg/ecode"
"apsClient/pkg/logx"
+ "apsClient/serf"
"apsClient/service"
"fmt"
"github.com/go-co-op/gocron"
@@ -16,7 +17,7 @@
var s *gocron.Scheduler
-func StartTask() error {
+func StartTask(isMaster bool) error {
finishNumberTimeInterval := conf.Conf.PLC.FinishNumberTimeInterval
totalNumberTimeInterval := conf.Conf.PLC.TotalNumberTimeInterval
if finishNumberTimeInterval == 0 {
@@ -75,32 +76,24 @@
})
- s.Every(60).Seconds().Do(SyncProductionProgress) //鍚屾鐢熶骇鏁版嵁
- s.Every(30).Seconds().Do(SyncTaskStatus) //鍚屾浠诲姟鐘舵��
+ if isMaster {
+ s.Every(60).Seconds().Do(SyncProductionProgress) //鍚屾鐢熶骇鏁版嵁
+ s.Every(30).Seconds().Do(SyncTaskStatus) //鍚屾浠诲姟鐘舵��
+ }
+
+ s.Every(10).Seconds().Do(QueryClusterStatus) //鏌ヨ闆嗙兢鑺傜偣鏁伴噺
+
s.StartAsync()
return nil
}
func SyncProductionProgress() {
- plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
- if code != ecode.OK {
+ progressList, err := service.NewProgressService().GetProgressList()
+ if err != nil {
+ logx.Errorf("SyncProductionProgress get records err:%v", err)
return
}
- var channels []int32
- for _, item := range plcConfig.Details {
- if item.FieldName == constvar.PlcStartAddressTypeFinishNumber {
- channels = append(channels, item.Channel)
- }
- }
- for _, channel := range channels {
- progress, err := service.NewProgressService().GetCurrentProgress(channel)
- if err != nil {
- return
- }
- if progress == nil {
- return
- }
-
+ for _, progress := range progressList {
caller := nsq.NewCaller(fmt.Sprintf(constvar.NsqTopicSyncTaskProgress, conf.Conf.NsqConf.NodeId), "")
err = caller.Send(progress)
if err != nil {
@@ -114,6 +107,7 @@
if err != nil {
logx.Errorf("SyncTaskStatus get records err:%v", err)
}
+ syncOkIds := make([]uint, 0, len(records))
for _, record := range records {
msg := &common.MsgTaskStatusUpdate{
WorkOrderId: record.WorkOrderId,
@@ -127,26 +121,44 @@
if err != nil {
logx.Errorf("sync task status send msg error:%v", err.Error())
}
+ syncOkIds = append(syncOkIds, record.ID)
+ }
+ if len(syncOkIds) > 0 {
+ err = service.NewTaskService().RemoveTaskStatusSync(syncOkIds)
+ if err != nil {
+ logx.Errorf("sync task status delete sync ok records error:%v", err)
+ }
}
}
-func StopTask() {
+func RestartTask(isMaster bool) error {
if s != nil {
s.Stop()
}
+ return StartTask(isMaster)
}
// Once 涓�娆℃�т换鍔�
-func Once() {
+func Once(isMaster bool) {
+ if !isMaster {
+ return
+ }
msg := &common.MsgPullDataRequest{DataType: common.PullDataTypeProcessModel}
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
+}
--
Gitblit v1.8.0