From 6267ca2039e6538e4f687071e71e2ad2dda11d09 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 13 十一月 2023 17:04:57 +0800
Subject: [PATCH] 系统启动时，保存systemDeviceId记录并上报
---
docs/docs.go | 705 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 659 insertions(+), 46 deletions(-)
diff --git a/docs/docs.go b/docs/docs.go
index 3c69775..35c052f 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -152,6 +152,97 @@
}
}
},
+ "/v1/device/config": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "璁惧"
+ ],
+ "summary": "璁剧疆璁惧涓�浜涢厤缃�",
+ "parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.DeviceConfig"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/contextx.Response"
+ }
+ }
+ }
+ }
+ },
+ "/v1/device/list": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "璁惧"
+ ],
+ "summary": "鑾峰彇褰撳墠闈㈡澘缁戝畾鐨勮澶囧垪琛�",
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "allOf": [
+ {
+ "$ref": "#/definitions/contextx.Response"
+ },
+ {
+ "type": "object",
+ "properties": {
+ "data": {
+ "$ref": "#/definitions/response.DeviceListResponse"
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/v1/device/setCurrentDeviceId": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "璁惧"
+ ],
+ "summary": "璁剧疆褰撳墠璁惧id",
+ "parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.SetCurrentDevice"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/contextx.Response"
+ }
+ }
+ }
+ }
+ },
"/v1/plc/productProgress": {
"post": {
"produces": [
@@ -168,41 +259,10 @@
"in": "body",
"required": true,
"schema": {
- "$ref": "#/definitions/request.SendProcessParams"
+ "$ref": "#/definitions/request.GetProductProgress"
}
}
],
- "responses": {
- "200": {
- "description": "鎴愬姛",
- "schema": {
- "allOf": [
- {
- "$ref": "#/definitions/contextx.Response"
- },
- {
- "type": "object",
- "properties": {
- "data": {
- "$ref": "#/definitions/response.ProductProgress"
- }
- }
- }
- ]
- }
- }
- }
- }
- },
- "/v1/plc/productProgressRealTime": {
- "post": {
- "produces": [
- "application/json"
- ],
- "tags": [
- "鐢熶骇鏁伴噺"
- ],
- "summary": "瀹炴椂鑾峰彇鐢熶骇杩涘害",
"responses": {
"200": {
"description": "鎴愬姛",
@@ -366,6 +426,95 @@
}
}
},
+ "/v1/processModel/list": {
+ "get": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "宸ヨ壓妯″瀷"
+ ],
+ "summary": "鑾峰彇宸ヨ壓妯″瀷鍒楄〃",
+ "parameters": [
+ {
+ "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": {
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/model.ProcessModel"
+ }
+ }
+ }
+ }
+ ]
+ }
+ }
+ }
+ }
+ },
+ "/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": [
@@ -446,6 +595,26 @@
"description": "姣忛〉澶у皬",
"name": "pageSize",
"in": "query"
+ },
+ {
+ "enum": [
+ 1,
+ 2,
+ 3
+ ],
+ "type": "integer",
+ "x-enum-comments": {
+ "TaskModeCurrent": "鏈紑濮嬬殑鍜岃繘琛屼腑鐨�",
+ "TaskModeLastFinished": "涓婁竴涓粨鏉熺殑",
+ "TaskModeUnStarted": "鏈紑濮嬬殑"
+ },
+ "x-enum-varnames": [
+ "TaskModeUnStarted",
+ "TaskModeCurrent",
+ "TaskModeLastFinished"
+ ],
+ "name": "taskMode",
+ "in": "query"
}
],
"responses": {
@@ -470,7 +639,7 @@
}
}
},
- "/v1/task/get/unStarted": {
+ "/v1/task/list": {
"get": {
"produces": [
"application/json"
@@ -478,18 +647,45 @@
"tags": [
"Task"
],
- "summary": "鑾峰彇鏈紑濮嬬殑浠诲姟",
+ "summary": "鑾峰彇浠诲姟鍒楄〃2",
"parameters": [
{
"type": "integer",
- "description": "椤电爜",
- "name": "page",
+ "description": "閫氶亾鍙枫�備笉浼犲彇鍏ㄩ儴鐨�",
+ "name": "channel",
+ "in": "query"
+ },
+ {
+ "type": "string",
+ "name": "deviceID",
"in": "query"
},
{
"type": "integer",
- "description": "姣忛〉澶у皬",
- "name": "pageSize",
+ "description": "榛樿3",
+ "name": "limit",
+ "in": "query"
+ },
+ {
+ "type": "integer",
+ "description": "榛樿0",
+ "name": "offset",
+ "in": "query"
+ },
+ {
+ "enum": [
+ 1,
+ 2,
+ 3
+ ],
+ "type": "integer",
+ "x-enum-varnames": [
+ "QueryTypeUnFinish",
+ "QueryTypeToday",
+ "QueryTypeFinished"
+ ],
+ "description": "1 鏈畬鎴� 2 浠婂ぉ鏈畬鎴� 3 宸插畬鎴�",
+ "name": "type",
"in": "query"
}
],
@@ -505,7 +701,10 @@
"type": "object",
"properties": {
"data": {
- "$ref": "#/definitions/response.TaskData"
+ "type": "object",
+ "additionalProperties": {
+ "$ref": "#/definitions/response.TaskResponse"
+ }
}
}
}
@@ -580,6 +779,36 @@
}
}
]
+ }
+ }
+ }
+ }
+ },
+ "/v1/task/updateProcessParams": {
+ "post": {
+ "produces": [
+ "application/json"
+ ],
+ "tags": [
+ "Task"
+ ],
+ "summary": "鏇存柊宸ヨ壓鍙傛暟锛堣繘琛屼腑鐨勪换鍔★級",
+ "parameters": [
+ {
+ "description": "鏌ヨ鍙傛暟",
+ "name": "object",
+ "in": "body",
+ "required": true,
+ "schema": {
+ "$ref": "#/definitions/request.SendProcessParams"
+ }
+ }
+ ],
+ "responses": {
+ "200": {
+ "description": "鎴愬姛",
+ "schema": {
+ "$ref": "#/definitions/contextx.Response"
}
}
}
@@ -699,16 +928,36 @@
}
}
},
+ "constvar.Parity": {
+ "type": "integer",
+ "enum": [
+ 1,
+ 2,
+ 3
+ ],
+ "x-enum-comments": {
+ "ParityEven": "濂囨牎楠�",
+ "ParityNull": "鏃犳牎楠�",
+ "ParityOdd": "鍋舵牎楠�"
+ },
+ "x-enum-varnames": [
+ "ParityEven",
+ "ParityOdd",
+ "ParityNull"
+ ]
+ },
"constvar.PlcMethod": {
"type": "string",
"enum": [
"modbusTCP",
+ "modbusRTU",
"serial",
"缃戠粶",
"涓插彛"
],
"x-enum-varnames": [
"PlcMethodModbusTCP",
+ "PlcMethodModbusRTU",
"PlcMethodSerial",
"PlcMethodModbusTCPChinese",
"PlcMethodSerialChinese"
@@ -729,11 +978,73 @@
"type": "string",
"enum": [
"string",
- "int"
+ "int16",
+ "int32"
],
"x-enum-varnames": [
"PlcStartAddressValueTypeString",
- "PlcStartAddressValueTypeInt"
+ "PlcStartAddressValueTypeInt16",
+ "PlcStartAddressValueTypeInt32"
+ ]
+ },
+ "constvar.ProblemCode": {
+ "type": "string",
+ "enum": [
+ "service",
+ "network",
+ "db",
+ "serf",
+ "cloud",
+ "device",
+ "process_model",
+ "plc_config",
+ "plc_address_list",
+ "plc_process_model_address_list",
+ "plc_connect"
+ ],
+ "x-enum-comments": {
+ "ProblemCodeCloud": "鏈繛鎺ヤ簯绔�",
+ "ProblemCodeDB": "鏁版嵁搴撹繛鎺ラ敊璇�",
+ "ProblemCodeDevice": "鏈粦瀹氳澶�",
+ "ProblemCodeNetwork": "缃戠粶閿欒",
+ "ProblemCodePlcAddressList": "plc鍦板潃琛ㄧ己澶�",
+ "ProblemCodePlcConfig": "plc閰嶇疆缂哄け",
+ "ProblemCodePlcConnect": "plc杩炴帴澶辫触",
+ "ProblemCodePlcProcessModelAddressList": "plc鍦板潃琛ㄧ己澶�",
+ "ProblemCodeProcessModel": "宸ヨ壓鍙傛暟缂哄け",
+ "ProblemCodeSerf": "鏈姞鍏erf闆嗙兢",
+ "ProblemCodeService": "鏈嶅姟涓嶅彲鐢�"
+ },
+ "x-enum-varnames": [
+ "ProblemCodeService",
+ "ProblemCodeNetwork",
+ "ProblemCodeDB",
+ "ProblemCodeSerf",
+ "ProblemCodeCloud",
+ "ProblemCodeDevice",
+ "ProblemCodeProcessModel",
+ "ProblemCodePlcConfig",
+ "ProblemCodePlcAddressList",
+ "ProblemCodePlcProcessModelAddressList",
+ "ProblemCodePlcConnect"
+ ]
+ },
+ "constvar.TaskMode": {
+ "type": "integer",
+ "enum": [
+ 1,
+ 2,
+ 3
+ ],
+ "x-enum-comments": {
+ "TaskModeCurrent": "鏈紑濮嬬殑鍜岃繘琛屼腑鐨�",
+ "TaskModeLastFinished": "涓婁竴涓粨鏉熺殑",
+ "TaskModeUnStarted": "鏈紑濮嬬殑"
+ },
+ "x-enum-varnames": [
+ "TaskModeUnStarted",
+ "TaskModeCurrent",
+ "TaskModeLastFinished"
]
},
"contextx.Response": {
@@ -752,7 +1063,7 @@
"type": "object",
"properties": {
"address": {
- "description": "PortName string ` + "`" + `gorm:\"type:varchar(191);comment:绔彛鍚嶇О\" json:\"portName\"` + "`" + `\nFrequency int ` + "`" + `gorm:\"comment:鏁版嵁鏇存柊棰戠巼 0-瀹炴椂鏇存柊 1-1娆�/绉抃" json:\"frequency\"` + "`" + `",
+ "description": "plc ip鍦板潃锛� method = modbusTCP鐢�",
"type": "string"
},
"baudRate": {
@@ -762,11 +1073,25 @@
"brand": {
"type": "string"
},
+ "createdAt": {
+ "type": "string"
+ },
+ "dataBit": {
+ "description": "鏁版嵁浣嶏紝method = modbusRTU 鐢�",
+ "type": "integer"
+ },
+ "deletedAt": {
+ "type": "string"
+ },
"details": {
"type": "array",
"items": {
"$ref": "#/definitions/model.DevicePlcAddress"
}
+ },
+ "deviceID": {
+ "description": "璁惧缂栧彿",
+ "type": "string"
},
"id": {
"type": "integer"
@@ -777,12 +1102,27 @@
"method": {
"$ref": "#/definitions/constvar.PlcMethod"
},
+ "parity": {
+ "description": "鏍￠獙鏂瑰紡锛宮ethod = modbusRTU 鐢�",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.Parity"
+ }
+ ]
+ },
"port": {
"description": "plc 绔彛鍙凤紝 method = modbusTCP鐢�",
"type": "integer"
},
"serialName": {
"description": "涓插彛鍚嶇О锛宮ethod = serial鏃� 鐢�",
+ "type": "string"
+ },
+ "stopBit": {
+ "description": "鍋滄浣嶏紝method = modbusRTU 鐢�",
+ "type": "integer"
+ },
+ "updatedAt": {
"type": "string"
}
}
@@ -829,6 +1169,12 @@
"networkCard"
],
"properties": {
+ "createdAt": {
+ "type": "string"
+ },
+ "deletedAt": {
+ "type": "string"
+ },
"dns": {
"description": "dns",
"type": "string"
@@ -859,6 +1205,9 @@
"$ref": "#/definitions/model.NetConfigStatus"
}
]
+ },
+ "updatedAt": {
+ "type": "string"
}
}
},
@@ -883,13 +1232,22 @@
"amount": {
"type": "number"
},
+ "createdAt": {
+ "type": "string"
+ },
"customer": {
+ "type": "string"
+ },
+ "deletedAt": {
"type": "string"
},
"deliverDate": {
"type": "string"
},
"endTime": {
+ "type": "integer"
+ },
+ "id": {
"type": "integer"
},
"orderAttr": {
@@ -917,6 +1275,9 @@
"unit": {
"type": "string"
},
+ "updatedAt": {
+ "type": "string"
+ },
"workOrderId": {
"type": "string"
}
@@ -938,10 +1299,19 @@
"model.PlcBrand": {
"type": "object",
"properties": {
+ "createdAt": {
+ "type": "string"
+ },
+ "deletedAt": {
+ "type": "string"
+ },
"id": {
"type": "integer"
},
"name": {
+ "type": "string"
+ },
+ "updatedAt": {
"type": "string"
}
}
@@ -966,6 +1336,12 @@
"description": "閫氶亾",
"type": "integer"
},
+ "createdAt": {
+ "type": "string"
+ },
+ "deletedAt": {
+ "type": "string"
+ },
"deviceId": {
"type": "string"
},
@@ -986,24 +1362,141 @@
"procedureId": {
"type": "string"
},
+ "processModelNumber": {
+ "description": "宸ヨ壓妯″瀷缂栧彿",
+ "type": "string"
+ },
+ "realEndTime": {
+ "type": "integer"
+ },
+ "realStartTime": {
+ "type": "integer"
+ },
"startTime": {
"type": "integer"
},
"status": {
"$ref": "#/definitions/model.ProcedureStatus"
+ },
+ "updatedAt": {
+ "type": "string"
+ }
+ }
+ },
+ "model.ProcessModel": {
+ "type": "object",
+ "properties": {
+ "createdAt": {
+ "type": "string"
+ },
+ "deletedAt": {
+ "type": "string"
+ },
+ "deviceId": {
+ "description": "鐢ㄤ簬杩囨护鑾峰彇nsq娑堟伅",
+ "type": "string"
+ },
+ "id": {
+ "type": "integer"
+ },
+ "isUpdate": {
+ "description": "鍓嶇鐢�",
+ "type": "boolean"
+ },
+ "newNumber": {
+ "type": "string"
+ },
+ "newParamsMap": {
+ "type": "object",
+ "additionalProperties": true
+ },
+ "number": {
+ "description": "宸ヨ壓妯″瀷缂栧彿",
+ "type": "string"
+ },
+ "params": {
+ "type": "string"
+ },
+ "paramsMap": {
+ "type": "object",
+ "additionalProperties": true
+ },
+ "procedure": {
+ "description": "宸ュ簭",
+ "type": "string"
+ },
+ "product": {
+ "description": "浜у搧鍚嶇О",
+ "type": "string"
+ },
+ "updatedAt": {
+ "type": "string"
+ }
+ }
+ },
+ "problem.CheckResult": {
+ "type": "object",
+ "properties": {
+ "checkResult": {
+ "type": "boolean"
+ },
+ "itemCode": {
+ "$ref": "#/definitions/constvar.ProblemCode"
+ },
+ "itemName": {
+ "type": "string"
}
}
},
"request.AddPlcBrand": {
"type": "object",
"properties": {
+ "createdAt": {
+ "type": "string"
+ },
+ "deletedAt": {
+ "type": "string"
+ },
"id": {
"type": "integer"
},
"name": {
"type": "string"
+ },
+ "updatedAt": {
+ "type": "string"
}
}
+ },
+ "request.DeviceConfig": {
+ "type": "object",
+ "properties": {
+ "needSetProcessParams": {
+ "description": "鏄惁闇�瑕佽缃伐鑹哄弬鏁�",
+ "type": "boolean"
+ }
+ }
+ },
+ "request.GetProductProgress": {
+ "type": "object",
+ "properties": {
+ "channel": {
+ "type": "integer"
+ }
+ }
+ },
+ "request.QueryType": {
+ "type": "integer",
+ "enum": [
+ 1,
+ 2,
+ 3
+ ],
+ "x-enum-varnames": [
+ "QueryTypeUnFinish",
+ "QueryTypeToday",
+ "QueryTypeFinished"
+ ]
},
"request.SendProcessParams": {
"type": "object",
@@ -1011,11 +1504,17 @@
"procedureId"
],
"properties": {
- "channel": {
- "type": "integer"
- },
"procedureId": {
"type": "integer"
+ }
+ }
+ },
+ "request.SetCurrentDevice": {
+ "type": "object",
+ "properties": {
+ "currentDeviceID": {
+ "description": "褰撳墠閫夊畾鐨勭敓浜ц澶�",
+ "type": "string"
}
}
},
@@ -1023,7 +1522,7 @@
"type": "object",
"properties": {
"address": {
- "description": "PortName string ` + "`" + `gorm:\"type:varchar(191);comment:绔彛鍚嶇О\" json:\"portName\"` + "`" + `\nFrequency int ` + "`" + `gorm:\"comment:鏁版嵁鏇存柊棰戠巼 0-瀹炴椂鏇存柊 1-1娆�/绉抃" json:\"frequency\"` + "`" + `",
+ "description": "plc ip鍦板潃锛� method = modbusTCP鐢�",
"type": "string"
},
"baudRate": {
@@ -1033,11 +1532,25 @@
"brand": {
"type": "string"
},
+ "createdAt": {
+ "type": "string"
+ },
+ "dataBit": {
+ "description": "鏁版嵁浣嶏紝method = modbusRTU 鐢�",
+ "type": "integer"
+ },
+ "deletedAt": {
+ "type": "string"
+ },
"details": {
"type": "array",
"items": {
"$ref": "#/definitions/model.DevicePlcAddress"
}
+ },
+ "deviceID": {
+ "description": "璁惧缂栧彿",
+ "type": "string"
},
"id": {
"type": "integer"
@@ -1048,6 +1561,14 @@
"method": {
"$ref": "#/definitions/constvar.PlcMethod"
},
+ "parity": {
+ "description": "鏍￠獙鏂瑰紡锛宮ethod = modbusRTU 鐢�",
+ "allOf": [
+ {
+ "$ref": "#/definitions/constvar.Parity"
+ }
+ ]
+ },
"port": {
"description": "plc 绔彛鍙凤紝 method = modbusTCP鐢�",
"type": "integer"
@@ -1055,17 +1576,88 @@
"serialName": {
"description": "涓插彛鍚嶇О锛宮ethod = serial鏃� 鐢�",
"type": "string"
+ },
+ "stopBit": {
+ "description": "鍋滄浣嶏紝method = modbusRTU 鐢�",
+ "type": "integer"
+ },
+ "updatedAt": {
+ "type": "string"
}
}
},
"request.UpdatePlcBrand": {
"type": "object",
"properties": {
+ "createdAt": {
+ "type": "string"
+ },
+ "deletedAt": {
+ "type": "string"
+ },
"id": {
"type": "integer"
},
"name": {
"type": "string"
+ },
+ "updatedAt": {
+ "type": "string"
+ }
+ }
+ },
+ "response.Device": {
+ "type": "object",
+ "properties": {
+ "deviceID": {
+ "type": "string"
+ },
+ "deviceName": {
+ "type": "string"
+ },
+ "needSetProcessParams": {
+ "description": "鏄惁闇�瑕佽缃伐鑹哄弬鏁�",
+ "type": "boolean"
+ }
+ }
+ },
+ "response.DeviceListResponse": {
+ "type": "object",
+ "properties": {
+ "clusterNodeQuantity": {
+ "description": "闆嗙兢鑺傜偣鏁伴噺",
+ "type": "integer"
+ },
+ "clusterStatus": {
+ "description": "闆嗙兢鐘舵��",
+ "type": "string"
+ },
+ "currentDeviceID": {
+ "description": "褰撳墠閫夊畾鐨勭敓浜ц澶�",
+ "type": "string"
+ },
+ "deviceList": {
+ "description": "鐢熶骇璁惧id鍒楄〃",
+ "type": "array",
+ "items": {
+ "$ref": "#/definitions/response.Device"
+ }
+ },
+ "systemDeviceID": {
+ "description": "宸ユ帶鏈鸿澶嘔D",
+ "type": "string"
+ },
+ "systemDeviceRunSince": {
+ "description": "绯荤粺杩愯寮�濮嬫椂闂存埑",
+ "type": "integer"
+ },
+ "systemDeviceStatus": {
+ "description": "璁惧鐘舵��",
+ "allOf": [
+ {
+ "$ref": "#/definitions/response.SystemDeviceStatus"
+ }
+ ]
}
}
},
@@ -1110,6 +1702,12 @@
"response.ProductProgress": {
"type": "object",
"properties": {
+ "RealEndTime": {
+ "type": "integer"
+ },
+ "RealStartTime": {
+ "type": "integer"
+ },
"finishNumber": {
"type": "integer"
},
@@ -1121,6 +1719,21 @@
}
}
},
+ "response.SystemDeviceStatus": {
+ "type": "integer",
+ "enum": [
+ 1,
+ 2
+ ],
+ "x-enum-comments": {
+ "SystemDeviceStatusNormal": "姝ｅ父",
+ "SystemDeviceStatusUnNormal": "寮傚父"
+ },
+ "x-enum-varnames": [
+ "SystemDeviceStatusNormal",
+ "SystemDeviceStatusUnNormal"
+ ]
+ },
"response.TaskCountdown": {
"type": "object",
"properties": {
--
Gitblit v1.8.0