fix

zhangqian

2023-09-25 cf96f6bc1fb484fde16bd5ed6d49534c96958022

 crontask/cron_task.go

@@ -1,23 +1,48 @@
package crontask

import (
   "apsClient/conf"
   "apsClient/constvar"
   "apsClient/nsq"
   "apsClient/pkg/ecode"
   "apsClient/pkg/logx"
   "apsClient/service"
   "fmt"
   "github.com/go-co-op/gocron"
   "github.com/spf13/cast"
   "time"
)

func InitTask() error {

   finishNumberTimeInterval := conf.Conf.PLC.FinishNumberTimeInterval
   totalNumberTimeInterval := conf.Conf.PLC.TotalNumberTimeInterval
   if finishNumberTimeInterval == 0 {
      finishNumberTimeInterval = 6
   }
   if totalNumberTimeInterval == 0 {
      totalNumberTimeInterval = 60
   }
   s := gocron.NewScheduler(time.UTC)
   _, err := s.Every(2).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 {
         service.PlcCacheSet(constvar.PlcCacheKeyFinishNumber, 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)
         }
      }

   })
@@ -25,17 +50,59 @@
      return err
   }

   s.Every(1).Minutes().StartImmediately().Do(func() {
   s.Every(totalNumberTimeInterval).Seconds().Do(func() {
      plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
      if code != ecode.OK {
         return
      }
      totalNumber, err := service.PlcRead(plcConfig, constvar.PlcStartAddressTypeTotalNumber)
      if err == nil {
         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)
         }
      }

   })

   s.Every(180).Seconds().Do(SyncProductionProgress) //同步生产数据
   s.StartAsync()
   return nil
}

func SyncProductionProgress() {
   plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
   if code != ecode.OK {
      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())
      }
   }

}