From 84fb8e390b83dc9482524c12d7af6c93405c3fc1 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 08 十二月 2023 16:36:32 +0800
Subject: [PATCH] debug
---
crontask/cron_task.go | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/crontask/cron_task.go b/crontask/cron_task.go
index 2bd87c3..2ee7286 100644
--- a/crontask/cron_task.go
+++ b/crontask/cron_task.go
@@ -43,10 +43,10 @@
logx.Infof("plc read finish number err: %v", err)
continue
}
- finishNumber := cast.ToInt64(value)
+ finishNumber := cast.ToInt(value)
if finishNumber != 0 {
service.PlcCacheSet(conf.Conf.CurrentDeviceID, addressItem.Channel, constvar.PlcCacheKeyFinishNumber, finishNumber)
- _ = service.NewProgressService().UpdateProgress(conf.Conf.CurrentDeviceID, addressItem.Channel, cast.ToInt64(finishNumber))
+ _ = service.NewProgressService().UpdateProgress(conf.Conf.CurrentDeviceID, addressItem.Channel, finishNumber)
}
logx.Infof("plc read finish number: %v", finishNumber)
}
@@ -80,10 +80,10 @@
})
if isMaster {
- s.Every(60).Seconds().Do(SyncProductionProgress) //鍚屾鐢熶骇鏁版嵁
- s.Every(30).Seconds().Do(SyncTaskStatus) //鍚屾浠诲姟鐘舵��
- s.Every(10).Seconds().Do(CheckNsqConn) //鏌ヨnsq杩炴帴
- s.Every(30).Seconds().Do(ReportData) //涓婃姤鏁版嵁
+ s.Every(20).Seconds().Do(SyncProductionProgress) //鍚屾鐢熶骇鏁版嵁
+ //s.Every(30).Seconds().Do(SyncTaskStatus) //鍚屾浠诲姟鐘舵��
+ s.Every(10).Seconds().Do(CheckNsqConn) //鏌ヨnsq杩炴帴
+ s.Every(30).Seconds().Do(ReportData) //涓婃姤鏁版嵁
}
s.Every(20).Seconds().Do(QueryClusterStatus) //鏌ヨ闆嗙兢鑺傜偣鏁伴噺
@@ -116,11 +116,15 @@
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,
+ WorkOrderId: record.WorkOrderId,
+ ProcedureID: record.ProcedureID,
+ DeviceId: record.DeviceId,
+ IsProcessing: record.IsProcessing,
+ IsFinish: record.IsFinish,
+ FinishAmount: record.FinishedQuantity,
+ ProductProcedureID: record.ProductProcedureID,
+ StartTs: record.StartTs,
+ FinishTs: record.FinishTs,
}
caller := nsq.NewCaller(fmt.Sprintf(constvar.NsqTopicTaskProcedureStatusUpdate, conf.Conf.NsqConf.NodeId), "")
err = caller.Send(msg)
@@ -131,7 +135,7 @@
syncOkIds = append(syncOkIds, record.ID)
}
if len(syncOkIds) > 0 {
- err = service.NewTaskService().RemoveTaskStatusSync(syncOkIds)
+ err = service.NewTaskService().FinishTaskStatusSync(syncOkIds)
if err != nil {
logx.Errorf("sync task status delete sync ok records error:%v", err)
}
--
Gitblit v1.8.0