From 3e438843c57c2e3525c14832eb26e5ac343b817c Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 07 十月 2023 14:57:37 +0800
Subject: [PATCH] merge
---
service/task.go | 9
nsq/msg_handler.go | 51 ++++
model/common/common.go | 11 +
model/device.go | 224 ++++++++++++++++++++
docs/swagger.yaml | 42 +++
api/v1/process_model.go | 50 ++++
docs/docs.go | 68 ++++++
model/request/task.go | 7
nsq/consumer.go | 2
docs/swagger.json | 68 ++++++
constvar/const.go | 1
model/index.go | 1
service/process_model.go | 44 +--
model/response/common.go | 5
router/index.go | 12 +
model/process_model.go | 45 +++
nsq/nsq.go | 7
17 files changed, 601 insertions(+), 46 deletions(-)
diff --git a/api/v1/process_model.go b/api/v1/process_model.go
new file mode 100644
index 0000000..06c1711
--- /dev/null
+++ b/api/v1/process_model.go
@@ -0,0 +1,50 @@
+package v1
+
+import (
+ "apsClient/model/request"
+ "apsClient/pkg/contextx"
+ "apsClient/pkg/ecode"
+ "apsClient/service"
+ "github.com/gin-gonic/gin"
+)
+
+type ProcessModelApi struct{}
+
+// List
+// @Tags 宸ヨ壓妯″瀷
+// @Summary 鑾峰彇宸ヨ壓妯″瀷鍒楄〃
+// @Produce application/json
+// @Param object query request.ProcessModelList true "鏌ヨ鍙傛暟"
+// @Success 200 {object} contextx.Response{data=response.TaskCountdown} "鎴愬姛"
+// @Router /v1/processModel/list [get]
+func (slf *ProcessModelApi) List(c *gin.Context) {
+ var params request.ProcessModelList
+ ctx, ok := contextx.NewContext(c, ¶ms)
+ if !ok {
+ return
+ }
+ procedure, code := service.NewTaskService().GetProcedureById(params.ProcedureId)
+ if code != ecode.OK {
+ ctx.Fail(code)
+ return
+ }
+
+ order, err := service.NewTaskService().GetOrderByWorkOrderId(procedure.WorkOrderID)
+ if err != nil {
+ ctx.Fail(ecode.DBErr)
+ return
+ }
+
+ list, total, err := service.GetProcessModelList(params.Page, params.PageSize)
+ if err != nil {
+ ctx.Fail(ecode.DBErr)
+ return
+ }
+ for _, processModel := range list {
+ if processModel.Procedure == procedure.ProceduresInfo.ProcedureName && processModel.Product == order.ProductName {
+ processModel.IsUpdate = processModel.Number != params.Number
+ }
+ }
+
+ ctx.ResultList(list, total)
+}
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..1ad485b 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -366,6 +366,65 @@
}
}
},
+ "/v1/processModel/list": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "宸ヨ壓妯″瀷"
+ ],
+ "summary": "鑾峰彇宸ヨ壓妯″瀷鍒楄〃",
+ "parameters": [
+ {
+ "type": "string",
+ "description": "褰撳墠姝ｅ湪浣跨敤鐨勫伐鑹哄弬鏁扮紪鍙�",
+ "name": "number",
+ "in": "query",
+ "required": true
+ },
+ {
+ "type": "integer",
+ "description": "椤电爜",
+ "name": "page",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "姣忛〉澶у皬",
+ "name": "pageSize",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "褰撳墠鐨勫伐搴廼d",
+ "name": "procedureId",
+ "in": "query",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/contextx.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "$ref": "#/definitions/response.TaskCountdown"
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
"/v1/task/countdown": {
"get": {
"produces": [
@@ -1077,6 +1136,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..03ce549 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -354,6 +354,65 @@
}
}
},
+ "/v1/processModel/list": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "宸ヨ壓妯″瀷"
+ ],
+ "summary": "鑾峰彇宸ヨ壓妯″瀷鍒楄〃",
+ "parameters": [
+ {
+ "type": "string",
+ "description": "褰撳墠姝ｅ湪浣跨敤鐨勫伐鑹哄弬鏁扮紪鍙�",
+ "name": "number",
+ "in": "query",
+ "required": true
+ },
+ {
+ "type": "integer",
+ "description": "椤电爜",
+ "name": "page",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "姣忛〉澶у皬",
+ "name": "pageSize",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "褰撳墠鐨勫伐搴廼d",
+ "name": "procedureId",
+ "in": "query",
+ "required": true
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/contextx.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "$ref": "#/definitions/response.TaskCountdown"
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
"/v1/task/countdown": {
"get": {
"produces": [
@@ -1065,6 +1124,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..b73d1c3 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:
@@ -642,6 +648,42 @@
summary: 鏇存柊plc鍝佺墝
tags:
- plc鍝佺墝
+ /v1/processModel/list:
+ get:
+ parameters:
+ - description: 褰撳墠姝ｅ湪浣跨敤鐨勫伐鑹哄弬鏁扮紪鍙�
+ in: query
+ name: number
+ required: true
+ type: string
+ - description: 椤电爜
+ in: query
+ name: page
+ type: integer
+ - description: 姣忛〉澶у皬
+ in: query
+ name: pageSize
+ type: integer
+ - description: 褰撳墠鐨勫伐搴廼d
+ in: query
+ name: procedureId
+ required: true
+ type: integer
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ allOf:
+ - $ref: '#/definitions/contextx.Response'
+ - properties:
+ data:
+ $ref: '#/definitions/response.TaskCountdown'
+ type: object
+ summary: 鑾峰彇宸ヨ壓妯″瀷鍒楄〃
+ tags:
+ - 宸ヨ壓妯″瀷
/v1/task/countdown:
get:
produces:
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/process_model.go b/model/process_model.go
index 1828814..9ff8e4f 100644
--- a/model/process_model.go
+++ b/model/process_model.go
@@ -1,13 +1,15 @@
package model
import (
+ "apsClient/pkg/logx"
"apsClient/pkg/sqlitex"
+ "encoding/json"
"fmt"
"gorm.io/gorm"
)
type (
- // ProcessModel 宸ヨ壓娴佺▼鍙傛暟
+ // ProcessModel 宸ヨ壓鍙傛暟
ProcessModel struct {
gorm.Model `json:"-"`
Number string `gorm:"index;column:number;type:varchar(255);not null;default '';comment:宸ヨ壓妯″瀷缂栧彿" json:"number"` //宸ヨ壓妯″瀷缂栧彿
@@ -15,20 +17,32 @@
Procedure string `gorm:"column:procedure;type:varchar(255);not null;default '';comment:宸ュ簭" json:"procedure"` //宸ュ簭
Params string `gorm:"type:text;comment:宸ヨ壓鍙傛暟閿�煎json涓�"`
ParamsMap map[string]interface{} `json:"paramsMap" gorm:"-"`
- DeviceId string `json:"deviceId" gorm:"-"` //鐢ㄤ簬杩囨护鑾峰彇nsq娑堟伅
+ DeviceId string `json:"deviceId" gorm:"-"` //鐢ㄤ簬杩囨护鑾峰彇nsq娑堟伅
+ IsNew bool `json:"isNew" gorm:"column:is_new;comment:鏄惁鏈�鏂扮殑"` //鏄惁鏈�鏂扮殑
+ IsUpdate bool `json:"isUpdate" gorm:"-"` //鍓嶇鐢�
}
ProcessModelSearch struct {
ProcessModel
- Order string
- PageNum int
- PageSize int
- Orm *gorm.DB
+ Order string
+ PageNum int
+ PageSize int
+ Orm *gorm.DB
+ Procedures []string
}
)
func (slf *ProcessModel) TableName() string {
return "process_model"
+}
+
+func (slf *ProcessModel) AfterFind(db *gorm.DB) error {
+ err := json.Unmarshal([]byte(slf.Params), &slf.ParamsMap)
+ if err != nil {
+ logx.Errorf("process model json.Unmarshal:%v", err)
+ return err
+ }
+ return nil
}
func NewProcessModelSearch() *ProcessModelSearch {
@@ -64,8 +78,19 @@
slf.Product = product
return slf
}
+
func (slf *ProcessModelSearch) SetProcedure(procedure string) *ProcessModelSearch {
slf.Procedure = procedure
+ return slf
+}
+
+func (slf *ProcessModelSearch) SetProcedures(procedures []string) *ProcessModelSearch {
+ slf.Procedures = procedures
+ return slf
+}
+
+func (slf *ProcessModelSearch) SetIsNew(isNew bool) *ProcessModelSearch {
+ slf.IsNew = isNew
return slf
}
@@ -84,6 +109,10 @@
db = db.Where("`procedure` = ?", slf.Procedure)
}
+ if len(slf.Procedures) != 0 {
+ db = db.Where("`procedure` in ?", slf.Procedures)
+ }
+
if len(slf.Number) != 0 {
db = db.Where("number = ?", slf.Number)
}
@@ -92,6 +121,10 @@
db = db.Order(slf.Order)
}
+ if slf.IsNew {
+ db = db.Where("is_new = ?", 1)
+ }
+
return db
}
diff --git a/model/request/task.go b/model/request/task.go
index 212bb81..b1054ea 100644
--- a/model/request/task.go
+++ b/model/request/task.go
@@ -26,3 +26,10 @@
ProcedureId int `json:"procedureId" binding:"required"`
Channel int32 `json:"channel"`
}
+
+// ProcessModelList 宸ヨ壓鍙傛暟鍒楄〃璇锋眰鍙傛暟
+type ProcessModelList struct {
+ PageInfo
+ ProcedureId int `json:"procedureId" form:"procedureId" binding:"required"` //褰撳墠鐨勫伐搴廼d
+ Number string `json:"number" form:"number" binding:"required"` //褰撳墠姝ｅ湪浣跨敤鐨勫伐鑹哄弬鏁扮紪鍙�
+}
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..175f3e7 100644
--- a/nsq/msg_handler.go
+++ b/nsq/msg_handler.go
@@ -219,10 +219,59 @@
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
+}
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..7d504cf 100644
--- a/router/index.go
+++ b/router/index.go
@@ -59,6 +59,18 @@
plcGroup.POST("setProductNumber", plcApi.SetProductNumber) // 涓嬪彂鐢熶骇鎬婚噺
}
+ processModelApi := new(v1.ProcessModelApi)
+ processModelGroup := v1Group.Group("processModel")
+ {
+ processModelGroup.GET("list", processModelApi.List) // 鏂颁换鍔″�掕鏃�
+ }
+
+ eventsApi := new(v1.EventsApi)
+ eventsGroup := v1Group.Group("events")
+ {
+ eventsGroup.GET("", eventsApi.Events) // 鎺ㄩ�佹暟鎹�
+ }
+
InitPlcBrandRouter(v1Group)
return Router
diff --git a/service/process_model.go b/service/process_model.go
index 7b70e66..c4ff7dd 100644
--- a/service/process_model.go
+++ b/service/process_model.go
@@ -1,37 +1,17 @@
package service
-type ProcessModel struct{}
-
-const (
- GetProcessModelUrl = "/api-s/v1/processParams/info"
+import (
+ "apsClient/conf"
+ "apsClient/model"
)
-type GetProcessModelParams struct {
- WorkOrder string `json:"workOrder,omitempty" form:"workOrder"` //宸ュ簭缂栧彿
- OrderId string `json:"orderId"` // 璁㈠崟鍙�
- Product string `json:"password"` // 浜у搧
- Procedure string `json:"procedure"` // 宸ュ簭
- Device string `json:"device"` // 璁惧
+func GetProcessModelList(page, pageSize int) (list []*model.ProcessModel, total int64, err error) {
+ device, err := model.NewDeviceSearch().SetDeviceId(conf.Conf.System.DeviceId).First()
+ if err != nil {
+ return
+ }
+ list, total, err = model.NewProcessModelSearch().
+ SetIsNew(true).SetOrder("id desc").
+ SetPage(page, pageSize).SetProcedures(device.ProceduresArr).Find()
+ return
}
-type GetProcessModel struct {
- Number string `json:"number"` //宸ヨ壓妯″瀷缂栧彿
- OrderId string `json:"orderId"` //璁㈠崟id
- Product string `json:"product"` //浜у搧鍚嶇О
- Procedure string `json:"procedure"` //宸ュ簭
- WorkOrder string `json:"workOrder"` //宸ュ崟
- Device string `json:"device"` //璁惧
- ParamsMap map[string]interface{} `json:"paramsMap"`
-}
-
-type GetProcessModelResponse struct {
- Code int
- Msg string
- Data GetProcessModel
-}
-
-//// GetProcessModel 鑾峰彇宸ヨ壓妯″瀷
-//func (slf ProcessModel) GetProcessModel(params GetProcessModelParams) (GetProcessModel GetProcessModel, err error) {
-// resp := new(GetProcessModelResponse)
-// err = httpx.SendPostAndParseJson(conf.Conf.Services.ApsServer+GetProcessModelUrl, params, resp)
-// return resp.Data, err
-//}
diff --git a/service/task.go b/service/task.go
index 23fe74f..e20f5c5 100644
--- a/service/task.go
+++ b/service/task.go
@@ -10,7 +10,6 @@
"apsClient/pkg/ecode"
"apsClient/pkg/logx"
"apsClient/pkg/structx"
- "encoding/json"
"fmt"
"gorm.io/gorm"
"time"
@@ -113,7 +112,8 @@
return taskResp, ecode.OK
}
func (slf TaskService) NewTaskCount() (count int64) {
- count, _ = model.NewProceduresSearch(nil).SetDeviceId(conf.Conf.System.DeviceId).SetStatus(model.ProcedureStatusWaitProcess).Count()
+ nowTs := time.Now().Unix()
+ count, _ = model.NewProceduresSearch(nil).SetDeviceId(conf.Conf.System.DeviceId).SetStatus(model.ProcedureStatusWaitProcess).SetEndTimeMin(nowTs).Count()
return count
}
@@ -176,11 +176,6 @@
return nil, err
}
if err == nil {
- err = json.Unmarshal([]byte(data.Params), &data.ParamsMap)
- if err != nil {
- logx.Errorf("process model json.Unmarshal:%v", err)
- return
- }
return data, nil
}
--
Gitblit v1.8.0