From cab6eea89a0d82710369604ecb51f1cdb122e433 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 19 十月 2023 17:26:34 +0800
Subject: [PATCH] fix
---
service/task.go | 43 ++++++++++++++++---------------------------
1 files changed, 16 insertions(+), 27 deletions(-)
diff --git a/service/task.go b/service/task.go
index 4ff5cb8..fbc355f 100644
--- a/service/task.go
+++ b/service/task.go
@@ -6,10 +6,8 @@
"apsClient/model"
"apsClient/model/common"
"apsClient/model/response"
- "apsClient/nsq"
"apsClient/pkg/ecode"
"apsClient/pkg/logx"
- "apsClient/pkg/structx"
"fmt"
"github.com/jinzhu/gorm"
"time"
@@ -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)
}
@@ -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