From fcacdbf9aa2598cbb08a880069abf892d69d061f Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 27 十一月 2023 17:24:06 +0800
Subject: [PATCH] fix
---
docs/swagger.yaml | 524 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 493 insertions(+), 31 deletions(-)
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index e17229c..f69843e 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -57,6 +57,8 @@
type: string
procedureName:
type: string
+ productProcedureID:
+ type: string
startTime:
type: integer
workHours:
@@ -74,15 +76,31 @@
safeProduce:
type: string
type: object
+ constvar.Parity:
+ enum:
+ - 1
+ - 2
+ - 3
+ type: integer
+ x-enum-comments:
+ ParityEven: 濂囨牎楠�
+ ParityNull: 鏃犳牎楠�
+ ParityOdd: 鍋舵牎楠�
+ x-enum-varnames:
+ - ParityEven
+ - ParityOdd
+ - ParityNull
constvar.PlcMethod:
enum:
- modbusTCP
+ - modbusRTU
- serial
- 缃戠粶
- 涓插彛
type: string
x-enum-varnames:
- PlcMethodModbusTCP
+ - PlcMethodModbusRTU
- PlcMethodSerial
- PlcMethodModbusTCPChinese
- PlcMethodSerialChinese
@@ -97,11 +115,51 @@
constvar.PlcStartAddressValueType:
enum:
- string
- - int
+ - int16
+ - int32
type: string
x-enum-varnames:
- PlcStartAddressValueTypeString
- - PlcStartAddressValueTypeInt
+ - PlcStartAddressValueTypeInt16
+ - PlcStartAddressValueTypeInt32
+ constvar.ProblemCode:
+ enum:
+ - service
+ - network
+ - db
+ - serf
+ - cloud
+ - device
+ - process_model
+ - plc_config
+ - plc_address_list
+ - plc_process_model_address_list
+ - plc_connect
+ type: string
+ 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:
enum:
- 1
@@ -124,33 +182,60 @@
msg:
type: string
type: object
+ contextx.ResponseList:
+ properties:
+ code:
+ type: integer
+ data: {}
+ msg:
+ type: string
+ total:
+ type: integer
+ type: object
model.DevicePlc:
properties:
address:
- description: |-
- PortName string `gorm:"type:varchar(191);comment:绔彛鍚嶇О" json:"portName"`
- Frequency int `gorm:"comment:鏁版嵁鏇存柊棰戠巼 0-瀹炴椂鏇存柊 1-1娆�/绉�" json:"frequency"`
+ description: plc ip鍦板潃锛� method = modbusTCP鐢�
type: string
baudRate:
description: 涓插彛娉㈢壒鐜囷紝 method = serial鏃� 鐢�
type: integer
brand:
type: string
+ createdAt:
+ type: string
+ dataBit:
+ description: 鏁版嵁浣嶏紝method = modbusRTU 鐢�
+ type: integer
+ deletedAt:
+ type: string
details:
items:
$ref: '#/definitions/model.DevicePlcAddress'
type: array
+ deviceID:
+ description: 璁惧缂栧彿
+ type: string
id:
type: integer
isOpen:
type: boolean
method:
$ref: '#/definitions/constvar.PlcMethod'
+ parity:
+ allOf:
+ - $ref: '#/definitions/constvar.Parity'
+ description: 鏍￠獙鏂瑰紡锛宮ethod = modbusRTU 鐢�
port:
description: plc 绔彛鍙凤紝 method = modbusTCP鐢�
type: integer
serialName:
description: 涓插彛鍚嶇О锛宮ethod = serial鏃� 鐢�
+ type: string
+ stopBit:
+ description: 鍋滄浣嶏紝method = modbusRTU 鐢�
+ type: integer
+ updatedAt:
type: string
type: object
model.DevicePlcAddress:
@@ -175,6 +260,10 @@
type: object
model.NetConfig:
properties:
+ createdAt:
+ type: string
+ deletedAt:
+ type: string
dns:
description: dns
type: string
@@ -196,6 +285,8 @@
allOf:
- $ref: '#/definitions/model.NetConfigStatus'
description: 鐘舵�侊紙1鍚敤2绂佺敤锛�
+ updatedAt:
+ type: string
required:
- gateway
- ip
@@ -217,11 +308,17 @@
properties:
amount:
type: number
+ createdAt:
+ type: string
customer:
+ type: string
+ deletedAt:
type: string
deliverDate:
type: string
endTime:
+ type: integer
+ id:
type: integer
orderAttr:
description: 璁㈠崟灞炴�ф嫾鎺ョ殑瀛楃涓诧紝鍗宠揣鐗╂弿杩�
@@ -240,6 +337,8 @@
$ref: '#/definitions/model.OrderStatus'
unit:
type: string
+ updatedAt:
+ type: string
workOrderId:
type: string
type: object
@@ -255,9 +354,15 @@
- OrderStatusFinished
model.PlcBrand:
properties:
+ createdAt:
+ type: string
+ deletedAt:
+ type: string
id:
type: integer
name:
+ type: string
+ updatedAt:
type: string
type: object
model.ProcedureStatus:
@@ -275,6 +380,10 @@
channel:
description: 閫氶亾
type: integer
+ createdAt:
+ type: string
+ deletedAt:
+ type: string
deviceId:
type: string
endTime:
@@ -290,16 +399,31 @@
processModelNumber:
description: 宸ヨ壓妯″瀷缂栧彿
type: string
+ productProcedureID:
+ description: 浜у搧宸ュ簭id
+ type: string
+ realEndTime:
+ type: integer
+ realStartTime:
+ type: integer
startTime:
type: integer
status:
$ref: '#/definitions/model.ProcedureStatus'
+ updatedAt:
+ type: string
type: object
model.ProcessModel:
properties:
+ createdAt:
+ type: string
+ deletedAt:
+ type: string
deviceId:
description: 鐢ㄤ簬杩囨护鑾峰彇nsq娑堟伅
type: string
+ id:
+ type: integer
isUpdate:
description: 鍓嶇鐢�
type: boolean
@@ -322,13 +446,119 @@
product:
description: 浜у搧鍚嶇О
type: string
+ updatedAt:
+ type: string
+ type: object
+ model.ReportWork:
+ properties:
+ barCode:
+ description: 鏉″舰鐮�
+ type: string
+ channel:
+ description: 閫氶亾
+ type: integer
+ createdAt:
+ type: string
+ deletedAt:
+ type: string
+ deviceId:
+ type: string
+ deviceName:
+ type: string
+ endTime:
+ type: integer
+ finishAmount:
+ description: 鏈鎶ュ伐 - 涓婃鎶ュ伐
+ type: integer
+ id:
+ type: integer
+ procedureId:
+ type: string
+ proceduresId:
+ description: procedures琛ㄧ殑id
+ type: integer
+ productProcedureID:
+ description: 浜у搧宸ュ簭id
+ type: string
+ reportAmount:
+ description: 鎶ュ伐鏁伴噺
+ type: integer
+ startTime:
+ type: integer
+ updatedAt:
+ type: string
+ workOrderId:
+ type: string
+ workerID:
+ description: 鎶ュ伐浜篿d
+ type: string
+ workerName:
+ description: 鎶ュ伐浜哄鍚�
+ type: string
+ workerTime:
+ description: 宸ユ椂锛屽崟浣嶇
+ type: integer
+ type: object
+ problem.CheckResult:
+ properties:
+ checkResult:
+ type: boolean
+ itemCode:
+ $ref: '#/definitions/constvar.ProblemCode'
+ itemName:
+ type: string
type: object
request.AddPlcBrand:
properties:
+ createdAt:
+ type: string
+ deletedAt:
+ type: string
id:
type: integer
name:
type: string
+ updatedAt:
+ type: string
+ type: object
+ request.DeviceConfig:
+ properties:
+ needSetProcessParams:
+ description: 鏄惁闇�瑕佽缃伐鑹哄弬鏁�
+ type: boolean
+ type: object
+ request.GetProductProgress:
+ properties:
+ channel:
+ type: integer
+ procedureId:
+ type: integer
+ type: object
+ request.QueryType:
+ enum:
+ - 1
+ - 2
+ - 3
+ type: integer
+ x-enum-varnames:
+ - QueryTypeUnFinish
+ - QueryTypeToday
+ - QueryTypeFinished
+ request.ReportWork:
+ properties:
+ procedureId:
+ description: 宸ュ簭id
+ type: integer
+ reportAmount:
+ description: 鎶ュ伐鏁伴噺
+ type: integer
+ workerID:
+ description: 鎶ュ憡鑰卛d
+ type: string
+ required:
+ - procedureId
+ - reportAmount
+ - workerID
type: object
request.SendProcessParams:
properties:
@@ -337,41 +567,107 @@
required:
- procedureId
type: object
+ request.SetCurrentDevice:
+ properties:
+ currentDeviceID:
+ description: 褰撳墠閫夊畾鐨勭敓浜ц澶�
+ type: string
+ type: object
request.UpdatePlc:
properties:
address:
- description: |-
- PortName string `gorm:"type:varchar(191);comment:绔彛鍚嶇О" json:"portName"`
- Frequency int `gorm:"comment:鏁版嵁鏇存柊棰戠巼 0-瀹炴椂鏇存柊 1-1娆�/绉�" json:"frequency"`
+ description: plc ip鍦板潃锛� method = modbusTCP鐢�
type: string
baudRate:
description: 涓插彛娉㈢壒鐜囷紝 method = serial鏃� 鐢�
type: integer
brand:
type: string
+ createdAt:
+ type: string
+ dataBit:
+ description: 鏁版嵁浣嶏紝method = modbusRTU 鐢�
+ type: integer
+ deletedAt:
+ type: string
details:
items:
$ref: '#/definitions/model.DevicePlcAddress'
type: array
+ deviceID:
+ description: 璁惧缂栧彿
+ type: string
id:
type: integer
isOpen:
type: boolean
method:
$ref: '#/definitions/constvar.PlcMethod'
+ parity:
+ allOf:
+ - $ref: '#/definitions/constvar.Parity'
+ description: 鏍￠獙鏂瑰紡锛宮ethod = modbusRTU 鐢�
port:
description: plc 绔彛鍙凤紝 method = modbusTCP鐢�
type: integer
serialName:
description: 涓插彛鍚嶇О锛宮ethod = serial鏃� 鐢�
type: string
+ stopBit:
+ description: 鍋滄浣嶏紝method = modbusRTU 鐢�
+ type: integer
+ updatedAt:
+ type: string
type: object
request.UpdatePlcBrand:
properties:
+ createdAt:
+ type: string
+ deletedAt:
+ type: string
id:
type: integer
name:
type: string
+ updatedAt:
+ type: string
+ type: object
+ response.Device:
+ properties:
+ deviceID:
+ type: string
+ deviceName:
+ type: string
+ needSetProcessParams:
+ description: 鏄惁闇�瑕佽缃伐鑹哄弬鏁�
+ type: boolean
+ type: object
+ response.DeviceListResponse:
+ properties:
+ clusterNodeQuantity:
+ description: 闆嗙兢鑺傜偣鏁伴噺
+ type: integer
+ clusterStatus:
+ description: 闆嗙兢鐘舵��
+ type: string
+ currentDeviceID:
+ description: 褰撳墠閫夊畾鐨勭敓浜ц澶�
+ type: string
+ deviceList:
+ description: 鐢熶骇璁惧id鍒楄〃
+ items:
+ $ref: '#/definitions/response.Device'
+ type: array
+ systemDeviceID:
+ description: 宸ユ帶鏈鸿澶嘔D
+ type: string
+ systemDeviceRunSince:
+ description: 绯荤粺杩愯寮�濮嬫椂闂存埑
+ type: integer
+ systemDeviceStatus:
+ allOf:
+ - $ref: '#/definitions/response.SystemDeviceStatus'
+ description: 璁惧鐘舵��
type: object
response.ListResponse:
properties:
@@ -400,6 +696,10 @@
type: object
response.ProductProgress:
properties:
+ RealEndTime:
+ type: integer
+ RealStartTime:
+ type: integer
finishNumber:
type: integer
plcStatus:
@@ -407,6 +707,17 @@
totalNumber:
type: integer
type: object
+ response.SystemDeviceStatus:
+ enum:
+ - 1
+ - 2
+ type: integer
+ x-enum-comments:
+ SystemDeviceStatusNormal: 姝ｅ父
+ SystemDeviceStatusUnNormal: 寮傚父
+ x-enum-varnames:
+ - SystemDeviceStatusNormal
+ - SystemDeviceStatusUnNormal
response.TaskCountdown:
properties:
countDownHour:
@@ -543,6 +854,61 @@
summary: 鏇存柊plc閰嶇疆
tags:
- Config
+ /v1/device/config:
+ post:
+ parameters:
+ - description: 鏌ヨ鍙傛暟
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.DeviceConfig'
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ $ref: '#/definitions/contextx.Response'
+ summary: 璁剧疆璁惧涓�浜涢厤缃�
+ tags:
+ - 璁惧
+ /v1/device/list:
+ get:
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ allOf:
+ - $ref: '#/definitions/contextx.Response'
+ - properties:
+ data:
+ $ref: '#/definitions/response.DeviceListResponse'
+ type: object
+ summary: 鑾峰彇褰撳墠闈㈡澘缁戝畾鐨勮澶囧垪琛�
+ tags:
+ - 璁惧
+ /v1/device/setCurrentDeviceId:
+ post:
+ parameters:
+ - description: 鏌ヨ鍙傛暟
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.SetCurrentDevice'
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ $ref: '#/definitions/contextx.Response'
+ summary: 璁剧疆褰撳墠璁惧id
+ tags:
+ - 璁惧
/v1/plc/productProgress:
post:
parameters:
@@ -551,7 +917,7 @@
name: object
required: true
schema:
- $ref: '#/definitions/request.SendProcessParams'
+ $ref: '#/definitions/request.GetProductProgress'
produces:
- application/json
responses:
@@ -565,23 +931,6 @@
$ref: '#/definitions/response.ProductProgress'
type: object
summary: 鑾峰彇鐢熶骇杩涘害
- tags:
- - 鐢熶骇鏁伴噺
- /v1/plc/productProgressRealTime:
- post:
- produces:
- - application/json
- responses:
- "200":
- description: 鎴愬姛
- schema:
- allOf:
- - $ref: '#/definitions/contextx.Response'
- - properties:
- data:
- $ref: '#/definitions/response.ProductProgress'
- type: object
- summary: 瀹炴椂鑾峰彇鐢熶骇杩涘害
tags:
- 鐢熶骇鏁伴噺
/v1/plc/setProductNumber:
@@ -674,11 +1023,6 @@
/v1/processModel/list:
get:
parameters:
- - description: 褰撳墠姝ｅ湪浣跨敤鐨勫伐鑹哄弬鏁扮紪鍙�
- in: query
- name: number
- required: true
- type: string
- description: 椤电爜
in: query
name: page
@@ -709,6 +1053,77 @@
summary: 鑾峰彇宸ヨ壓妯″瀷鍒楄〃
tags:
- 宸ヨ壓妯″瀷
+ /v1/reportWork/list:
+ get:
+ parameters:
+ - description: 椤电爜
+ in: query
+ name: page
+ type: integer
+ - description: 姣忛〉澶у皬
+ in: query
+ name: pageSize
+ type: integer
+ - description: 宸ュ簭id
+ in: query
+ name: procedureId
+ required: true
+ type: integer
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ allOf:
+ - $ref: '#/definitions/contextx.ResponseList'
+ - properties:
+ data:
+ items:
+ $ref: '#/definitions/model.ReportWork'
+ type: array
+ type: object
+ summary: 鎶ュ伐鍒楄〃
+ tags:
+ - 鎶ュ伐
+ /v1/reportWork/report:
+ post:
+ parameters:
+ - description: 鏌ヨ鍙傛暟
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.ReportWork'
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ $ref: '#/definitions/contextx.Response'
+ 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:
@@ -785,6 +1200,53 @@
summary: 鑾峰彇浠诲姟
tags:
- Task
+ /v1/task/list:
+ get:
+ parameters:
+ - description: 閫氶亾鍙枫�備笉浼犲彇鍏ㄩ儴鐨�
+ in: query
+ name: channel
+ type: integer
+ - in: query
+ name: deviceID
+ type: string
+ - description: 榛樿3
+ in: query
+ name: limit
+ type: integer
+ - description: 榛樿0
+ in: query
+ name: offset
+ type: integer
+ - description: 1 鏈畬鎴� 2 浠婂ぉ鏈畬鎴� 3 宸插畬鎴�
+ enum:
+ - 1
+ - 2
+ - 3
+ in: query
+ name: type
+ type: integer
+ x-enum-varnames:
+ - QueryTypeUnFinish
+ - QueryTypeToday
+ - QueryTypeFinished
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ allOf:
+ - $ref: '#/definitions/contextx.Response'
+ - properties:
+ data:
+ additionalProperties:
+ $ref: '#/definitions/response.TaskResponse'
+ type: object
+ type: object
+ summary: 鑾峰彇浠诲姟鍒楄〃2
+ tags:
+ - Task
/v1/task/sendProcessParams:
post:
parameters:
--
Gitblit v1.8.0