From eba4eb850f0ecfb5839395aa125955ceaa2a454f Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 19 十月 2023 16:39:07 +0800
Subject: [PATCH] Merge branch 'feat-serf'
---
crontask/cron_task.go | 85 ++++++++++++++++++++++++++++++++----------
1 files changed, 65 insertions(+), 20 deletions(-)
diff --git a/crontask/cron_task.go b/crontask/cron_task.go
index 9454dbe..cd4e9e6 100644
--- a/crontask/cron_task.go
+++ b/crontask/cron_task.go
@@ -3,6 +3,7 @@
import (
"apsClient/conf"
"apsClient/constvar"
+ "apsClient/model/common"
"apsClient/nsq"
"apsClient/pkg/ecode"
"apsClient/pkg/logx"
@@ -13,8 +14,9 @@
"time"
)
-func InitTask() error {
+var s *gocron.Scheduler
+func StartTask(isMaster bool) error {
finishNumberTimeInterval := conf.Conf.PLC.FinishNumberTimeInterval
totalNumberTimeInterval := conf.Conf.PLC.TotalNumberTimeInterval
if finishNumberTimeInterval == 0 {
@@ -23,7 +25,7 @@
if totalNumberTimeInterval == 0 {
totalNumberTimeInterval = 60
}
- s := gocron.NewScheduler(time.UTC)
+ s = gocron.NewScheduler(time.UTC)
_, err := s.Every(finishNumberTimeInterval).Seconds().Do(func() {
plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
if code != ecode.OK {
@@ -73,36 +75,79 @@
})
- s.Every(180).Seconds().Do(SyncProductionProgress) //鍚屾鐢熶骇鏁版嵁
+ if isMaster {
+ s.Every(60).Seconds().Do(SyncProductionProgress) //鍚屾鐢熶骇鏁版嵁
+ s.Every(30).Seconds().Do(SyncTaskStatus) //鍚屾浠诲姟鐘舵��
+ }
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 {
logx.Errorf("SyncProductionProgress error:%v", err.Error())
}
}
+}
+func SyncTaskStatus() {
+ records, err := service.NewTaskService().GetTaskStatusSync(100)
+ 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,
+ ProcedureID: record.ProcedureID,
+ DeviceId: record.DeviceId,
+ IsProcessing: record.IsProcessing,
+ IsFinish: record.IsFinish,
+ }
+ 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())
+ }
+ 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 RestartTask(isMaster bool) error {
+ if s != nil {
+ s.Stop()
+ }
+ return StartTask(isMaster)
+}
+
+// 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())
+ }
+ caller = nsq.NewCaller(fmt.Sprintf(constvar.NsqTopicGetPlcAddress, conf.Conf.NsqConf.NodeId), "")
+ err = caller.Send(common.RequestPlcAddress{DeviceId: conf.Conf.System.DeviceId})
+ if err != nil {
+ logx.Infof("get plc address err: %v", err.Error())
+ }
}
--
Gitblit v1.8.0