aps/apsClient.git

parent: 3a1d4cc4 | 补丁 | 提交 | show whitespace

zhangqian

2023-09-25 cb2f80a627413d6dda5b9071a2711cb03964ed15

任务接口返回通道数量

5个文件已修改

	api/v1/task.go	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	docs/docs.go	45 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	docs/swagger.json	45 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	docs/swagger.yaml	30 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	model/response/common.go	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 api/v1/task.go

@@ -51,7 +51,7 @@
// @Summary   获取任务
// @Produce   application/json
// @Param     object  query    request.TaskList true  "查询参数"
// @Success   200   {object}  contextx.Response{data=response.TaskData}  "成功"
// @Success   200   {object}  contextx.Response{data=response.TaskResponse}  "成功"
// @Router    /v1/task/get [get]
func (slf *TaskApi) TaskGet(c *gin.Context) {
    var params request.TaskList
@@ -92,6 +92,7 @@
    }

    taskResponse.Prompt = conf.Conf.Prompt
    taskResponse.ChannelAmount = channelAmount

    ctx.OkWithDetailed(taskResponse)
}

 docs/docs.go

@@ -460,7 +460,7 @@
                                    "type": "object",
                                    "properties": {
                                        "data": {
                                            "$ref": "#/definitions/response.TaskData"
                                            "$ref": "#/definitions/response.TaskResponse"
                                        }
                                    }
                                }
@@ -685,6 +685,14 @@
                    "items": {
                        "$ref": "#/definitions/common.ProcedureWorker"
                    }
                }
            }
        },
        "conf.Prompt": {
            "type": "object",
            "properties": {
                "safeProduce": {
                    "type": "string"
                }
            }
        },
