From 0bfb4e53db6d0cad8fe7a59945e86ac3adc7744e Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@smartai.com>
Date: 星期日, 08 十月 2023 14:12:40 +0800
Subject: [PATCH] 添加数据同步服务
---
service/task.go | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/service/task.go b/service/task.go
index db15d10..94df214 100644
--- a/service/task.go
+++ b/service/task.go
@@ -11,7 +11,7 @@
"apsClient/pkg/logx"
"apsClient/pkg/structx"
"fmt"
- "gorm.io/gorm"
+ "github.com/jinzhu/gorm"
"time"
)
@@ -113,7 +113,7 @@
}
func (slf TaskService) NewTaskCount() (count int64) {
nowTs := time.Now().Unix()
- count, _ = model.NewProceduresSearch(nil).SetDeviceId(conf.Conf.System.DeviceId).SetStatus(model.ProcedureStatusWaitProcess).SetStartTimeMax(nowTs).SetEndTimeMin(nowTs).Count()
+ count, _ = model.NewProceduresSearch(nil).SetDeviceId(conf.Conf.System.DeviceId).SetStatus(model.ProcedureStatusWaitProcess).SetEndTimeMin(nowTs).Count()
return count
}
@@ -129,7 +129,7 @@
return NoRepeatedWorkers
}
-func (slf TaskService) GetProcedureById(id int) (*model.Procedures, int) {
+func (slf TaskService) GetProcedureById(id uint) (*model.Procedures, int) {
procedure, err := model.NewProceduresSearch(nil).SetId(id).First()
if err != nil {
return nil, ecode.DBErr
@@ -137,7 +137,7 @@
return procedure, ecode.OK
}
-func (slf TaskService) UpdateProcedureStatusAndChannel(db *gorm.DB, id int, status model.ProcedureStatus, channel int32) error {
+func (slf TaskService) UpdateProcedureStatusAndChannel(db *gorm.DB, id uint, status model.ProcedureStatus, channel int32) error {
if status == model.ProcedureStatusFinished {
ProgressCacheUnset(channel)
}
@@ -147,7 +147,7 @@
})
}
-func (slf TaskService) UpdateProcedureStatus(db *gorm.DB, id int, status model.ProcedureStatus, channel int32) error {
+func (slf TaskService) UpdateProcedureStatus(db *gorm.DB, id uint, status model.ProcedureStatus, channel int32) error {
if status == model.ProcedureStatusFinished {
ProgressCacheUnset(channel)
}
--
Gitblit v1.8.0