From eba4eb850f0ecfb5839395aa125955ceaa2a454f Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期四, 19 十月 2023 16:39:07 +0800 Subject: [PATCH] Merge branch 'feat-serf' --- service/task.go | 49 +++++++++++++++++++------------------------------ 1 files changed, 19 insertions(+), 30 deletions(-) diff --git a/service/task.go b/service/task.go index a9b75ca..fbc355f 100644 --- a/service/task.go +++ b/service/task.go @@ -6,12 +6,10 @@ "apsClient/model" "apsClient/model/common" "apsClient/model/response" - "apsClient/nsq" "apsClient/pkg/ecode" "apsClient/pkg/logx" - "apsClient/pkg/structx" "fmt" - "gorm.io/gorm" + "github.com/jinzhu/gorm" "time" ) @@ -123,7 +121,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 @@ -131,7 +129,7 @@ return procedure, ecode.OK } -func (slf TaskService) UpdateProcedureStatusAndChannel(db *gorm.DB, id int, status model.ProcedureStatus, channel int32, processModelNumber string) error { +func (slf TaskService) UpdateProcedureStatusAndChannel(db *gorm.DB, id uint, status model.ProcedureStatus, channel int32, processModelNumber string) error { if status == model.ProcedureStatusFinished || status == model.ProcedureStatusWaitProcess { ProgressCacheUnset(channel) } @@ -146,7 +144,7 @@ return model.NewProceduresSearch(db).SetId(id).UpdateByMap(upMap) } -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) } @@ -177,30 +175,6 @@ if err == nil { return data, nil } - - if err == gorm.ErrRecordNotFound { //濡傛灉鏁版嵁搴撴病鏈変粠浜戠鑾峰彇 - caller := nsq.NewCaller(fmt.Sprintf(constvar.NsqTopicProcessParamsRequest, conf.Conf.NsqConf.NodeId), fmt.Sprintf(constvar.NsqTopicProcessParamsResponse, conf.Conf.NsqConf.NodeId)) - var result common.ResponseProcessParams - err = caller.Call(common.RequestProcessParams{ - WorkOrder: procedure.WorkOrderID, - OrderId: procedure.OrderID, - Product: order.ProductName, - Procedure: procedure.ProceduresInfo.ProcedureName, - Device: procedure.ProceduresInfo.DeviceName, - DeviceId: conf.Conf.System.DeviceId, - }, &result, time.Second*3) - if err != nil { - logx.Errorf("TaskStart GetProcessModel error:%v", err.Error()) - return - } - if result.ParamsMap == nil { - logx.Errorf("TaskStart GetProcessModel response miss process params:%v", result) - return - } - processModel = new(model.ProcessModel) - err = structx.AssignTo(result, &processModel) - return processModel, err - } return } @@ -212,3 +186,18 @@ SetStartTimeMin(nowTs). SetStatus(model.OrderStatusWaitProcess).First() } + +// SaveTaskStatusSync 淇濆瓨浠诲姟鍚屾淇℃伅 +func (slf TaskService) SaveTaskStatusSync(db *gorm.DB, record *model.TaskStatusSync) (err error) { + return model.NewTaskStatusSyncSearch(db).Create(record) +} + +// GetTaskStatusSync 鑾峰彇寰呭悓姝ヤ换鍔′俊鎭� +func (slf TaskService) GetTaskStatusSync(limit int) ([]*model.TaskStatusSync, error) { + return model.NewTaskStatusSyncSearch(nil).SetOrder("id desc").SetPage(1, limit).FindNotTotal() +} + +// RemoveTaskStatusSync 鍒犻櫎鍚屾瀹岀殑璁板綍 +func (slf TaskService) RemoveTaskStatusSync(ids []uint) (err error) { + return model.NewTaskStatusSyncSearch(nil).SetIDs(ids).Delete() +} -- Gitblit v1.8.0