From f8cc2e04cfdd3c7f6d9555e2c9c96fa39e1e30c4 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 30 十月 2023 12:15:22 +0800
Subject: [PATCH] update
---
docs/swagger.yaml | 198 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 160 insertions(+), 38 deletions(-)
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index db53996..e17229c 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -30,6 +30,9 @@
items:
type: string
type: array
+ channel:
+ description: 閫氶亾搴忓彿
+ type: integer
deviceId:
type: string
deviceName:
@@ -64,6 +67,13 @@
$ref: '#/definitions/common.ProcedureWorker'
type: array
type: object
+ conf.Prompt:
+ properties:
+ plcNotConnected:
+ type: string
+ safeProduce:
+ type: string
+ type: object
constvar.PlcMethod:
enum:
- modbusTCP
@@ -92,6 +102,20 @@
x-enum-varnames:
- PlcStartAddressValueTypeString
- PlcStartAddressValueTypeInt
+ constvar.TaskMode:
+ enum:
+ - 1
+ - 2
+ - 3
+ type: integer
+ x-enum-comments:
+ TaskModeCurrent: 鏈紑濮嬬殑鍜岃繘琛屼腑鐨�
+ TaskModeLastFinished: 涓婁竴涓粨鏉熺殑
+ TaskModeUnStarted: 鏈紑濮嬬殑
+ x-enum-varnames:
+ - TaskModeUnStarted
+ - TaskModeCurrent
+ - TaskModeLastFinished
contextx.Response:
properties:
code:
@@ -131,15 +155,15 @@
type: object
model.DevicePlcAddress:
properties:
+ channel:
+ description: 鏁版嵁璧峰鍦板潃
+ type: integer
fieldName:
allOf:
- $ref: '#/definitions/constvar.PlcStartAddressType'
description: 瀵瑰簲绯荤粺瀛楁
length:
description: 鏁版嵁闀垮害
- type: integer
- position:
- description: 鏁版嵁璧峰鍦板潃
type: integer
startAddress:
description: 鏁版嵁璧峰鍦板潃
@@ -248,14 +272,14 @@
- ProcedureStatusFinished
model.Procedures:
properties:
+ channel:
+ description: 閫氶亾
+ type: integer
deviceId:
type: string
endTime:
type: integer
id:
- type: integer
- position:
- description: 姣忎釜璁惧鍙兘鏈夊涓満浣嶅悓鏃剁敓浜э紝鐢╬osition琛ㄧず浣嶇疆
type: integer
procedure:
allOf:
@@ -263,10 +287,41 @@
description: common.ProductProcedure 瀵硅薄
procedureId:
type: string
+ processModelNumber:
+ description: 宸ヨ壓妯″瀷缂栧彿
+ type: string
startTime:
type: integer
status:
$ref: '#/definitions/model.ProcedureStatus'
+ type: object
+ model.ProcessModel:
+ properties:
+ deviceId:
+ description: 鐢ㄤ簬杩囨护鑾峰彇nsq娑堟伅
+ type: string
+ isUpdate:
+ description: 鍓嶇鐢�
+ type: boolean
+ newNumber:
+ type: string
+ newParamsMap:
+ additionalProperties: true
+ type: object
+ number:
+ description: 宸ヨ壓妯″瀷缂栧彿
+ type: string
+ params:
+ type: string
+ paramsMap:
+ additionalProperties: true
+ type: object
+ procedure:
+ description: 宸ュ簭
+ type: string
+ product:
+ description: 浜у搧鍚嶇О
+ type: string
type: object
request.AddPlcBrand:
properties:
@@ -277,8 +332,6 @@
type: object
request.SendProcessParams:
properties:
- position:
- type: integer
procedureId:
type: integer
required:
@@ -375,15 +428,38 @@
canStarted:
description: 鏄惁鍙互寮�濮嬬敓浜�
type: boolean
+ channel:
+ description: 褰撳墠浠诲姟鍦ㄨ澶囩鍑犱釜閫氶亾
+ type: integer
currentProcedureIndex:
type: integer
order:
$ref: '#/definitions/model.Order'
- position:
- description: 褰撳墠浠诲姟鍦ㄨ澶囩鍑犱釜浣嶇疆
- type: integer
procedure:
$ref: '#/definitions/model.Procedures'
+ type: object
+ response.TaskResponse:
+ properties:
+ channelAmount:
+ description: 閫氶亾鏁伴噺
+ type: integer
+ prompt:
+ allOf:
+ - $ref: '#/definitions/conf.Prompt'
+ description: 鎻愮ず璇�
+ taskCount:
+ description: 浠诲姟鏁伴噺
+ type: integer
+ tasks:
+ description: 浠诲姟鍒楄〃
+ items:
+ $ref: '#/definitions/response.TaskData'
+ type: array
+ workers:
+ description: 浜哄憳鍒楄〃
+ items:
+ $ref: '#/definitions/common.ProcedureWorker'
+ type: array
type: object
info:
contact: {}
@@ -595,6 +671,44 @@
summary: 鏇存柊plc鍝佺墝
tags:
- plc鍝佺墝
+ /v1/processModel/list:
+ get:
+ parameters:
+ - description: 褰撳墠姝ｅ湪浣跨敤鐨勫伐鑹哄弬鏁扮紪鍙�
+ in: query
+ name: number
+ required: true
+ type: string
+ - description: 椤电爜
+ in: query
+ name: page
+ type: integer
+ - description: 姣忛〉澶у皬
+ in: query
+ name: pageSize
+ type: integer
+ - description: 褰撳墠鐨勫伐搴廼d
+ in: query
+ name: procedureId
+ required: true
+ type: integer
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ allOf:
+ - $ref: '#/definitions/contextx.Response'
+ - properties:
+ data:
+ items:
+ $ref: '#/definitions/model.ProcessModel'
+ type: array
+ type: object
+ summary: 鑾峰彇宸ヨ壓妯″瀷鍒楄〃
+ tags:
+ - 宸ヨ壓妯″瀷
/v1/task/countdown:
get:
produces:
@@ -641,6 +755,21 @@
in: query
name: pageSize
type: integer
+ - enum:
+ - 1
+ - 2
+ - 3
+ in: query
+ name: taskMode
+ type: integer
+ x-enum-comments:
+ TaskModeCurrent: 鏈紑濮嬬殑鍜岃繘琛屼腑鐨�
+ TaskModeLastFinished: 涓婁竴涓粨鏉熺殑
+ TaskModeUnStarted: 鏈紑濮嬬殑
+ x-enum-varnames:
+ - TaskModeUnStarted
+ - TaskModeCurrent
+ - TaskModeLastFinished
produces:
- application/json
responses:
@@ -651,35 +780,9 @@
- $ref: '#/definitions/contextx.Response'
- properties:
data:
- $ref: '#/definitions/response.TaskData'
+ $ref: '#/definitions/response.TaskResponse'
type: object
summary: 鑾峰彇浠诲姟
- tags:
- - Task
- /v1/task/get/unStarted:
- 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.TaskData'
- type: object
- summary: 鑾峰彇鏈紑濮嬬殑浠诲姟
tags:
- Task
/v1/task/sendProcessParams:
@@ -724,4 +827,23 @@
summary: 浠诲姟寮�濮嬶紙鑾峰彇宸ヨ壓鍙傛暟锛�
tags:
- Task
+ /v1/task/updateProcessParams:
+ post:
+ parameters:
+ - description: 鏌ヨ鍙傛暟
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.SendProcessParams'
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ $ref: '#/definitions/contextx.Response'
+ summary: 鏇存柊宸ヨ壓鍙傛暟锛堣繘琛屼腑鐨勪换鍔★級
+ tags:
+ - Task
swagger: "2.0"
--
Gitblit v1.8.0