From 4db8b372c61025a80af529a47872a6fec6daf854 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 27 九月 2023 10:21:30 +0800
Subject: [PATCH] 删除获取未开始任务接口，统一用获取任务接口
---
docs/swagger.yaml | 699 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 652 insertions(+), 47 deletions(-)
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index fa6eed7..c03e6d1 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -1,4 +1,121 @@
definitions:
+ common.ProcedureMaterial:
+ properties:
+ amount:
+ type: number
+ materialId:
+ type: string
+ materialName:
+ type: string
+ unit:
+ type: string
+ type: object
+ common.ProcedureWorker:
+ properties:
+ endTime:
+ type: integer
+ phoneNum:
+ type: string
+ startTime:
+ type: integer
+ workerId:
+ type: string
+ workerName:
+ type: string
+ type: object
+ common.ProductProcedure:
+ properties:
+ allProcedureNames:
+ description: 鎵�灞炲伐鍗曞伐搴忓垪琛�
+ items:
+ type: string
+ type: array
+ channel:
+ description: 閫氶亾搴忓彿
+ type: integer
+ deviceId:
+ type: string
+ deviceName:
+ type: string
+ endTime:
+ type: integer
+ inputMaterials:
+ description: 杈撳叆鐗╂枡鍒楄〃
+ items:
+ $ref: '#/definitions/common.ProcedureMaterial'
+ type: array
+ nextProcedureId:
+ type: string
+ nextProcedureName:
+ type: string
+ outputMaterials:
+ description: 杈撳嚭鐗╂枡鍒楄〃
+ items:
+ $ref: '#/definitions/common.ProcedureMaterial'
+ type: array
+ procedureId:
+ type: string
+ procedureName:
+ type: string
+ startTime:
+ type: integer
+ workHours:
+ type: number
+ workers:
+ description: 浜哄憳鍒楄〃
+ items:
+ $ref: '#/definitions/common.ProcedureWorker'
+ type: array
+ type: object
+ conf.Prompt:
+ properties:
+ plcNotConnected:
+ type: string
+ safeProduce:
+ type: string
+ type: object
+ constvar.PlcMethod:
+ enum:
+ - modbusTCP
+ - serial
+ - 缃戠粶
+ - 涓插彛
+ type: string
+ x-enum-varnames:
+ - PlcMethodModbusTCP
+ - PlcMethodSerial
+ - PlcMethodModbusTCPChinese
+ - PlcMethodSerialChinese
+ constvar.PlcStartAddressType:
+ enum:
+ - 1
+ - 2
+ type: integer
+ x-enum-varnames:
+ - PlcStartAddressTypeFinishNumber
+ - PlcStartAddressTypeTotalNumber
+ constvar.PlcStartAddressValueType:
+ enum:
+ - string
+ - int
+ type: string
+ 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:
@@ -7,6 +124,95 @@
msg:
type: string
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"`
+ type: string
+ baudRate:
+ description: 涓插彛娉㈢壒鐜囷紝 method = serial鏃� 鐢�
+ type: integer
+ brand:
+ type: string
+ details:
+ items:
+ $ref: '#/definitions/model.DevicePlcAddress'
+ type: array
+ id:
+ type: integer
+ isOpen:
+ type: boolean
+ method:
+ $ref: '#/definitions/constvar.PlcMethod'
+ port:
+ description: plc 绔彛鍙凤紝 method = modbusTCP鐢�
+ type: integer
+ serialName:
+ description: 涓插彛鍚嶇О锛宮ethod = serial鏃� 鐢�
+ type: string
+ type: object
+ model.DevicePlcAddress:
+ properties:
+ channel:
+ description: 鏁版嵁璧峰鍦板潃
+ type: integer
+ fieldName:
+ allOf:
+ - $ref: '#/definitions/constvar.PlcStartAddressType'
+ description: 瀵瑰簲绯荤粺瀛楁
+ length:
+ description: 鏁版嵁闀垮害
+ type: integer
+ startAddress:
+ description: 鏁版嵁璧峰鍦板潃
+ type: integer
+ type:
+ allOf:
+ - $ref: '#/definitions/constvar.PlcStartAddressValueType'
+ description: 鏁版嵁绫诲瀷
+ type: object
+ model.NetConfig:
+ properties:
+ dns:
+ description: dns
+ type: string
+ gateway:
+ description: 缃戝叧
+ type: string
+ id:
+ type: integer
+ ip:
+ description: 鏈満ip
+ type: string
+ mask:
+ description: 瀛愮綉鎺╃爜
+ type: string
+ networkCard:
+ description: 缃戝崱
+ type: string
+ status:
+ allOf:
+ - $ref: '#/definitions/model.NetConfigStatus'
+ description: 鐘舵�侊紙1鍚敤2绂佺敤锛�
+ required:
+ - gateway
+ - ip
+ - mask
+ - networkCard
+ type: object
+ model.NetConfigStatus:
+ enum:
+ - 1
+ - 2
+ type: integer
+ x-enum-comments:
+ NetConfigStatusDisabled: 鍏抽棴
+ NetConfigStatusEnabled: 寮�鍚�
+ x-enum-varnames:
+ - NetConfigStatusEnabled
+ - NetConfigStatusDisabled
model.Order:
properties:
amount:
@@ -30,78 +236,429 @@
type: string
startTime:
type: integer
+ status:
+ $ref: '#/definitions/model.OrderStatus'
unit:
type: string
+ workOrderId:
+ type: string
type: object
- model.Procedures:
+ model.OrderStatus:
+ enum:
+ - 1
+ - 2
+ - 3
+ type: integer
+ x-enum-varnames:
+ - OrderStatusWaitProcess
+ - OrderStatusProcessing
+ - OrderStatusFinished
+ model.PlcBrand:
properties:
id:
type: integer
- procedure:
- allOf:
- - $ref: '#/definitions/request.ProductProcedure'
- description: request.ProductProcedure 瀵硅薄
- type: object
- request.ProcedureMaterial:
- properties:
- amount:
- type: number
- materialId:
- type: string
- materialName:
- type: string
- unit:
+ name:
type: string
type: object
- request.ProcedureWorker:
+ model.ProcedureStatus:
+ enum:
+ - 1
+ - 2
+ - 3
+ type: integer
+ x-enum-varnames:
+ - ProcedureStatusWaitProcess
+ - ProcedureStatusProcessing
+ - ProcedureStatusFinished
+ model.Procedures:
properties:
- phoneNum:
- type: string
- workerId:
- type: string
- workerName:
- type: string
- type: object
- request.ProductProcedure:
- properties:
+ channel:
+ description: 閫氶亾
+ type: integer
deviceId:
type: string
endTime:
type: integer
- inputMaterials:
- description: 杈撳叆鐗╂枡鍒楄〃
- items:
- $ref: '#/definitions/request.ProcedureMaterial'
- type: array
- outputMaterials:
- description: 杈撳嚭鐗╂枡鍒楄〃
- items:
- $ref: '#/definitions/request.ProcedureMaterial'
- type: array
+ id:
+ type: integer
+ procedure:
+ allOf:
+ - $ref: '#/definitions/common.ProductProcedure'
+ description: common.ProductProcedure 瀵硅薄
procedureId:
- type: string
- procedureName:
type: string
startTime:
type: integer
- workHours:
- type: number
- workers:
- description: 浜哄憳鍒楄〃
+ status:
+ $ref: '#/definitions/model.ProcedureStatus'
+ type: object
+ request.AddPlcBrand:
+ properties:
+ id:
+ type: integer
+ name:
+ type: string
+ type: object
+ request.SendProcessParams:
+ properties:
+ channel:
+ type: integer
+ procedureId:
+ type: integer
+ required:
+ - procedureId
+ 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"`
+ type: string
+ baudRate:
+ description: 涓插彛娉㈢壒鐜囷紝 method = serial鏃� 鐢�
+ type: integer
+ brand:
+ type: string
+ details:
items:
- $ref: '#/definitions/request.ProcedureWorker'
+ $ref: '#/definitions/model.DevicePlcAddress'
type: array
+ id:
+ type: integer
+ isOpen:
+ type: boolean
+ method:
+ $ref: '#/definitions/constvar.PlcMethod'
+ port:
+ description: plc 绔彛鍙凤紝 method = modbusTCP鐢�
+ type: integer
+ serialName:
+ description: 涓插彛鍚嶇О锛宮ethod = serial鏃� 鐢�
+ type: string
+ type: object
+ request.UpdatePlcBrand:
+ properties:
+ id:
+ type: integer
+ name:
+ type: string
+ type: object
+ response.ListResponse:
+ properties:
+ code:
+ type: integer
+ count:
+ type: integer
+ data: {}
+ msg:
+ type: string
+ type: object
+ response.ProcessParams:
+ properties:
+ key:
+ type: string
+ value: {}
+ type: object
+ response.ProcessParamsResponse:
+ properties:
+ number:
+ type: string
+ params:
+ items:
+ $ref: '#/definitions/response.ProcessParams'
+ type: array
+ type: object
+ response.ProductProgress:
+ properties:
+ finishNumber:
+ type: integer
+ plcStatus:
+ type: integer
+ totalNumber:
+ type: integer
+ type: object
+ response.TaskCountdown:
+ properties:
+ countDownHour:
+ description: 鍊掕鏃� 鏃�
+ type: integer
+ countDownMinute:
+ description: 鍊掕鏃� 鍒�
+ type: integer
+ showCountDown:
+ description: 鏄惁灞曠ず鍊掕鏃�
+ type: boolean
type: object
response.TaskData:
properties:
+ allProcedures:
+ items:
+ type: string
+ type: array
+ canStarted:
+ description: 鏄惁鍙互寮�濮嬬敓浜�
+ type: boolean
+ channel:
+ description: 褰撳墠浠诲姟鍦ㄨ澶囩鍑犱釜閫氶亾
+ type: integer
+ currentProcedureIndex:
+ type: integer
order:
$ref: '#/definitions/model.Order'
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: {}
paths:
+ /v1/config/net:
+ get:
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ allOf:
+ - $ref: '#/definitions/contextx.Response'
+ - properties:
+ data:
+ items:
+ $ref: '#/definitions/model.NetConfig'
+ type: array
+ type: object
+ summary: 鑾峰彇缃戠粶閰嶇疆
+ tags:
+ - Config
+ post:
+ parameters:
+ - description: 鍙傛暟
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/model.NetConfig'
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ allOf:
+ - $ref: '#/definitions/contextx.Response'
+ - properties:
+ data:
+ items:
+ $ref: '#/definitions/response.ProcessParams'
+ type: array
+ type: object
+ summary: 璁剧疆缃戠粶閰嶇疆
+ tags:
+ - Config
+ /v1/config/plc:
+ get:
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ allOf:
+ - $ref: '#/definitions/contextx.Response'
+ - properties:
+ data:
+ $ref: '#/definitions/model.DevicePlc'
+ type: object
+ summary: 鑾峰彇plc閰嶇疆
+ tags:
+ - Config
+ post:
+ parameters:
+ - description: 鏌ヨ鍙傛暟
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.UpdatePlc'
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: OK
+ schema:
+ $ref: '#/definitions/contextx.Response'
+ summary: 鏇存柊plc閰嶇疆
+ tags:
+ - Config
+ /v1/plc/productProgress:
+ post:
+ parameters:
+ - description: 鏌ヨ鍙傛暟
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.SendProcessParams'
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ allOf:
+ - $ref: '#/definitions/contextx.Response'
+ - properties:
+ data:
+ $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:
+ post:
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ $ref: '#/definitions/contextx.Response'
+ summary: 璁剧疆鐢熶骇鎬婚噺
+ tags:
+ - 鐢熶骇鏁伴噺
+ /v1/plcBrand/add:
+ post:
+ parameters:
+ - description: 鏌ヨ鍙傛暟
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.AddPlcBrand'
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: OK
+ schema:
+ $ref: '#/definitions/contextx.Response'
+ summary: 娣诲姞plc鍝佺墝
+ tags:
+ - plc鍝佺墝
+ /v1/plcBrand/delete/{id}:
+ delete:
+ parameters:
+ - description: 鏌ヨ鍙傛暟
+ in: path
+ name: id
+ required: true
+ type: integer
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: OK
+ schema:
+ $ref: '#/definitions/contextx.Response'
+ summary: 鍒犻櫎plc鍝佺墝
+ tags:
+ - plc鍝佺墝
+ /v1/plcBrand/list:
+ get:
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: OK
+ schema:
+ allOf:
+ - $ref: '#/definitions/response.ListResponse'
+ - properties:
+ data:
+ items:
+ $ref: '#/definitions/model.PlcBrand'
+ type: array
+ type: object
+ summary: 鑾峰彇plc鍝佺墝鍒楄〃
+ tags:
+ - plc鍝佺墝
+ /v1/plcBrand/update:
+ put:
+ parameters:
+ - description: 鏌ヨ鍙傛暟
+ in: body
+ name: object
+ required: true
+ schema:
+ $ref: '#/definitions/request.UpdatePlcBrand'
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: OK
+ schema:
+ $ref: '#/definitions/contextx.Response'
+ summary: 鏇存柊plc鍝佺墝
+ tags:
+ - plc鍝佺墝
+ /v1/task/countdown:
+ get:
+ produces:
+ - application/json
+ responses:
+ "200":
+ description: 鎴愬姛
+ schema:
+ allOf:
+ - $ref: '#/definitions/contextx.Response'
+ - properties:
+ data:
+ $ref: '#/definitions/response.TaskCountdown'
+ type: object
+ summary: 鏂颁换鍔″�掕鏃�
+ tags:
+ - Task
/v1/task/finish/{id}:
put:
parameters:
@@ -119,9 +676,33 @@
$ref: '#/definitions/contextx.Response'
summary: 浠诲姟缁撴潫
tags:
- - Base
+ - Task
/v1/task/get:
get:
+ parameters:
+ - description: 椤电爜
+ in: query
+ name: page
+ type: integer
+ - description: 姣忛〉澶у皬
+ 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:
@@ -132,9 +713,28 @@
- $ref: '#/definitions/contextx.Response'
- properties:
data:
- $ref: '#/definitions/response.TaskData'
+ $ref: '#/definitions/response.TaskResponse'
type: object
summary: 鑾峰彇浠诲姟
+ tags:
+ - Task
+ /v1/task/sendProcessParams:
+ 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
/v1/task/start/{id}:
@@ -151,8 +751,13 @@
"200":
description: 鎴愬姛
schema:
- $ref: '#/definitions/contextx.Response'
- summary: 浠诲姟寮�濮�
+ allOf:
+ - $ref: '#/definitions/contextx.Response'
+ - properties:
+ data:
+ $ref: '#/definitions/response.ProcessParamsResponse'
+ type: object
+ summary: 浠诲姟寮�濮嬶紙鑾峰彇宸ヨ壓鍙傛暟锛�
tags:
- - Base
+ - Task
swagger: "2.0"
--
Gitblit v1.8.0