@@ -1154,6 +1162,41 @@
                    "$ref": "#/definitions/model.Procedures"
                }
            }
        },
        "response.TaskResponse": {
            "type": "object",
            "properties": {
                "channelAmount": {
                    "description": "通道数量",
                    "type": "integer"
                },
                "prompt": {
                    "description": "提示语",
                    "allOf": [
                        {
                            "$ref": "#/definitions/conf.Prompt"
                        }
                    ]
                },
                "taskCount": {
                    "description": "任务数量",
                    "type": "integer"
                },
                "tasks": {
                    "description": "任务列表",
                    "type": "array",
                    "items": {
                        "$ref": "#/definitions/response.TaskData"
                    }
                },
                "workers": {
                    "description": "人员列表",
                    "type": "array",
                    "items": {
                        "$ref": "#/definitions/common.ProcedureWorker"
                    }
                }
            }
        }
    }
}`

 docs/swagger.json

@@ -448,7 +448,7 @@
                                    "type": "object",
                                    "properties": {
                                        "data": {
                                            "$ref": "#/definitions/response.TaskData"
                                            "$ref": "#/definitions/response.TaskResponse"
                                        }
                                    }
                                }
@@ -673,6 +673,14 @@
                    "items": {
                        "$ref": "#/definitions/common.ProcedureWorker"
                    }
                }
            }
        },
        "conf.Prompt": {
            "type": "object",
            "properties": {
                "safeProduce": {
                    "type": "string"
                }
            }
        },
@@ -1142,6 +1150,41 @@
                    "$ref": "#/definitions/model.Procedures"
                }
            }
        },
        "response.TaskResponse": {
            "type": "object",
            "properties": {
                "channelAmount": {
                    "description": "通道数量",
                    "type": "integer"
                },
                "prompt": {
                    "description": "提示语",
                    "allOf": [
                        {
                            "$ref": "#/definitions/conf.Prompt"
                        }
                    ]
                },
                "taskCount": {
                    "description": "任务数量",
                    "type": "integer"
                },
                "tasks": {
                    "description": "任务列表",
                    "type": "array",
                    "items": {
                        "$ref": "#/definitions/response.TaskData"
                    }
                },
                "workers": {
                    "description": "人员列表",
                    "type": "array",
                    "items": {
                        "$ref": "#/definitions/common.ProcedureWorker"
                    }
                }
            }
        }
    }
}

 docs/swagger.yaml

@@ -67,6 +67,11 @@
          $ref: '#/definitions/common.ProcedureWorker'
        type: array
    type: object
  conf.Prompt:
    properties:
      safeProduce:
        type: string
    type: object
  constvar.PlcMethod:
    enum:
    - modbusTCP
@@ -388,6 +393,29 @@
      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:
@@ -654,7 +682,7 @@
            - $ref: '#/definitions/contextx.Response'
            - properties:
                data:
                  $ref: '#/definitions/response.TaskData'
                  $ref: '#/definitions/response.TaskResponse'
              type: object
      summary: 获取任务
      tags:

 model/response/common.go

@@ -31,10 +31,11 @@
}

type TaskResponse struct {
    Tasks     []*TaskData
    TaskCount int64
    Tasks         []*TaskData               //任务列表
    TaskCount     int64                     //任务数量
    Workers   []*common.ProcedureWorker `json:"workers"` // 人员列表
    Prompt    conf.Prompt
    Prompt        conf.Prompt               //提示语
    ChannelAmount int                       //通道数量
}

type Config struct {

			@@ -51,7 +51,7 @@
			// @Summary 获取任务
			// @Produce application/json
			// @Param object query request.TaskList true "查询参数"
			// @Success 200 {object} contextx.Response{data=response.TaskData} "成功"
			// @Success 200 {object} contextx.Response{data=response.TaskResponse} "成功"
			// @Router /v1/task/get [get]
			func (slf TaskApi) TaskGet(c gin.Context) {
			var params request.TaskList
			@@ -92,6 +92,7 @@
			}

			taskResponse.Prompt = conf.Conf.Prompt
			taskResponse.ChannelAmount = channelAmount

			ctx.OkWithDetailed(taskResponse)
			}

			@@ -460,7 +460,7 @@
			"type": "object",
			"properties": {
			"data": {
			"$ref": "#/definitions/response.TaskData"
			"$ref": "#/definitions/response.TaskResponse"
			}
			}
			}
			@@ -685,6 +685,14 @@
			"items": {
			"$ref": "#/definitions/common.ProcedureWorker"
			}
			}
			}
			},
			"conf.Prompt": {
			"type": "object",
			"properties": {
			"safeProduce": {
			"type": "string"
			}
			}
			},
			@@ -1154,6 +1162,41 @@
			"$ref": "#/definitions/model.Procedures"
			}
			}
			},
			"response.TaskResponse": {
			"type": "object",
			"properties": {
			"channelAmount": {
			"description": "通道数量",
			"type": "integer"
			},
			"prompt": {
			"description": "提示语",
			"allOf": [
			{
			"$ref": "#/definitions/conf.Prompt"
			}
			]
			},
			"taskCount": {
			"description": "任务数量",
			"type": "integer"
			},
			"tasks": {
			"description": "任务列表",
			"type": "array",
			"items": {
			"$ref": "#/definitions/response.TaskData"
			}
			},
			"workers": {
			"description": "人员列表",
			"type": "array",
			"items": {
			"$ref": "#/definitions/common.ProcedureWorker"
			}
			}
			}
			}
			}
			}`

			@@ -448,7 +448,7 @@
			"type": "object",
			"properties": {
			"data": {
			"$ref": "#/definitions/response.TaskData"
			"$ref": "#/definitions/response.TaskResponse"
			}
			}
			}
			@@ -673,6 +673,14 @@
			"items": {
			"$ref": "#/definitions/common.ProcedureWorker"
			}
			}
			}
			},
			"conf.Prompt": {
			"type": "object",
			"properties": {
			"safeProduce": {
			"type": "string"
			}
			}
			},
			@@ -1142,6 +1150,41 @@
			"$ref": "#/definitions/model.Procedures"
			}
			}
			},
			"response.TaskResponse": {
			"type": "object",
			"properties": {
			"channelAmount": {
			"description": "通道数量",
			"type": "integer"
			},
			"prompt": {
			"description": "提示语",
			"allOf": [
			{
			"$ref": "#/definitions/conf.Prompt"
			}
			]
			},
			"taskCount": {
			"description": "任务数量",
			"type": "integer"
			},
			"tasks": {
			"description": "任务列表",
			"type": "array",
			"items": {
			"$ref": "#/definitions/response.TaskData"
			}
			},
			"workers": {
			"description": "人员列表",
			"type": "array",
			"items": {
			"$ref": "#/definitions/common.ProcedureWorker"
			}
			}
			}
			}
			}
			}

			@@ -67,6 +67,11 @@
			$ref: '#/definitions/common.ProcedureWorker'
			type: array
			type: object
			conf.Prompt:
			properties:
			safeProduce:
			type: string
			type: object
			constvar.PlcMethod:
			enum:
			- modbusTCP
			@@ -388,6 +393,29 @@
			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:
			@@ -654,7 +682,7 @@
			- $ref: '#/definitions/contextx.Response'
			- properties:
			data:
			$ref: '#/definitions/response.TaskData'
			$ref: '#/definitions/response.TaskResponse'
			type: object
			summary: 获取任务
			tags:

			@@ -31,10 +31,11 @@
			}

			type TaskResponse struct {
			Tasks []*TaskData
			TaskCount int64
			Tasks []*TaskData //任务列表
			TaskCount int64 //任务数量
			Workers []*common.ProcedureWorker `json:"workers"` // 人员列表
			Prompt conf.Prompt
			Prompt conf.Prompt //提示语
			ChannelAmount int //通道数量
			}

			type Config struct {