zhangqian
2023-11-28 762dd6158767829ba94e32a3fa0cb00fca320716
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,20 @@
   }
   syncOkIds := make([]uint, 0, len(records))
   for _, record := range records {
      var finishAmount int
      if record.IsFinish {
         progress, err := model.NewProductionProgressSearch(nil).SetProcedureId(record.ProcedureID).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,
         FinishAmount: finishAmount,
      }
      caller := nsq.NewCaller(fmt.Sprintf(constvar.NsqTopicTaskProcedureStatusUpdate, conf.Conf.NsqConf.NodeId), "")
      err = caller.Send(msg)