From 163d9e7f1fbf65b9a0e63baac017555b47a28bc4 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 01 九月 2023 21:11:29 +0800
Subject: [PATCH] fix

---
 crontask/cron_task.go |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/crontask/cron_task.go b/crontask/cron_task.go
index b50db4d..0ad2210 100644
--- a/crontask/cron_task.go
+++ b/crontask/cron_task.go
@@ -1,6 +1,7 @@
 package crontask
 
 import (
+	"apsClient/conf"
 	"apsClient/constvar"
 	"apsClient/pkg/ecode"
 	"apsClient/pkg/logx"
@@ -10,14 +11,23 @@
 )
 
 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().StartImmediately().Do(func() {
 		plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
 		if code != ecode.OK {
 			return
 		}
 		finishNumber, err := service.PlcRead(plcConfig, constvar.PlcStartAddressTypeFinishNumber)
-		if err == nil {
+		if err == nil && finishNumber != 0 {
 			service.PlcCacheSet(constvar.PlcCacheKeyFinishNumber, finishNumber)
 		}
 		logx.Infof("plc read finish number:%v, err:%v", finishNumber, err)
@@ -27,13 +37,13 @@
 		return err
 	}
 
-	s.Every(1).Minutes().StartImmediately().Do(func() {
+	s.Every(totalNumberTimeInterval).Seconds().StartImmediately().Do(func() {
 		plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
 		if code != ecode.OK {
 			return
 		}
 		totalNumber, err := service.PlcRead(plcConfig, constvar.PlcStartAddressTypeTotalNumber)
-		if err == nil {
+		if err == nil && totalNumber != 0 {
 			service.PlcCacheSet(constvar.PlcCacheKeyTotalNumber, totalNumber)
 		}
 		logx.Infof("plc read total number:%v, err:%v", totalNumber, err)

--
Gitblit v1.8.0