From 66a85c70afb149986871febe17a4133b6995cd09 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 30 十一月 2023 19:58:02 +0800
Subject: [PATCH] dashboard接口和数据表
---
crontask/cron_task.go | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/crontask/cron_task.go b/crontask/cron_task.go
index 2bd87c3..24ffc22 100644
--- a/crontask/cron_task.go
+++ b/crontask/cron_task.go
@@ -80,7 +80,7 @@
})
if isMaster {
- s.Every(60).Seconds().Do(SyncProductionProgress) //鍚屾鐢熶骇鏁版嵁
+ 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) //涓婃姤鏁版嵁
@@ -115,12 +115,23 @@
}
syncOkIds := make([]uint, 0, len(records))
for _, record := range records {
+ var finishAmount int
+ if record.IsFinish {
+ progress, err := model.NewProductionProgressSearch(nil).SetWorkOrderId(record.WorkOrderId).SetProductProcedureId(record.ProductProcedureID).First()
+ if err == nil {
+ finishAmount = int(progress.FinishedQuantity)
+ }
+ }
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: finishAmount,
+ ProductProcedureID: record.ProductProcedureID,
+ StartTs: record.StartTs,
+ FinishTs: record.FinishTs,
}
caller := nsq.NewCaller(fmt.Sprintf(constvar.NsqTopicTaskProcedureStatusUpdate, conf.Conf.NsqConf.NodeId), "")
err = caller.Send(msg)
--
Gitblit v1.8.0