网络配置获取和删除，品牌增删改查

zhangqian

2023-08-19 066a30751bdc20f9e83b34539de71ae392783e1b

 nsq/msg_handler.go

@@ -3,10 +3,10 @@
import (
   "apsClient/conf"
   "apsClient/model"
   "apsClient/model/common"
   "apsClient/pkg/logx"
   "apsClient/pkg/structx"
   "encoding/json"
   "fmt"
   "gorm.io/gorm"
)

@@ -18,10 +18,8 @@
}

func (slf *ScheduleTask) HandleMessage(data []byte) (err error) {
   fmt.Println(string(data))

   var tasks = make([]*DeliverScheduleTask, 0)

   logx.Infof("get an message :%s", data)
   var tasks = make([]*common.DeliverScheduleTask, 0)
   err = json.Unmarshal(data, &tasks)
   if err != nil {
      logx.Errorf("ScheduleTask HandleMessage Unmarshal json err: %v", err.Error())
@@ -31,10 +29,10 @@
      for _, procedure := range task.Procedures {
         if procedure.DeviceID == conf.Conf.System.DeviceId { //只存储本设备的工序
            err = model.WithTransaction(func(db *gorm.DB) error {
               _, err := model.NewOrderSearch(db).SetOrderId(task.Order.OrderID).First()
               _, err := model.NewOrderSearch(db).SetWorkOrderId(task.WorkOrder.WorkOrderID).First()
               if err == gorm.ErrRecordNotFound {
                  var orderRecord model.Order
                  err = structx.AssignTo(task.Order, &orderRecord)
                  err = structx.AssignTo(task.WorkOrder, &orderRecord)
                  orderRecord.Status = model.OrderStatusUnFinished
                  if err != nil {
                     logx.Errorf(" structx.Assign task.Order to orderRecord err: %v", err.Error())
@@ -45,8 +43,11 @@
                  }
               }
               procedureRecord := model.Procedures{
                  OrderID: task.Order.OrderID,
                  Status:  model.ProcedureStatusUnFinished,
                  StartTime:   procedure.StartTime,
                  EndTime:     procedure.EndTime,
                  WorkOrderID: task.WorkOrder.WorkOrderID,
                  OrderID:     task.WorkOrder.OrderID,
                  Status:      model.ProcedureStatusUnFinished,
               }
               procedureData, err := json.Marshal(procedure)
               procedureRecord.ProcedureData = string(procedureData)