From ffdeee34afd3c28f603584e80039fc1dc30f1ff9 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 13 九月 2023 17:27:22 +0800
Subject: [PATCH] 下发工艺参数时记录该工序对应的设备位置
---
crontask/cron_task.go | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/crontask/cron_task.go b/crontask/cron_task.go
index 0ad2210..28301bf 100644
--- a/crontask/cron_task.go
+++ b/crontask/cron_task.go
@@ -3,10 +3,13 @@
import (
"apsClient/conf"
"apsClient/constvar"
+ "apsClient/nsq"
"apsClient/pkg/ecode"
"apsClient/pkg/logx"
"apsClient/service"
+ "fmt"
"github.com/go-co-op/gocron"
+ "github.com/spf13/cast"
"time"
)
@@ -29,6 +32,7 @@
finishNumber, err := service.PlcRead(plcConfig, constvar.PlcStartAddressTypeFinishNumber)
if err == nil && finishNumber != 0 {
service.PlcCacheSet(constvar.PlcCacheKeyFinishNumber, finishNumber)
+ _ = service.NewProgressService().UpdateProgress(cast.ToInt64(finishNumber))
}
logx.Infof("plc read finish number:%v, err:%v", finishNumber, err)
@@ -37,7 +41,7 @@
return err
}
- s.Every(totalNumberTimeInterval).Seconds().StartImmediately().Do(func() {
+ s.Every(totalNumberTimeInterval).Seconds().Do(func() {
plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
if code != ecode.OK {
return
@@ -49,6 +53,23 @@
logx.Infof("plc read total number:%v, err:%v", totalNumber, err)
})
+ s.Every(60).Seconds().StartImmediately().Do(SyncProductionProgress) //鍚屾鐢熶骇鏁版嵁
s.StartAsync()
return nil
}
+
+func SyncProductionProgress() {
+ progress, err := service.NewProgressService().GetCurrentProgress()
+ if err != nil {
+ return
+ }
+ if progress == nil {
+ return
+ }
+
+ 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())
+ }
+}
--
Gitblit v1.8.0