为保证正确获取集群状态, 添加程序启动时读取system-service运行状态

zhangzengfei

2023-10-19 bf2b61519fd0d79ddb19f0469749fbbe1d6c4ad8

 docs/swagger.json

@@ -141,7 +141,7 @@
            }
        },
        "/v1/plc/productProgress": {
            "get": {
            "post": {
                "produces": [
                    "application/json"
                ],
@@ -149,6 +149,48 @@
                    "生产数量"
                ],
                "summary": "获取生产进度",
                "parameters": [
                    {
                        "description": "查询参数",
                        "name": "object",
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/request.SendProcessParams"
                        }
                    }
                ],
                "responses": {
                    "200": {
                        "description": "成功",
                        "schema": {
                            "allOf": [
                                {
                                    "$ref": "#/definitions/contextx.Response"
                                },
                                {
                                    "type": "object",
                                    "properties": {
                                        "data": {
                                            "$ref": "#/definitions/response.ProductProgress"
                                        }
                                    }
                                }
                            ]
                        }
                    }
                }
            }
        },
        "/v1/plc/productProgressRealTime": {
            "post": {
                "produces": [
                    "application/json"
                ],
                "tags": [
                    "生产数量"
                ],
                "summary": "实时获取生产进度",
                "responses": {
                    "200": {
                        "description": "成功",
@@ -312,6 +354,68 @@
                }
            }
        },
        "/v1/processModel/list": {
            "get": {
                "produces": [
                    "application/json"
                ],
                "tags": [
                    "工艺模型"
                ],
                "summary": "获取工艺模型列表",
                "parameters": [
                    {
                        "type": "string",
                        "description": "当前正在使用的工艺参数编号",
                        "name": "number",
                        "in": "query",
                        "required": true
                    },
                    {
                        "type": "integer",
                        "description": "页码",
                        "name": "page",
                        "in": "query"
                    },
                    {
                        "type": "integer",
                        "description": "每页大小",
                        "name": "pageSize",
                        "in": "query"
                    },
                    {
                        "type": "integer",
                        "description": "当前的工序id",
                        "name": "procedureId",
                        "in": "query",
                        "required": true
                    }
                ],
                "responses": {
                    "200": {
                        "description": "成功",
                        "schema": {
                            "allOf": [
                                {
                                    "$ref": "#/definitions/contextx.Response"
                                },
                                {
                                    "type": "object",
                                    "properties": {
                                        "data": {
                                            "type": "array",
                                            "items": {
                                                "$ref": "#/definitions/model.ProcessModel"
                                            }
                                        }
                                    }
                                }
                            ]
                        }
                    }
                }
            }
        },
        "/v1/task/countdown": {
            "get": {
                "produces": [
@@ -380,6 +484,40 @@
                    "Task"
                ],
                "summary": "获取任务",
                "parameters": [
                    {
                        "type": "integer",
                        "description": "页码",
                        "name": "page",
                        "in": "query"
                    },
                    {
                        "type": "integer",
                        "description": "每页大小",
                        "name": "pageSize",
                        "in": "query"
                    },
                    {
                        "enum": [
                            1,
                            2,
                            3
                        ],
                        "type": "integer",
                        "x-enum-comments": {
                            "TaskModeCurrent": "未开始的和进行中的",
                            "TaskModeLastFinished": "上一个结束的",
                            "TaskModeUnStarted": "未开始的"
                        },
                        "x-enum-varnames": [
                            "TaskModeUnStarted",
                            "TaskModeCurrent",
                            "TaskModeLastFinished"
                        ],
                        "name": "taskMode",
                        "in": "query"
                    }
                ],
                "responses": {
                    "200": {
                        "description": "成功",
@@ -392,7 +530,7 @@
                                    "type": "object",
                                    "properties": {
                                        "data": {
                                            "$ref": "#/definitions/response.TaskData"
                                            "$ref": "#/definitions/response.TaskResponse"
                                        }
                                    }
                                }
@@ -402,7 +540,7 @@
                }
            }
        },
        "/v1/task/sendProcessParams/{id}": {
        "/v1/task/sendProcessParams": {
            "post": {
                "produces": [
                    "application/json"
@@ -410,14 +548,16 @@
                "tags": [
                    "Task"
                ],
                "summary": "下发工艺参数",
                "summary": "下发工艺参数（开始任务）",
                "parameters": [
                    {
                        "type": "integer",
                        "description": "工序id",
                        "name": "id",
                        "in": "path",
                        "required": true
                        "description": "查询参数",
                        "name": "object",
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/request.SendProcessParams"
                        }
                    }
                ],
                "responses": {
@@ -438,7 +578,7 @@
                "tags": [
                    "Task"
                ],
                "summary": "任务开始",
                "summary": "任务开始（获取工艺参数）",
                "parameters": [
                    {
                        "type": "integer",
@@ -465,6 +605,36 @@
                                    }
                                }
                            ]
                        }
                    }
                }
            }
        },
        "/v1/task/updateProcessParams": {
            "post": {
                "produces": [
                    "application/json"
                ],
                "tags": [
                    "Task"
                ],
                "summary": "更新工艺参数（进行中的任务）",
                "parameters": [
                    {
                        "description": "查询参数",
                        "name": "object",
                        "in": "body",
                        "required": true,
                        "schema": {
                            "$ref": "#/definitions/request.SendProcessParams"
                        }
                    }
                ],
                "responses": {
                    "200": {
                        "description": "成功",
                        "schema": {
                            "$ref": "#/definitions/contextx.Response"
                        }
                    }
                }
@@ -512,6 +682,17 @@
        "common.ProductProcedure": {
            "type": "object",
            "properties": {
                "allProcedureNames": {
                    "description": "所属工单工序列表",
                    "type": "array",
                    "items": {
                        "type": "string"
                    }
                },
                "channel": {
                    "description": "通道序号",
                    "type": "integer"
                },
                "deviceId": {
                    "type": "string"
                },
@@ -562,15 +743,30 @@
                }
            }
        },
        "conf.Prompt": {
            "type": "object",
            "properties": {
                "plcNotConnected": {
                    "type": "string"
                },
                "safeProduce": {
                    "type": "string"
                }
            }
        },
        "constvar.PlcMethod": {
            "type": "string",
            "enum": [
                "modbusTCP",
                "serial"
                "serial",
                "网络",
                "串口"
            ],
            "x-enum-varnames": [
                "PlcMethodModbusTCP",
                "PlcMethodSerial"
                "PlcMethodSerial",
                "PlcMethodModbusTCPChinese",
                "PlcMethodSerialChinese"
            ]
        },
        "constvar.PlcStartAddressType": {
@@ -595,6 +791,24 @@
                "PlcStartAddressValueTypeInt"
            ]
        },
        "constvar.TaskMode": {
            "type": "integer",
            "enum": [
                1,
                2,
                3
            ],
            "x-enum-comments": {
                "TaskModeCurrent": "未开始的和进行中的",
                "TaskModeLastFinished": "上一个结束的",
                "TaskModeUnStarted": "未开始的"
            },
            "x-enum-varnames": [
                "TaskModeUnStarted",
                "TaskModeCurrent",
                "TaskModeLastFinished"
            ]
        },
        "contextx.Response": {
            "type": "object",
            "properties": {
@@ -611,7 +825,7 @@
            "type": "object",
            "properties": {
                "address": {
                    "description": "PortName   string `gorm:\"type:varchar(191);comment:端口名称\" json:\"portName\"`\nFrequency  int    `gorm:\"type:int(11);comment:数据更新频率 0-实时更新 1-1次/秒\" json:\"frequency\"`",
                    "description": "PortName   string `gorm:\"type:varchar(191);comment:端口名称\" json:\"portName\"`\nFrequency  int    `gorm:\"comment:数据更新频率 0-实时更新 1-1次/秒\" json:\"frequency\"`",
                    "type": "string"
                },
                "baudRate": {
@@ -649,6 +863,10 @@
        "model.DevicePlcAddress": {
            "type": "object",
            "properties": {
                "channel": {
                    "description": "数据起始地址",
                    "type": "integer"
                },
                "fieldName": {
                    "description": "对应系统字段",
                    "allOf": [
@@ -781,10 +999,12 @@
            "type": "integer",
            "enum": [
                1,
                2
                2,
                3
            ],
            "x-enum-varnames": [
                "OrderStatusUnFinished",
                "OrderStatusWaitProcess",
                "OrderStatusProcessing",
                "OrderStatusFinished"
            ]
        },
@@ -803,16 +1023,25 @@
            "type": "integer",
            "enum": [
                1,
                2
                2,
                3
            ],
            "x-enum-varnames": [
                "ProcedureStatusUnFinished",
                "ProcedureStatusWaitProcess",
                "ProcedureStatusProcessing",
                "ProcedureStatusFinished"
            ]
        },
        "model.Procedures": {
            "type": "object",
            "properties": {
                "channel": {
                    "description": "通道",
                    "type": "integer"
                },
                "deviceId": {
                    "type": "string"
                },
                "endTime": {
                    "type": "integer"
                },
@@ -827,11 +1056,57 @@
                        }
                    ]
                },
                "procedureId": {
                    "type": "string"
                },
                "processModelNumber": {
                    "description": "工艺模型编号",
                    "type": "string"
                },
                "startTime": {
                    "type": "integer"
                },
                "status": {
                    "$ref": "#/definitions/model.ProcedureStatus"
                }
            }
        },
        "model.ProcessModel": {
            "type": "object",
            "properties": {
                "deviceId": {
                    "description": "用于过滤获取nsq消息",
                    "type": "string"
                },
                "isUpdate": {
                    "description": "前端用",
                    "type": "boolean"
                },
                "newNumber": {
                    "type": "string"
                },
                "newParamsMap": {
                    "type": "object",
                    "additionalProperties": true
                },
                "number": {
                    "description": "工艺模型编号",
                    "type": "string"
                },
                "params": {
                    "type": "string"
                },
                "paramsMap": {
                    "type": "object",
                    "additionalProperties": true
                },
                "procedure": {
                    "description": "工序",
                    "type": "string"
                },
                "product": {
                    "description": "产品名称",
                    "type": "string"
                }
            }
        },
@@ -846,11 +1121,22 @@
                }
            }
        },
        "request.SendProcessParams": {
            "type": "object",
            "required": [
                "procedureId"
            ],
            "properties": {
                "procedureId": {
                    "type": "integer"
                }
            }
        },
        "request.UpdatePlc": {
            "type": "object",
            "properties": {
                "address": {
                    "description": "PortName   string `gorm:\"type:varchar(191);comment:端口名称\" json:\"portName\"`\nFrequency  int    `gorm:\"type:int(11);comment:数据更新频率 0-实时更新 1-1次/秒\" json:\"frequency\"`",
                    "description": "PortName   string `gorm:\"type:varchar(191);comment:端口名称\" json:\"portName\"`\nFrequency  int    `gorm:\"comment:数据更新频率 0-实时更新 1-1次/秒\" json:\"frequency\"`",
                    "type": "string"
                },
                "baudRate": {
@@ -940,6 +1226,9 @@
                "finishNumber": {
                    "type": "integer"
                },
                "plcStatus": {
                    "type": "integer"
                },
                "totalNumber": {
                    "type": "integer"
                }
@@ -965,11 +1254,22 @@
        "response.TaskData": {
            "type": "object",
            "properties": {
                "deviceName": {
                    "type": "string"
                "allProcedures": {
                    "type": "array",
                    "items": {
                        "type": "string"
                    }
                },
                "deviceStatus": {
                    "type": "string"
                "canStarted": {
                    "description": "是否可以开始生产",
                    "type": "boolean"
                },
                "channel": {
                    "description": "当前任务在设备第几个通道",
                    "type": "integer"
                },
                "currentProcedureIndex": {
                    "type": "integer"
                },
                "order": {
                    "$ref": "#/definitions/model.Order"
@@ -978,6 +1278,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"
                    }
                }
            }
        }
    }
}