From 066a30751bdc20f9e83b34539de71ae392783e1b Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 19 八月 2023 15:58:09 +0800
Subject: [PATCH] 网络配置获取和删除，品牌增删改查
---
docs/swagger.yaml | 364 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 314 insertions(+), 50 deletions(-)
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index dd25e9c..b251b21 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -1,4 +1,60 @@
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:
+ deviceId:
+ type: string
+ deviceName:
+ type: string
+ endTime:
+ type: integer
+ inputMaterials:
+ description: 杈撳叆鐗╂枡鍒楄〃
+ items:
+ $ref: '#/definitions/common.ProcedureMaterial'
+ type: array
+ 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
contextx.Response:
properties:
code:
@@ -7,6 +63,46 @@
msg:
type: string
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,75 +126,74 @@
type: string
startTime:
type: integer
+ status:
+ $ref: '#/definitions/model.OrderStatus'
unit:
type: string
workOrderId:
type: string
type: object
+ model.OrderStatus:
+ enum:
+ - 1
+ - 2
+ type: integer
+ x-enum-varnames:
+ - OrderStatusUnFinished
+ - OrderStatusFinished
+ model.PlcBrand:
+ properties:
+ id:
+ type: integer
+ name:
+ type: string
+ type: object
+ model.ProcedureStatus:
+ enum:
+ - 1
+ - 2
+ type: integer
+ x-enum-varnames:
+ - ProcedureStatusUnFinished
+ - ProcedureStatusFinished
model.Procedures:
properties:
+ endTime:
+ type: integer
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:
- type: string
- type: object
- request.ProcedureWorker:
- properties:
- endTime:
- type: integer
- phoneNum:
- type: string
+ - $ref: '#/definitions/common.ProductProcedure'
+ description: common.ProductProcedure 瀵硅薄
startTime:
type: integer
- workerId:
- type: string
- workerName:
+ status:
+ $ref: '#/definitions/model.ProcedureStatus'
+ type: object
+ request.AddPlcBrand:
+ properties:
+ id:
+ type: integer
+ name:
type: string
type: object
- request.ProductProcedure:
+ request.UpdatePlcBrand:
properties:
- deviceId:
- type: string
- deviceName:
- type: string
- endTime:
+ id:
type: integer
- inputMaterials:
- description: 杈撳叆鐗╂枡鍒楄〃
- items:
- $ref: '#/definitions/request.ProcedureMaterial'
- type: array
- outputMaterials:
- description: 杈撳嚭鐗╂枡鍒楄〃
- items:
- $ref: '#/definitions/request.ProcedureMaterial'
- type: array
- procedureId:
+ name:
type: string
- procedureName:
- type: string
- startTime:
+ type: object
+ response.ListResponse:
+ properties:
+ code:
type: integer
- workHours:
- type: number
- workers:
- description: 浜哄憳鍒楄〃
- items:
- $ref: '#/definitions/request.ProcedureWorker'
- type: array
+ count:
+ type: integer
+ data: {}
+ msg:
+ type: string
type: object
response.ProcessParams:
properties:
@@ -108,6 +203,12 @@
type: object
response.TaskData:
properties:
+ deviceName:
+ type: string
+ deviceStatus:
+ type: string
+ nextProcedure:
+ $ref: '#/definitions/model.Procedures'
order:
$ref: '#/definitions/model.Order'
procedure:
@@ -116,6 +217,169 @@
info:
contact: {}
paths:
+ /v1/cc/nn:
+ 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
+ put:
+ 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/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
+ put:
+ 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/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/finish/{id}:
put:
parameters:
--
Gitblit v1.8.0