fix

zhangqian

2023-09-25 cf96f6bc1fb484fde16bd5ed6d49534c96958022

 crontask/cron_task.go

@@ -24,7 +24,7 @@
      totalNumberTimeInterval = 60
   }
   s := gocron.NewScheduler(time.UTC)
   _, err := s.Every(finishNumberTimeInterval).Seconds().StartImmediately().Do(func() {
   _, err := s.Every(finishNumberTimeInterval).Seconds().Do(func() {
      plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
      if code != ecode.OK {
         return
@@ -33,14 +33,15 @@
         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.Position, constvar.PlcCacheKeyFinishNumber, finishNumber)
               _ = service.NewProgressService().UpdateProgress(addressItem.Position, cast.ToInt64(finishNumber))
               service.PlcCacheSet(addressItem.Channel, constvar.PlcCacheKeyFinishNumber, finishNumber)
               _ = service.NewProgressService().UpdateProgress(addressItem.Channel, cast.ToInt64(finishNumber))
            }
            logx.Infof("plc read finish number:%v, err:%v", finishNumber, err)
            logx.Infof("plc read finish number: %v", finishNumber)
         }
      }

@@ -58,20 +59,21 @@
         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.Position, constvar.PlcCacheKeyTotalNumber, totalNumber)
               _ = service.NewProgressService().UpdateProgress(addressItem.Position, cast.ToInt64(totalNumber))
               service.PlcCacheSet(addressItem.Channel, constvar.PlcCacheKeyTotalNumber, totalNumber)
               _ = service.NewProgressService().UpdateProgress(addressItem.Channel, cast.ToInt64(totalNumber))
            }
            logx.Infof("plc read total number:%v, err:%v", totalNumber, err)
            logx.Infof("plc read total number: %v", totalNumber)
         }
      }

   })

   s.Every(60).Seconds().StartImmediately().Do(SyncProductionProgress) //同步生产数据
   s.Every(180).Seconds().Do(SyncProductionProgress) //同步生产数据
   s.StartAsync()
   return nil
}
@@ -81,14 +83,14 @@
   if code != ecode.OK {
      return
   }
   var positions []int
   var channels []int32
   for _, item := range plcConfig.Details {
      if item.FieldName == constvar.PlcStartAddressTypeFinishNumber {
         positions = append(positions, item.Position)
         channels = append(channels, item.Channel)
      }
   }
   for _, position := range positions {
      progress, err := service.NewProgressService().GetCurrentProgress(position)
   for _, channel := range channels {
      progress, err := service.NewProgressService().GetCurrentProgress(channel)
      if err != nil {
         return
      }