From e7d5e1be855743ee472269607c549d0c2f56533f Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 28 九月 2023 17:13:49 +0800
Subject: [PATCH] 根据设备支持的工序返回最新的工艺参数
---
service/task.go | 6 -
nsq/msg_handler.go | 11 ++
service/process_model.go | 44 ++------
router/index.go | 6 +
model/process_model.go | 44 +++++++-
docs/swagger.yaml | 26 +++++
api/v1/process_model.go | 32 ++++++
docs/docs.go | 45 +++++++++
model/request/task.go | 5 +
docs/swagger.json | 45 +++++++++
10 files changed, 219 insertions(+), 45 deletions(-)
diff --git a/api/v1/process_model.go b/api/v1/process_model.go
new file mode 100644
index 0000000..c20214b
--- /dev/null
+++ b/api/v1/process_model.go
@@ -0,0 +1,32 @@
+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
+ }
+ list, total, err := service.GetProcessModelList(params.Page, params.PageSize)
+ if err != nil {
+ ctx.Fail(ecode.DBErr)
+ return
+ }
+ ctx.ResultList(list, total)
+}
diff --git a/docs/docs.go b/docs/docs.go
index 06dc0d1..afaae07 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -366,6 +366,51 @@
}
}
},
+ "/v1/processModel/list": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "宸ヨ壓妯″瀷"
+ ],
+ "summary": "鑾峰彇宸ヨ壓妯″瀷鍒楄〃",
+ "parameters": [
+ {
+ "type": "integer",
+ "description": "椤电爜",
+ "name": "page",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "姣忛〉澶у皬",
+ "name": "pageSize",
+ "in": "query"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/contextx.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "$ref": "#/definitions/response.TaskCountdown"
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
"/v1/task/countdown": {
"get": {
"produces": [
diff --git a/docs/swagger.json b/docs/swagger.json
index 5cbcad0..2424d49 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -354,6 +354,51 @@
}
}
},
+ "/v1/processModel/list": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "宸ヨ壓妯″瀷"
+ ],
+ "summary": "鑾峰彇宸ヨ壓妯″瀷鍒楄〃",
+ "parameters": [
+ {
+ "type": "integer",
+ "description": "椤电爜",
+ "name": "page",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "姣忛〉澶у皬",
+ "name": "pageSize",
+ "in": "query"
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/contextx.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "$ref": "#/definitions/response.TaskCountdown"
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
"/v1/task/countdown": {
"get": {
"produces": [
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index a623758..e7a2ebb 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -648,6 +648,32 @@
summary: 鏇存柊plc鍝佺墝
tags:
- plc鍝佺墝
+ /v1/processModel/list:
+ get:
+ parameters:
+ - description: 椤电爜
+ in: query
+ name: page
+ type: integer
+ - description: 姣忛〉澶у皬
+ in: query
+ name: pageSize
+ 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/process_model.go b/model/process_model.go
index 1828814..9729a0c 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,31 @@
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:鏄惁鏈�鏂扮殑"` //鏄惁鏈�鏂扮殑
}
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 +77,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 +108,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 +120,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..272f1e1 100644
--- a/model/request/task.go
+++ b/model/request/task.go
@@ -26,3 +26,8 @@
ProcedureId int `json:"procedureId" binding:"required"`
Channel int32 `json:"channel"`
}
+
+// ProcessModelList 宸ヨ壓鍙傛暟鍒楄〃璇锋眰鍙傛暟
+type ProcessModelList struct {
+ PageInfo
+}
diff --git a/nsq/msg_handler.go b/nsq/msg_handler.go
index 7b62157..175f3e7 100644
--- a/nsq/msg_handler.go
+++ b/nsq/msg_handler.go
@@ -219,7 +219,16 @@
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
diff --git a/router/index.go b/router/index.go
index 1e2f69c..7d504cf 100644
--- a/router/index.go
+++ b/router/index.go
@@ -59,6 +59,12 @@
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")
{
diff --git a/service/process_model.go b/service/process_model.go
index 7b70e66..de73152 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).
+ 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 446ae6d..db15d10 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"
@@ -177,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