From cab6eea89a0d82710369604ecb51f1cdb122e433 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 19 十月 2023 17:26:34 +0800
Subject: [PATCH] fix
---
nsq/msg_handler.go | 217 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 179 insertions(+), 38 deletions(-)
diff --git a/nsq/msg_handler.go b/nsq/msg_handler.go
index 6e8df60..1db651e 100644
--- a/nsq/msg_handler.go
+++ b/nsq/msg_handler.go
@@ -11,8 +11,9 @@
"apsClient/utils/file"
"encoding/json"
"fmt"
+ "github.com/jinzhu/gorm"
+ "github.com/mitchellh/mapstructure"
"github.com/spf13/cast"
- "gorm.io/gorm"
"strings"
)
@@ -49,7 +50,6 @@
}
procedureRecords := make([]*model.Procedures, 0, len(task.Procedures))
- procedureIds := make([]string, 0, len(task.Procedures))
for _, procedure := range task.Procedures {
procedureRecord := model.Procedures{
WorkOrderID: task.WorkOrder.WorkOrderID,
@@ -59,6 +59,7 @@
StartTime: procedure.StartTime,
EndTime: procedure.EndTime,
Status: model.ProcedureStatusWaitProcess,
+ Channel: procedure.Channel,
ProceduresInfo: common.ProductProcedure{},
}
procedureData, err := json.Marshal(procedure)
@@ -67,7 +68,6 @@
}
procedureRecord.ProcedureData = string(procedureData)
procedureRecords = append(procedureRecords, &procedureRecord)
- procedureIds = append(procedureIds, procedure.ProcedureID)
}
var orderRecord model.Order
@@ -79,19 +79,26 @@
}
err = model.WithTransaction(func(db *gorm.DB) error {
- if err = model.NewOrderSearch(db).SetWorkOrderId(task.WorkOrder.WorkOrderID).Delete(); err != nil {
- return err
+ if oldWorkOrder != nil && oldWorkOrder.WorkOrderID != "" {
+ if err = model.NewOrderSearch(db).SetId(oldWorkOrder.ID).Updates(&orderRecord); err != nil {
+ return err
+ }
+ for _, procedure := range procedureRecords {
+ err = model.NewProceduresSearch(db).SetWorkOrderId(procedure.WorkOrderID).SetProcedureId(procedure.ProcedureID).Upsert(procedure)
+ if err != nil {
+ return err
+ }
+ }
+ } else {
+ if err = model.NewOrderSearch(db).Create(&orderRecord); err != nil {
+ return err
+ }
+ return model.NewProceduresSearch(db).CreateBatch(procedureRecords)
}
- if err = model.NewOrderSearch(db).Save(&orderRecord); err != nil {
- return err
- }
- if err = model.NewProceduresSearch(db).SetProcedureIds(procedureIds).Delete(); err != nil {
- return err
- }
- return model.NewProceduresSearch(db).CreateBatch(procedureRecords)
+ return nil
})
if err != nil {
- logx.Errorf(" save task message error err: %v", err.Error())
+ logx.Errorf(" save task message error err: %v", err)
return err
}
}
@@ -118,33 +125,55 @@
Topic: slf.Topic,
Message: data,
}
- if len(resp.KeyData) == 0 || len(resp.AddressData) == 0 {
- return nil
- }
- //鍐欏叆鍒版枃浠�
- err = file.WriteFile(fmt.Sprintf("%s%s", constvar.PlcAddressDataPath, constvar.PlcAddressDataKeyFileName), resp.KeyData)
- if err != nil {
- return err
- }
- err = file.WriteFile(fmt.Sprintf("%s%s", constvar.PlcAddressDataPath, constvar.PlcAddressDataValueFileName), resp.AddressData)
- if err != nil {
- return err
- }
- //鍐欏叆鍒板唴瀛�
- keyString := string(resp.KeyData)
- addressString := string(resp.AddressData)
+ if len(resp.KeyData) != 0 && len(resp.AddressData) != 0 {
+ //鍐欏叆鍒版枃浠�
+ err = file.WriteFile(fmt.Sprintf("%s%s", constvar.PlcAddressDataPath, constvar.PlcAddressDataKeyFileName), resp.KeyData)
+ if err != nil {
+ return err
+ }
+ err = file.WriteFile(fmt.Sprintf("%s%s", constvar.PlcAddressDataPath, constvar.PlcAddressDataValueFileName), resp.AddressData)
+ if err != nil {
+ return err
+ }
+ //鍐欏叆鍒板唴瀛�
+ keyString := string(resp.KeyData)
+ addressString := string(resp.AddressData)
- keys := strings.Split(keyString, "\n")
- addresses := strings.Split(addressString, "\n")
- if len(keys) != len(addresses) {
- logx.Error("plc address message error: key length not equal address length")
+ keys := strings.Split(keyString, "\n")
+ addresses := strings.Split(addressString, "\n")
+ if len(keys) != len(addresses) {
+ logx.Error("plc address message error: key length not equal address length")
+ return nil
+ }
+ for i := 0; i < len(keys); i++ {
+ key := strings.ReplaceAll(keys[i], "\r", "")
+ address := cast.ToInt(strings.ReplaceAll(addresses[i], "\r", ""))
+ plc_address.Set(key, address)
+ logx.Infof("plc address set ok: key:%v, address:%v", key, address)
+ }
+ }
+
+ if resp.PlcConfig.Method == "" {
return nil
}
- for i := 0; i < len(keys); i++ {
- key := strings.ReplaceAll(keys[i], "\r", "")
- address := cast.ToInt(strings.ReplaceAll(addresses[i], "\r", ""))
- plc_address.Set(key, address)
- logx.Infof("plc address set ok: key:%v, address:%v", key, address)
+
+ resp.PlcConfig.Method.ConvertToEnglish()
+
+ var record model.DevicePlc
+ err = mapstructure.Decode(resp.PlcConfig, &record)
+ if err != nil {
+ logx.Infof("decode from PlcAddressList to DevicePlc Details err:%v", err)
+ }
+ err = mapstructure.Decode(resp.PlcAddressList, &record.Details)
+ if err != nil {
+ logx.Infof("decode from PlcAddressList to DevicePlc Details err:%v", err)
+ }
+ detail, err := json.Marshal(record.Details)
+ record.Detail = string(detail)
+ record.ID = 1
+ err = model.NewDevicePlcSearch().SetId(record.ID).Save(&record)
+ if err != nil {
+ return err
}
return nil
}
@@ -190,10 +219,122 @@
logx.Infof("unmarshal process params sync err :%s", err)
return err
}
- err = model.NewProcessModelSearch().Save(&processModel)
+ err = model.WithTransaction(func(db *gorm.DB) error {
+ err = model.NewProcessModelSearch().SetOrm(db).SetProduct(processModel.Product).SetProcedure(processModel.Procedure).
+ UpdateByMap(map[string]interface{}{"is_new": 0})
+ if err != nil {
+ return err
+ }
+ processModel.IsNew = true
+ return model.NewProcessModelSearch().SetOrm(db).Create(&processModel)
+ })
+
if err != nil {
logx.Infof("save process params sync err :%s", err)
return err
}
return nil
}
+
+type DeviceUpdate struct {
+ Topic string
+}
+
+func (slf *DeviceUpdate) HandleMessage(data []byte) (err error) {
+ logx.Infof("get a device update message :%s", data)
+ var device common.Device
+ err = json.Unmarshal(data, &device)
+ if err != nil {
+ logx.Infof("unmarshal device update msg err :%s", err)
+ return err
+ }
+
+ procedures := make([]string, 0, len(device.DeviceProcedureAttr))
+ for _, attr := range device.DeviceProcedureAttr {
+ procedures = append(procedures, attr.ProcedureName)
+ }
+
+ deviceRecord := &model.Device{
+ DeviceID: device.ID,
+ Procedures: strings.Join(procedures, ","),
+ ExtChannelAmount: device.ExtChannelAmount,
+ }
+
+ oldRecord, err := model.NewDeviceSearch().SetDeviceId(device.ID).First()
+ if err == gorm.ErrRecordNotFound {
+ err = model.NewDeviceSearch().Create(deviceRecord)
+ } else {
+ deviceRecord.ID = oldRecord.ID
+ err = model.NewDeviceSearch().Save(deviceRecord)
+ }
+
+ if err != nil {
+ logx.Infof("save device record err :%s", err)
+ return err
+ }
+
+ return nil
+}
+
+type PullDataResponse struct {
+ Topic string
+}
+
+func (slf *PullDataResponse) HandleMessage(data []byte) (err error) {
+ logx.Infof("get a pull data response message :%s", data)
+ var pullDataResponse common.MsgPullDataResponse
+ err = json.Unmarshal(data, &pullDataResponse)
+ if err != nil {
+ logx.Infof("unmarshal msg err :%s", err)
+ return err
+ }
+ switch pullDataResponse.DataType {
+ case common.PullDataTypeProcessModel:
+ err = slf.DealProcessModelData(pullDataResponse.Data)
+
+ }
+ if err != nil {
+ logx.Infof("process pull data err :%s", err)
+ return err
+ }
+ return nil
+}
+
+func (slf *PullDataResponse) DealProcessModelData(data interface{}) error {
+ var processModels []*model.ProcessModel
+ err := mapstructure.Decode(data, &processModels)
+ if err != nil {
+ return err
+ }
+ numbers := make([]string, 0, len(processModels))
+ for _, processModel := range processModels {
+ numbers = append(numbers, processModel.Number)
+ }
+ existsProcessModels, err := model.NewProcessModelSearch().SetIsNew(true).SetNumbers(numbers).FindNotTotal()
+ if err != nil {
+ return err
+ }
+
+ existsProcessModelsMap := make(map[string]struct{}, len(existsProcessModels))
+ for _, processModel := range existsProcessModels {
+ existsProcessModelsMap[processModel.Number] = struct{}{}
+ }
+
+ for _, processModel := range processModels {
+ if _, exists := existsProcessModelsMap[processModel.Number]; exists {
+ continue
+ }
+ err = model.WithTransaction(func(db *gorm.DB) error {
+ err = model.NewProcessModelSearch().SetOrm(db).SetProcedure(processModel.Procedure).SetProduct(processModel.Product).SetIsNew(true).UpdateByMap(map[string]interface{}{"is_new": 0})
+ if err != nil {
+ return err
+ }
+ processModel.IsNew = true
+ return model.NewProcessModelSearch().SetOrm(db).Create(processModel)
+ })
+ if err != nil {
+ return err
+ }
+ }
+ return nil
+}
--
Gitblit v1.8.0