From b331c9990a0396301e934daffe095f99d62d1c89 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 27 九月 2023 15:58:49 +0800
Subject: [PATCH] 任务获取修改，状态2只返回已开始和已结束的
---
crontask/cron_task.go | 73 ++++++++++++++++++++++++++----------
1 files changed, 53 insertions(+), 20 deletions(-)
diff --git a/crontask/cron_task.go b/crontask/cron_task.go
index 28301bf..9454dbe 100644
--- a/crontask/cron_task.go
+++ b/crontask/cron_task.go
@@ -24,17 +24,26 @@
totalNumberTimeInterval = 60
}
s := gocron.NewScheduler(time.UTC)
- _, err := s.Every(finishNumberTimeInterval).Seconds().StartImmediately().Do(func() {
+ _, err := s.Every(finishNumberTimeInterval).Seconds().Do(func() {
plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
if code != ecode.OK {
return
}
- finishNumber, err := service.PlcRead(plcConfig, constvar.PlcStartAddressTypeFinishNumber)
- if err == nil && finishNumber != 0 {
- service.PlcCacheSet(constvar.PlcCacheKeyFinishNumber, finishNumber)
- _ = service.NewProgressService().UpdateProgress(cast.ToInt64(finishNumber))
+ for _, addressItem := range plcConfig.Details {
+ if addressItem.FieldName == constvar.PlcStartAddressTypeFinishNumber {
+ value, err := service.PlcReadDirect(plcConfig, addressItem.StartAddress, addressItem.Length, addressItem.Type)
+ if err != nil {
+ logx.Infof("plc read finish number err: %v", err)
+ continue
+ }
+ finishNumber := cast.ToInt64(value)
+ if finishNumber != 0 {
+ service.PlcCacheSet(addressItem.Channel, constvar.PlcCacheKeyFinishNumber, finishNumber)
+ _ = service.NewProgressService().UpdateProgress(addressItem.Channel, cast.ToInt64(finishNumber))
+ }
+ logx.Infof("plc read finish number: %v", finishNumber)
+ }
}
- logx.Infof("plc read finish number:%v, err:%v", finishNumber, err)
})
if err != nil {
@@ -46,30 +55,54 @@
if code != ecode.OK {
return
}
- totalNumber, err := service.PlcRead(plcConfig, constvar.PlcStartAddressTypeTotalNumber)
- if err == nil && totalNumber != 0 {
- service.PlcCacheSet(constvar.PlcCacheKeyTotalNumber, totalNumber)
+ for _, addressItem := range plcConfig.Details {
+ if addressItem.FieldName == constvar.PlcStartAddressTypeTotalNumber {
+ value, err := service.PlcReadDirect(plcConfig, addressItem.StartAddress, addressItem.Length, addressItem.Type)
+ if err != nil {
+ logx.Infof("plc read total number err: %v", err)
+ continue
+ }
+ totalNumber := cast.ToInt64(value)
+ if totalNumber != 0 {
+ service.PlcCacheSet(addressItem.Channel, constvar.PlcCacheKeyTotalNumber, totalNumber)
+ _ = service.NewProgressService().UpdateProgress(addressItem.Channel, cast.ToInt64(totalNumber))
+ }
+ logx.Infof("plc read total number: %v", totalNumber)
+ }
}
- logx.Infof("plc read total number:%v, err:%v", totalNumber, err)
+
})
- s.Every(60).Seconds().StartImmediately().Do(SyncProductionProgress) //鍚屾鐢熶骇鏁版嵁
+ s.Every(180).Seconds().Do(SyncProductionProgress) //鍚屾鐢熶骇鏁版嵁
s.StartAsync()
return nil
}
func SyncProductionProgress() {
- progress, err := service.NewProgressService().GetCurrentProgress()
- if err != nil {
+ plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
+ if code != ecode.OK {
return
}
- if progress == nil {
- 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
+ }
+
+ 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())
+ }
}
- 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