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 | 297 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 280 insertions(+), 17 deletions(-)
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index c2bc840..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:
@@ -113,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
@@ -139,6 +181,16 @@
data: {}
msg:
type: string
+ type: object
+ contextx.ResponseList:
+ properties:
+ code:
+ type: integer
+ data: {}
+ msg:
+ type: string
+ total:
+ type: integer
type: object
model.DevicePlc:
properties:
@@ -347,6 +399,9 @@
processModelNumber:
description: 宸ヨ壓妯″瀷缂栧彿
type: string
+ productProcedureID:
+ description: 浜у搧宸ュ簭id
+ type: string
realEndTime:
type: integer
realStartTime:
@@ -394,6 +449,65 @@
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:
@@ -407,6 +521,19 @@
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
@@ -417,6 +544,22 @@
- 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:
procedureId:
@@ -489,19 +632,42 @@
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
- deviceIDList:
+ deviceList:
description: 鐢熶骇璁惧id鍒楄〃
items:
- type: string
+ $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:
@@ -530,6 +696,10 @@
type: object
response.ProductProgress:
properties:
+ RealEndTime:
+ type: integer
+ RealStartTime:
+ type: integer
finishNumber:
type: integer
plcStatus:
@@ -537,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:
@@ -673,8 +854,27 @@
summary: 鏇存柊plc閰嶇疆
tags:
- Config
- /v1/device/list:
+ /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:
@@ -689,8 +889,8 @@
type: object
summary: 鑾峰彇褰撳墠闈㈡澘缁戝畾鐨勮澶囧垪琛�
tags:
- - Device
- /v1/device/set:
+ - 璁惧
+ /v1/device/setCurrentDeviceId:
post:
parameters:
- description: 鏌ヨ鍙傛暟
@@ -717,7 +917,7 @@
name: object
required: true
schema:
- $ref: '#/definitions/request.SendProcessParams'
+ $ref: '#/definitions/request.GetProductProgress'
produces:
- application/json
responses:
@@ -823,11 +1023,6 @@
/v1/processModel/list:
get:
parameters:
- - description: 褰撳墠姝ｅ湪浣跨敤鐨勫伐鑹哄弬鏁扮紪鍙�
- in: query
- name: number
- required: true
- type: string
- description: 椤电爜
in: query
name: page
@@ -858,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:
@@ -896,9 +1162,6 @@
/v1/task/get:
get:
parameters:
- - in: query
- name: deviceID
- type: string
- description: 椤电爜
in: query
name: page
@@ -937,7 +1200,7 @@
summary: 鑾峰彇浠诲姟
tags:
- Task
- /v1/task/listByChannel:
+ /v1/task/list:
get:
parameters:
- description: 閫氶亾鍙枫�備笉浼犲彇鍏ㄩ儴鐨�
--
Gitblit v1.8.0