From 0a5276032dcc8719bbaa9e37586e804380204147 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 02 十一月 2023 18:23:52 +0800
Subject: [PATCH] 工艺参数列表去掉process_number参数
---
service/problem/check.go | 3
router/index.go | 6 +
docs/swagger.yaml | 70 ++++++++++++++
api/v1/process_model.go | 12 +
docs/docs.go | 96 +++++++++++++++++++
model/request/task.go | 3
docs/swagger.json | 96 +++++++++++++++++++
7 files changed, 280 insertions(+), 6 deletions(-)
diff --git a/api/v1/process_model.go b/api/v1/process_model.go
index 8a03909..baa40f3 100644
--- a/api/v1/process_model.go
+++ b/api/v1/process_model.go
@@ -24,9 +24,15 @@
if !ok {
return
}
- oldProcessModel, _ := service.GetProcessModelByNumber(params.Number)
+ procedure, code := service.NewTaskService().GetProcedureById(params.ProcedureId)
+ if code != ecode.OK {
+ ctx.Fail(code)
+ return
+ }
+
+ oldProcessModel, _ := service.GetProcessModelByNumber(procedure.ProcessModelNumber)
offset, limit, push := GetOffsetAndLimit(oldProcessModel, params.Page, params.PageSize)
- list, total, err := service.GetProcessModelList(offset, limit, params.Number)
+ list, total, err := service.GetProcessModelList(offset, limit, procedure.ProcessModelNumber)
if err != nil {
ctx.Fail(ecode.DBErr)
return
@@ -37,7 +43,7 @@
}
for _, processModel := range list {
if processModel.Procedure == oldProcessModel.Procedure && processModel.Product == oldProcessModel.Product {
- processModel.IsUpdate = processModel.Number != params.Number
+ processModel.IsUpdate = processModel.Number != procedure.ProcessModelNumber
}
if processModel.IsUpdate {
processModel.NewNumber, processModel.NewParamsMap = processModel.Number, processModel.ParamsMap
diff --git a/docs/docs.go b/docs/docs.go
index 27a9079..3ef0ce7 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -458,6 +458,40 @@
}
}
},
+ "/v1/system/problemList": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "绯荤粺"
+ ],
+ "summary": "闂璇婃柇/闂鍒楄〃",
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/contextx.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/problem.CheckResult"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
"/v1/task/countdown": {
"get": {
"produces": [
@@ -933,6 +967,48 @@
"PlcStartAddressValueTypeInt"
]
},
+ "constvar.ProblemCode": {
+ "type": "string",
+ "enum": [
+ "service",
+ "network",
+ "db",
+ "serf",
+ "nsq",
+ "device",
+ "process_model",
+ "plc_config",
+ "plc_address_list",
+ "plc_process_model_address_list",
+ "plc_connect"
+ ],
+ "x-enum-comments": {
+ "ProblemCodeDB": "鏁版嵁搴撹繛鎺ラ敊璇�",
+ "ProblemCodeDevice": "鏈粦瀹氳澶�",
+ "ProblemCodeNetwork": "缃戠粶閿欒",
+ "ProblemCodeNsq": "鏈繛鎺ユ秷鎭槦鍒�",
+ "ProblemCodePlcAddressList": "plc鍦板潃琛ㄧ己澶�",
+ "ProblemCodePlcConfig": "plc閰嶇疆缂哄け",
+ "ProblemCodePlcConnect": "plc杩炴帴澶辫触",
+ "ProblemCodePlcProcessModelAddressList": "plc鍦板潃琛ㄧ己澶�",
+ "ProblemCodeProcessModel": "宸ヨ壓鍙傛暟缂哄け",
+ "ProblemCodeSerf": "鏈姞鍏erf闆嗙兢",
+ "ProblemCodeService": "鏈嶅姟涓嶅彲鐢�"
+ },
+ "x-enum-varnames": [
+ "ProblemCodeService",
+ "ProblemCodeNetwork",
+ "ProblemCodeDB",
+ "ProblemCodeSerf",
+ "ProblemCodeNsq",
+ "ProblemCodeDevice",
+ "ProblemCodeProcessModel",
+ "ProblemCodePlcConfig",
+ "ProblemCodePlcAddressList",
+ "ProblemCodePlcProcessModelAddressList",
+ "ProblemCodePlcConnect"
+ ]
+ },
"constvar.TaskMode": {
"type": "integer",
"enum": [
@@ -1338,6 +1414,20 @@
}
}
},
+ "problem.CheckResult": {
+ "type": "object",
+ "properties": {
+ "checkResult": {
+ "type": "boolean"
+ },
+ "itemCode": {
+ "$ref": "#/definitions/constvar.ProblemCode"
+ },
+ "itemName": {
+ "type": "string"
+ }
+ }
+ },
"request.AddPlcBrand": {
"type": "object",
"properties": {
@@ -1560,6 +1650,12 @@
"response.ProductProgress": {
"type": "object",
"properties": {
+ "RealEndTime": {
+ "type": "integer"
+ },
+ "RealStartTime": {
+ "type": "integer"
+ },
"finishNumber": {
"type": "integer"
},
diff --git a/docs/swagger.json b/docs/swagger.json
index 45f97c4..ee5eeec 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -446,6 +446,40 @@
}
}
},
+ "/v1/system/problemList": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "绯荤粺"
+ ],
+ "summary": "闂璇婃柇/闂鍒楄〃",
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/contextx.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/problem.CheckResult"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
"/v1/task/countdown": {
"get": {
"produces": [
@@ -921,6 +955,48 @@
"PlcStartAddressValueTypeInt"
]
},
+ "constvar.ProblemCode": {
+ "type": "string",
+ "enum": [
+ "service",
+ "network",
+ "db",
+ "serf",
+ "nsq",
+ "device",
+ "process_model",
+ "plc_config",
+ "plc_address_list",
+ "plc_process_model_address_list",
+ "plc_connect"
+ ],
+ "x-enum-comments": {
+ "ProblemCodeDB": "鏁版嵁搴撹繛鎺ラ敊璇�",
+ "ProblemCodeDevice": "鏈粦瀹氳澶�",
+ "ProblemCodeNetwork": "缃戠粶閿欒",
+ "ProblemCodeNsq": "鏈繛鎺ユ秷鎭槦鍒�",
+ "ProblemCodePlcAddressList": "plc鍦板潃琛ㄧ己澶�",
+ "ProblemCodePlcConfig": "plc閰嶇疆缂哄け",
+ "ProblemCodePlcConnect": "plc杩炴帴澶辫触",
+ "ProblemCodePlcProcessModelAddressList": "plc鍦板潃琛ㄧ己澶�",
+ "ProblemCodeProcessModel": "宸ヨ壓鍙傛暟缂哄け",
+ "ProblemCodeSerf": "鏈姞鍏erf闆嗙兢",
+ "ProblemCodeService": "鏈嶅姟涓嶅彲鐢�"
+ },
+ "x-enum-varnames": [
+ "ProblemCodeService",
+ "ProblemCodeNetwork",
+ "ProblemCodeDB",
+ "ProblemCodeSerf",
+ "ProblemCodeNsq",
+ "ProblemCodeDevice",
+ "ProblemCodeProcessModel",
+ "ProblemCodePlcConfig",
+ "ProblemCodePlcAddressList",
+ "ProblemCodePlcProcessModelAddressList",
+ "ProblemCodePlcConnect"
+ ]
+ },
"constvar.TaskMode": {
"type": "integer",
"enum": [
@@ -1326,6 +1402,20 @@
}
}
},
+ "problem.CheckResult": {
+ "type": "object",
+ "properties": {
+ "checkResult": {
+ "type": "boolean"
+ },
+ "itemCode": {
+ "$ref": "#/definitions/constvar.ProblemCode"
+ },
+ "itemName": {
+ "type": "string"
+ }
+ }
+ },
"request.AddPlcBrand": {
"type": "object",
"properties": {
@@ -1548,6 +1638,12 @@
"response.ProductProgress": {
"type": "object",
"properties": {
+ "RealEndTime": {
+ "type": "integer"
+ },
+ "RealStartTime": {
+ "type": "integer"
+ },
"finishNumber": {
"type": "integer"
},
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 5e38b70..91e5055 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -118,6 +118,44 @@
x-enum-varnames:
- PlcStartAddressValueTypeString
- PlcStartAddressValueTypeInt
+ constvar.ProblemCode:
+ enum:
+ - service
+ - network
+ - db
+ - serf
+ - nsq
+ - device
+ - process_model
+ - plc_config
+ - plc_address_list
+ - plc_process_model_address_list
+ - plc_connect
+ type: string
+ x-enum-comments:
+ ProblemCodeDB: 鏁版嵁搴撹繛鎺ラ敊璇�
+ ProblemCodeDevice: 鏈粦瀹氳澶�
+ ProblemCodeNetwork: 缃戠粶閿欒
+ ProblemCodeNsq: 鏈繛鎺ユ秷鎭槦鍒�
+ ProblemCodePlcAddressList: plc鍦板潃琛ㄧ己澶�
+ ProblemCodePlcConfig: plc閰嶇疆缂哄け
+ ProblemCodePlcConnect: plc杩炴帴澶辫触
+ ProblemCodePlcProcessModelAddressList: plc鍦板潃琛ㄧ己澶�
+ ProblemCodeProcessModel: 宸ヨ壓鍙傛暟缂哄け
+ ProblemCodeSerf: 鏈姞鍏erf闆嗙兢
+ ProblemCodeService: 鏈嶅姟涓嶅彲鐢�
+ x-enum-varnames:
+ - ProblemCodeService
+ - ProblemCodeNetwork
+ - ProblemCodeDB
+ - ProblemCodeSerf
+ - ProblemCodeNsq
+ - ProblemCodeDevice
+ - ProblemCodeProcessModel
+ - ProblemCodePlcConfig
+ - ProblemCodePlcAddressList
+ - ProblemCodePlcProcessModelAddressList
+ - ProblemCodePlcConnect
constvar.TaskMode:
enum:
- 1
@@ -394,6 +432,15 @@
updatedAt:
type: string
type: object
+ problem.CheckResult:
+ properties:
+ checkResult:
+ type: boolean
+ itemCode:
+ $ref: '#/definitions/constvar.ProblemCode'
+ itemName:
+ type: string
+ type: object
request.AddPlcBrand:
properties:
createdAt:
@@ -543,6 +590,10 @@
type: object
response.ProductProgress:
properties:
+ RealEndTime:
+ type: integer
+ RealStartTime:
+ type: integer
finishNumber:
type: integer
plcStatus:
@@ -882,6 +933,25 @@
summary: 鑾峰彇宸ヨ壓妯″瀷鍒楄〃
tags:
- 宸ヨ壓妯″瀷
+ /v1/system/problemList:
+ get:
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ allOf:
+ - $ref: '#/definitions/contextx.Response'
+ - properties:
+ data:
+ items:
+ $ref: '#/definitions/problem.CheckResult'
+ type: array
+ type: object
+ summary: 闂璇婃柇/闂鍒楄〃
+ tags:
+ - 绯荤粺
/v1/task/countdown:
get:
produces:
diff --git a/model/request/task.go b/model/request/task.go
index f72f5d5..1a2c6b6 100644
--- a/model/request/task.go
+++ b/model/request/task.go
@@ -29,8 +29,7 @@
// ProcessModelList 宸ヨ壓鍙傛暟鍒楄〃璇锋眰鍙傛暟
type ProcessModelList struct {
PageInfo
- ProcedureId uint `json:"procedureId" form:"procedureId" binding:"required"` //褰撳墠鐨勫伐搴廼d
- Number string `json:"number" form:"number" binding:"required"` //褰撳墠姝ｅ湪浣跨敤鐨勫伐鑹哄弬鏁扮紪鍙�
+ ProcedureId uint `json:"procedureId" form:"procedureId" binding:"required"` //褰撳墠鐨勫伐搴廼d
}
// TaskListByChannel 鎸塩hannel杩斿洖浠诲姟鍒楄〃璇锋眰鍙傛暟
diff --git a/router/index.go b/router/index.go
index f046b22..e0e357c 100644
--- a/router/index.go
+++ b/router/index.go
@@ -75,6 +75,12 @@
deviceGroup.GET("setCurrentDeviceId", deviceApi.SetCurrentDeviceId) // 鍒囨崲璁惧ID
}
+ systemApi := new(v1.SystemApi)
+ systemGroup := v1Group.Group("system")
+ {
+ systemGroup.GET("problemList", systemApi.ProblemList) // 闂璇婃柇鍒楄〃
+ }
+
//eventsApi := new(v1.EventsApi)
//eventsGroup := v1Group.Group("events")
//{
diff --git a/service/problem/check.go b/service/problem/check.go
index a7110d6..e8554c4 100644
--- a/service/problem/check.go
+++ b/service/problem/check.go
@@ -78,8 +78,9 @@
})
}
mutex.Lock()
+ defer mutex.Unlock()
checkResultList = checkResultListTemp
- mutex.Unlock()
+
}
func Get() []*CheckResult {
--
Gitblit v1.8.0