From 56307a744dc94f9b1eed3f7513a4be16a130e984 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 17 十月 2023 17:20:25 +0800
Subject: [PATCH] 定时同步任务状态
---
crontask/cron_task.go | 68 ++++++++++++++++++++++++++++------
1 files changed, 56 insertions(+), 12 deletions(-)
diff --git a/crontask/cron_task.go b/crontask/cron_task.go
index 45072b2..2bdb2c2 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() error {
finishNumberTimeInterval := conf.Conf.PLC.FinishNumberTimeInterval
totalNumberTimeInterval := conf.Conf.PLC.TotalNumberTimeInterval
if finishNumberTimeInterval == 0 {
@@ -23,8 +25,8 @@
if totalNumberTimeInterval == 0 {
totalNumberTimeInterval = 60
}
- s := gocron.NewScheduler(time.UTC)
- _, err := s.Every(finishNumberTimeInterval).Seconds().StartImmediately().Do(func() {
+ s = gocron.NewScheduler(time.UTC)
+ _, err := s.Every(finishNumberTimeInterval).Seconds().Do(func() {
plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
if code != ecode.OK {
return
@@ -38,8 +40,8 @@
}
finishNumber := cast.ToInt64(value)
if finishNumber != 0 {
- service.PlcCacheSet(addressItem.Position, constvar.PlcCacheKeyFinishNumber, finishNumber)
- _ = service.NewProgressService().UpdateProgress(addressItem.Position, cast.ToInt64(finishNumber))
+ service.PlcCacheSet(addressItem.Channel, constvar.PlcCacheKeyFinishNumber, finishNumber)
+ _ = service.NewProgressService().UpdateProgress(addressItem.Channel, cast.ToInt64(finishNumber))
}
logx.Infof("plc read finish number: %v", finishNumber)
}
@@ -64,8 +66,8 @@
}
totalNumber := cast.ToInt64(value)
if totalNumber != 0 {
- service.PlcCacheSet(addressItem.Position, constvar.PlcCacheKeyTotalNumber, totalNumber)
- _ = service.NewProgressService().UpdateProgress(addressItem.Position, cast.ToInt64(totalNumber))
+ service.PlcCacheSet(addressItem.Channel, constvar.PlcCacheKeyTotalNumber, totalNumber)
+ _ = service.NewProgressService().UpdateProgress(addressItem.Channel, cast.ToInt64(totalNumber))
}
logx.Infof("plc read total number: %v", totalNumber)
}
@@ -73,7 +75,8 @@
})
- s.Every(60).Seconds().StartImmediately().Do(SyncProductionProgress) //鍚屾鐢熶骇鏁版嵁
+ s.Every(60).Seconds().Do(SyncProductionProgress) //鍚屾鐢熶骇鏁版嵁
+ s.Every(30).Seconds().Do(SyncTaskStatus) //鍚屾浠诲姟鐘舵��
s.StartAsync()
return nil
}
@@ -83,14 +86,14 @@
if code != ecode.OK {
return
}
- var positions []int
+ var channels []int32
for _, item := range plcConfig.Details {
if item.FieldName == constvar.PlcStartAddressTypeFinishNumber {
- positions = append(positions, item.Position)
+ channels = append(channels, item.Channel)
}
}
- for _, position := range positions {
- progress, err := service.NewProgressService().GetCurrentProgress(position)
+ for _, channel := range channels {
+ progress, err := service.NewProgressService().GetCurrentProgress(channel)
if err != nil {
return
}
@@ -104,5 +107,46 @@
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)
+ }
+ 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())
+ }
+ }
+}
+
+func StopTask() {
+ if s != nil {
+ s.Stop()
+ }
+}
+
+// Once 涓�娆℃�т换鍔�
+func Once() {
+ 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