From fecd8ff508b33715cbe24ca892fc19a2d1ad1ef5 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 06 十一月 2023 16:34:05 +0800
Subject: [PATCH] 加锁解决同时读串口时报的资源不可用和超时报错
---
crontask/cron_task.go | 165 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 134 insertions(+), 31 deletions(-)
diff --git a/crontask/cron_task.go b/crontask/cron_task.go
index 505156d..aca64dd 100644
--- a/crontask/cron_task.go
+++ b/crontask/cron_task.go
@@ -3,18 +3,23 @@
import (
"apsClient/conf"
"apsClient/constvar"
+ "apsClient/model"
+ "apsClient/model/common"
"apsClient/nsq"
"apsClient/pkg/ecode"
"apsClient/pkg/logx"
+ "apsClient/serf"
"apsClient/service"
+ "apsClient/service/problem"
"fmt"
"github.com/go-co-op/gocron"
"github.com/spf13/cast"
"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,20 +28,25 @@
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
}
for _, addressItem := range plcConfig.Details {
if addressItem.FieldName == constvar.PlcStartAddressTypeFinishNumber {
- finishNumber, err := service.PlcReadDirect(plcConfig, addressItem.StartAddress, addressItem.Position)
- if err == nil && finishNumber != 0 {
- service.PlcCacheSet(addressItem.Position, constvar.PlcCacheKeyFinishNumber, finishNumber)
- _ = service.NewProgressService().UpdateProgress(addressItem.Position, cast.ToInt64(finishNumber))
+ value, err := service.PlcReadDirect(plcConfig, addressItem.StartAddress, addressItem.Length, addressItem.Type)
+ if err != nil {
+ logx.Infof("plc read finish number err: %v", err)
+ continue
}
- logx.Infof("plc read finish number:%v, err:%v", finishNumber, err)
+ 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)
}
}
@@ -52,47 +62,140 @@
}
for _, addressItem := range plcConfig.Details {
if addressItem.FieldName == constvar.PlcStartAddressTypeTotalNumber {
- totalNumber, err := service.PlcReadDirect(plcConfig, addressItem.StartAddress, addressItem.Position)
- if err == nil && totalNumber != 0 {
- service.PlcCacheSet(addressItem.Position, constvar.PlcCacheKeyTotalNumber, totalNumber)
- _ = service.NewProgressService().UpdateProgress(addressItem.Position, cast.ToInt64(totalNumber))
+ value, err := service.PlcReadDirect(plcConfig, addressItem.StartAddress, addressItem.Length, addressItem.Type)
+ if err != nil {
+ logx.Infof("plc read total number err: %v", err)
+ continue
}
- logx.Infof("plc read total number:%v, err:%v", totalNumber, err)
+ 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)
}
}
})
- s.Every(60).Seconds().StartImmediately().Do(SyncProductionProgress) //鍚屾鐢熶骇鏁版嵁
+ if isMaster {
+ s.Every(60).Seconds().Do(SyncProductionProgress) //鍚屾鐢熶骇鏁版嵁
+ s.Every(30).Seconds().Do(SyncTaskStatus) //鍚屾浠诲姟鐘舵��
+ s.Every(10).Seconds().Do(CheckNsqConn) //鏌ヨnsq杩炴帴
+
+ }
+
+ s.Every(20).Seconds().Do(QueryClusterStatus) //鏌ヨ闆嗙兢鑺傜偣鏁伴噺
+ s.Every(30).Seconds().Do(ProblemCheck) //闂璇婃柇
+
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 positions []int
- for _, item := range plcConfig.Details {
- if item.FieldName == constvar.PlcStartAddressTypeFinishNumber {
- positions = append(positions, item.Position)
- }
- }
- for _, position := range positions {
- progress, err := service.NewProgressService().GetCurrentProgress(position)
- 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, msg:%+v", err.Error(), msg)
+ }
+ 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.Errorf("send pull data msg error:%v, msg:%+v", err.Error(), msg)
+ }
+ msg = &common.MsgPullDataRequest{DataType: common.PullDataTypeProcessModelPlcAddress}
+ 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, msg:%+v", err.Error(), msg)
+ }
+}
+
+func QueryClusterStatus() {
+ clusterStatus, nodeQuantity := serf.QueryClusterStatusAndNodeQuantity()
+ conf.Conf.SerfClusterStatus = clusterStatus
+ conf.Conf.ClusterNodeQuantity = nodeQuantity
+}
+
+func ProblemCheck() {
+ problem.Check()
+}
+
+func CheckNsqConn() {
+ var err error
+ var status constvar.SystemStatusValue
+ if nsq.Ping() {
+ status = constvar.SystemStatusValueNormal
+ } else {
+ status = constvar.SystemStatusValueUnNormal
+ }
+ old, err := model.NewSystemStatusSearch().SetKey(constvar.SystemStatusKeyNsq).First()
+ if err != nil {
+ logx.Errorf("get nsq status err:%v", err)
+ return
+ }
+ if old.Value == status {
+ return
+ }
+ err = model.NewSystemStatusSearch().SetKey(constvar.SystemStatusKeyNsq).Updates(map[string]interface{}{"value": status})
+ if err != nil {
+ logx.Errorf("update nsq status err:%v", err)
+ }
}
--
Gitblit v1.8.0