From f05f4cca1340f0ddec7261d4dbe65dd331224423 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 28 九月 2023 15:59:30 +0800
Subject: [PATCH] 接收设备信息改变
---
constvar/const.go | 1
nsq/msg_handler.go | 40 ++++++
model/common/common.go | 11 +
model/index.go | 1
model/device.go | 224 +++++++++++++++++++++++++++++++++++++
model/response/common.go | 5
router/index.go | 6 +
docs/swagger.yaml | 6 +
docs/docs.go | 9 +
nsq/consumer.go | 2
docs/swagger.json | 9 +
nsq/nsq.go | 7 +
12 files changed, 321 insertions(+), 0 deletions(-)
diff --git a/constvar/const.go b/constvar/const.go
index db3a8a6..6bea5e5 100644
--- a/constvar/const.go
+++ b/constvar/const.go
@@ -9,6 +9,7 @@
NsqTopicApsProcessParams = "aps.%v.aps.processParams" //鏈変簡鏂扮殑宸ヨ壓妯″瀷
NsqTopicTaskProcedureStatusUpdate = "aps.%v.task.procedure.status" //宸ュ簭鐘舵�佹洿鏂�
NsqTopicSyncTaskProgress = "aps.%v.task.procedure.progress" //宸ュ簭鐢熶骇杩涘害
+ NsqTopicDeviceUpdate = "aps.%v.device.update" //璁惧淇℃伅鏇存敼
)
type PlcStartAddressType int
diff --git a/docs/docs.go b/docs/docs.go
index ce78968..06dc0d1 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -1077,6 +1077,15 @@
}
}
},
+ "response.Message": {
+ "type": "object",
+ "properties": {
+ "data": {},
+ "event": {
+ "type": "string"
+ }
+ }
+ },
"response.ProcessParams": {
"type": "object",
"properties": {
diff --git a/docs/swagger.json b/docs/swagger.json
index 216e3a6..5cbcad0 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -1065,6 +1065,15 @@
}
}
},
+ "response.Message": {
+ "type": "object",
+ "properties": {
+ "data": {},
+ "event": {
+ "type": "string"
+ }
+ }
+ },
"response.ProcessParams": {
"type": "object",
"properties": {
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index c03e6d1..a623758 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -354,6 +354,12 @@
msg:
type: string
type: object
+ response.Message:
+ properties:
+ data: {}
+ event:
+ type: string
+ type: object
response.ProcessParams:
properties:
key:
diff --git a/model/common/common.go b/model/common/common.go
index f169626..2b3e2c9 100644
--- a/model/common/common.go
+++ b/model/common/common.go
@@ -126,3 +126,14 @@
IsProcessing bool //鏄惁澶勭悊涓�
IsFinish bool //鏄惁瀹屾垚
}
+
+type Device struct {
+ ID string `gorm:"comment:涓婚敭ID;primaryKey;type:varchar(191);" json:"id"`
+ DeviceProcedureAttr []*DeviceProcedureAttr `json:"deviceProcedureAttr"` // 璁惧宸ュ簭灞炴�у垪琛�
+ ExtChannelAmount int `gorm:"type:tinyint;comment:棰濆鐨勯�氶亾鏁伴噺;default:0;" json:"extChannelAmount"`
+}
+type DeviceProcedureAttr struct {
+ ProcedureID string `gorm:"index;type:varchar(191);comment:宸ュ簭ID" json:"procedureId"`
+ ProcedureName string `gorm:"type:varchar(191);comment:宸ュ簭鍚嶇О" json:"procedureName"`
+ DeviceID string `gorm:"index;type:varchar(191);not null;comment:璁惧ID" json:"deviceId"`
+}
diff --git a/model/device.go b/model/device.go
new file mode 100644
index 0000000..0a1f686
--- /dev/null
+++ b/model/device.go
@@ -0,0 +1,224 @@
+package model
+
+import (
+ "apsClient/pkg/sqlitex"
+ "fmt"
+ "gorm.io/gorm"
+ "strings"
+)
+
+type (
+ // Device 璁惧
+ Device struct {
+ gorm.Model `json:"-"`
+ DeviceID string `gorm:"unique;column:device_id;type:varchar(255);not null;default '';comment:璁惧缂栧彿" json:"deviceID"` //璁惧缂栧彿
+ ExtChannelAmount int `gorm:"type:tinyint;comment:棰濆鐨勯�氶亾鏁伴噺;default:0;" json:"extChannelAmount"`
+ Procedures string `gorm:"column:procedure;type:varchar(255);not null;default '';comment:宸ュ簭" json:"procedures"` //璁惧鏀寔鐨勫伐搴忥紝鐢ㄩ�楀彿鍒嗛殧
+ ProceduresArr []string `gorm:"-" json:"procedureAdd"` //璁惧鏀寔鐨勫伐搴忓垏鐗�
+ }
+
+ DeviceSearch struct {
+ Device
+ Order string
+ PageNum int
+ PageSize int
+ Orm *gorm.DB
+ }
+)
+
+func (slf *Device) TableName() string {
+ return "device"
+}
+
+func (slf *Device) AfterFind(db *gorm.DB) error {
+ slf.ProceduresArr = strings.Split(slf.Procedures, ",")
+ return nil
+}
+
+func NewDeviceSearch() *DeviceSearch {
+ return &DeviceSearch{Orm: sqlitex.GetDB()}
+}
+
+func (slf *DeviceSearch) SetOrm(tx *gorm.DB) *DeviceSearch {
+ slf.Orm = tx
+ return slf
+}
+
+func (slf *DeviceSearch) SetPage(page, size int) *DeviceSearch {
+ slf.PageNum, slf.PageSize = page, size
+ return slf
+}
+
+func (slf *DeviceSearch) SetOrder(order string) *DeviceSearch {
+ slf.Order = order
+ return slf
+}
+
+func (slf *DeviceSearch) SetID(id uint) *DeviceSearch {
+ slf.ID = id
+ return slf
+}
+
+func (slf *DeviceSearch) SetDeviceId(deviceId string) *DeviceSearch {
+ slf.DeviceID = deviceId
+ return slf
+}
+
+func (slf *DeviceSearch) build() *gorm.DB {
+ var db = slf.Orm.Table(slf.TableName())
+
+ if slf.ID != 0 {
+ db = db.Where("id = ?", slf.ID)
+ }
+
+ if len(slf.DeviceID) != 0 {
+ db = db.Where("device_id = ?", slf.DeviceID)
+ }
+
+ if slf.Order != "" {
+ db = db.Order(slf.Order)
+ }
+
+ return db
+}
+
+// Create 鍗曟潯鎻掑叆
+func (slf *DeviceSearch) Create(record *Device) error {
+ var db = slf.build()
+
+ if err := db.Create(record).Error; err != nil {
+ return fmt.Errorf("create err: %v, record: %+v", err, record)
+ }
+
+ return nil
+}
+
+func (slf *DeviceSearch) Save(record *Device) error {
+ var db = slf.build()
+
+ if err := db.Updates(record).Error; err != nil {
+ return fmt.Errorf("create err: %v, record: %+v", err, record)
+ }
+ return nil
+}
+
+func (slf *DeviceSearch) UpdateByMap(upMap map[string]interface{}) error {
+ var (
+ db = slf.build()
+ )
+
+ if err := db.Updates(upMap).Error; err != nil {
+ return fmt.Errorf("update by map err: %v, upMap: %+v", err, upMap)
+ }
+
+ return nil
+}
+
+func (slf *DeviceSearch) UpdateByQuery(query string, args []interface{}, upMap map[string]interface{}) error {
+ var (
+ db = slf.Orm.Table(slf.TableName()).Where(query, args...)
+ )
+
+ if err := db.Updates(upMap).Error; err != nil {
+ return fmt.Errorf("update by query err: %v, query: %s, args: %+v, upMap: %+v", err, query, args, upMap)
+ }
+
+ return nil
+}
+
+func (slf *DeviceSearch) Delete() error {
+ var db = slf.build()
+
+ if err := db.Unscoped().Delete(&Device{}).Error; err != nil {
+ return err
+ }
+
+ return nil
+}
+
+func (slf *DeviceSearch) First() (*Device, error) {
+ var (
+ record = new(Device)
+ db = slf.build()
+ )
+
+ if err := db.First(record).Error; err != nil {
+ return record, err
+ }
+
+ return record, nil
+}
+
+func (slf *DeviceSearch) Find() ([]*Device, int64, error) {
+ var (
+ records = make([]*Device, 0)
+ total int64
+ db = slf.build()
+ )
+
+ if err := db.Count(&total).Error; err != nil {
+ return records, total, fmt.Errorf("find count err: %v", err)
+ }
+ if slf.PageNum*slf.PageSize > 0 {
+ db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
+ }
+ if err := db.Find(&records).Error; err != nil {
+ return records, total, fmt.Errorf("find records err: %v", err)
+ }
+
+ return records, total, nil
+}
+
+func (slf *DeviceSearch) FindNotTotal() ([]*Device, error) {
+ var (
+ records = make([]*Device, 0)
+ db = slf.build()
+ )
+
+ if slf.PageNum*slf.PageSize > 0 {
+ db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
+ }
+ if err := db.Find(&records).Error; err != nil {
+ return records, fmt.Errorf("find records err: %v", err)
+ }
+
+ return records, nil
+}
+
+// FindByQuery 鎸囧畾鏉′欢鏌ヨ.
+func (slf *DeviceSearch) FindByQuery(query string, args []interface{}) ([]*Device, int64, error) {
+ var (
+ records = make([]*Device, 0)
+ total int64
+ db = slf.Orm.Table(slf.TableName()).Where(query, args...)
+ )
+
+ if err := db.Count(&total).Error; err != nil {
+ return records, total, fmt.Errorf("find by query count err: %v", err)
+ }
+ if slf.PageNum*slf.PageSize > 0 {
+ db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
+ }
+ if err := db.Find(&records).Error; err != nil {
+ return records, total, fmt.Errorf("find by query records err: %v, query: %s, args: %+v", err, query, args)
+ }
+
+ return records, total, nil
+}
+
+// FindByQueryNotTotal 鎸囧畾鏉′欢鏌ヨ&涓嶆煡璇㈡�绘潯鏁�.
+func (slf *DeviceSearch) FindByQueryNotTotal(query string, args []interface{}) ([]*Device, error) {
+ var (
+ records = make([]*Device, 0)
+ db = slf.Orm.Table(slf.TableName()).Where(query, args...)
+ )
+
+ if slf.PageNum*slf.PageSize > 0 {
+ db = db.Offset((slf.PageNum - 1) * slf.PageSize).Limit(slf.PageSize)
+ }
+ if err := db.Find(&records).Error; err != nil {
+ return records, fmt.Errorf("find by query records err: %v, query: %s, args: %+v", err, query, args)
+ }
+
+ return records, nil
+}
diff --git a/model/index.go b/model/index.go
index 738e2fc..8b3f8c1 100644
--- a/model/index.go
+++ b/model/index.go
@@ -29,6 +29,7 @@
DevicePlc{},
ProcessModel{},
ProductionProgress{},
+ Device{},
)
return err
}
diff --git a/model/response/common.go b/model/response/common.go
index 6bd6284..dae30ae 100644
--- a/model/response/common.go
+++ b/model/response/common.go
@@ -64,3 +64,8 @@
CountDownMinute int64 //鍊掕鏃� 鍒�
ShowCountDown bool //鏄惁灞曠ず鍊掕鏃�
}
+
+type Message struct {
+ Event string
+ Data interface{}
+}
diff --git a/nsq/consumer.go b/nsq/consumer.go
index f4a2b66..d6e668a 100644
--- a/nsq/consumer.go
+++ b/nsq/consumer.go
@@ -26,6 +26,8 @@
handler = &ProcessParams{Topic: topic}
case fmt.Sprintf(constvar.NsqTopicApsProcessParams, conf.Conf.NsqConf.NodeId):
handler = &ProcessParamsSync{Topic: topic}
+ case fmt.Sprintf(constvar.NsqTopicDeviceUpdate, conf.Conf.NsqConf.NodeId):
+ handler = &DeviceUpdate{Topic: topic}
}
c.AddHandler(handler.HandleMessage)
diff --git a/nsq/msg_handler.go b/nsq/msg_handler.go
index 4ea8c9c..7b62157 100644
--- a/nsq/msg_handler.go
+++ b/nsq/msg_handler.go
@@ -226,3 +226,43 @@
}
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
+}
diff --git a/nsq/nsq.go b/nsq/nsq.go
index 121f1db..0c293db 100644
--- a/nsq/nsq.go
+++ b/nsq/nsq.go
@@ -57,5 +57,12 @@
}
})
+ safe.Go(func() {
+ err := Consume(fmt.Sprintf(constvar.NsqTopicDeviceUpdate, conf.Conf.NsqConf.NodeId), conf.Conf.System.DeviceId)
+ if err != nil {
+ logx.Errorf("start nsq consume err: %v", err)
+ }
+ })
+
return nil
}
diff --git a/router/index.go b/router/index.go
index 3c71534..1e2f69c 100644
--- a/router/index.go
+++ b/router/index.go
@@ -59,6 +59,12 @@
plcGroup.POST("setProductNumber", plcApi.SetProductNumber) // 涓嬪彂鐢熶骇鎬婚噺
}
+ eventsApi := new(v1.EventsApi)
+ eventsGroup := v1Group.Group("events")
+ {
+ eventsGroup.GET("", eventsApi.Events) // 鎺ㄩ�佹暟鎹�
+ }
+
InitPlcBrandRouter(v1Group)
return Router
--
Gitblit v1.8.0