From f75b6f9ee6b2c542d52b4a11113bd281b421c4c0 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 17 十月 2023 19:34:30 +0800
Subject: [PATCH] 定时任务分master模式和非master模式
---
service/progress.go | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/service/progress.go b/service/progress.go
index 7b6361a..ed904f1 100644
--- a/service/progress.go
+++ b/service/progress.go
@@ -1,6 +1,7 @@
package service
import (
+ "apsClient/conf"
"apsClient/model"
"errors"
"github.com/jinzhu/gorm"
@@ -54,7 +55,7 @@
var ok bool
progressCache, ok = ProgressCacheGet(channel)
if !ok {
- progressCache, err = model.NewProductionProgressSearch(nil).SetChannel(channel).SetOrder("id desc").First()
+ progressCache, err = model.NewProductionProgressSearch(nil).SetDeviceId(conf.Conf.System.DeviceId).SetChannel(channel).SetOrder("id desc").First()
if err == gorm.ErrRecordNotFound {
return nil, errors.New("progress not found")
}
@@ -71,3 +72,9 @@
}
return
}
+
+// GetProgressList 鑾峰彇寰呭悓姝ヨ繘搴﹀伐搴�
+func (slf ProgressService) GetProgressList() (progressList []*model.ProductionProgress, err error) {
+ progressList, err = model.NewProductionProgressSearch(nil).SetUnFinished().SetOrder("id desc").SetPage(1, 100).FindNotTotal()
+ return
+}
--
Gitblit v1.8.0