debug

zhangqian

2023-10-20 a699ff979c84d024ca33fb1139224258f278319f

 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"
@@ -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()
}