增加plc连接状态

zhangqian

2023-09-14 3f1ef5cdf9212f912e9cad544387947d158f5d08

增加plc连接状态

 api/v1/plc.go

@@ -6,7 +6,10 @@
    "apsClient/model/response"
    _ "apsClient/model/response"
    "apsClient/pkg/contextx"
    "apsClient/pkg/ecode"
    "apsClient/pkg/plc"
    "apsClient/service"
    "fmt"
    "github.com/gin-gonic/gin"
    "github.com/spf13/cast"
)
@@ -31,6 +34,24 @@
    resp := new(response.ProductProgress)
    resp.FinishNumber = cast.ToInt(finishNumber)
    resp.TotalNumber = cast.ToInt(totalNumber)

    plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
    if code != ecode.OK {
        return
    }
    plcStatus := 1 //断开连接
    ipAddr := fmt.Sprintf("%s:%v", plcConfig.Address, plcConfig.Port)

    conn, err := plc.GetModbusConnection(ipAddr)
    if err == nil && conn.IsConnected() {
        if resp.FinishNumber > 0 { //生产
            plcStatus = 2
        } else { //待机
            plcStatus = 3
        }
    }
    resp.PlcStatus = plcStatus

    ctx.OkWithDetailed(resp)
}


 docs/docs.go

@@ -707,6 +707,10 @@
                    "description": "数据长度",
                    "type": "integer"
                },
                "position": {
                    "description": "数据起始地址",
                    "type": "integer"
                },
                "startAddress": {
                    "description": "数据起始地址",
                    "type": "integer"
@@ -1014,6 +1018,9 @@
                "finishNumber": {
                    "type": "integer"
                },
                "plcStatus": {
                    "type": "integer"
                },
                "totalNumber": {
                    "type": "integer"
                }
@@ -1057,13 +1064,6 @@
                },
                "procedure": {
                    "$ref": "#/definitions/model.Procedures"
                },
                "workers": {
                    "description": "人员列表",
                    "type": "array",
                    "items": {
                        "$ref": "#/definitions/common.ProcedureWorker"
                    }
                }
            }
        }

 docs/swagger.json

@@ -695,6 +695,10 @@
                    "description": "数据长度",
                    "type": "integer"
                },
                "position": {
                    "description": "数据起始地址",
                    "type": "integer"
                },
                "startAddress": {
                    "description": "数据起始地址",
                    "type": "integer"
@@ -1002,6 +1006,9 @@
                "finishNumber": {
                    "type": "integer"
                },
                "plcStatus": {
                    "type": "integer"
                },
                "totalNumber": {
                    "type": "integer"
                }
@@ -1045,13 +1052,6 @@
                },
                "procedure": {
                    "$ref": "#/definitions/model.Procedures"
                },
                "workers": {
                    "description": "人员列表",
                    "type": "array",
                    "items": {
                        "$ref": "#/definitions/common.ProcedureWorker"
                    }
                }
            }
        }

 docs/swagger.yaml

@@ -134,6 +134,9 @@
      length:
        description: 数据长度
        type: integer
      position:
        description: 数据起始地址
        type: integer
      startAddress:
        description: 数据起始地址
        type: integer
@@ -342,6 +345,8 @@
    properties:
      finishNumber:
        type: integer
      plcStatus:
        type: integer
      totalNumber:
        type: integer
    type: object
@@ -372,11 +377,6 @@
        type: integer
      procedure:
        $ref: '#/definitions/model.Procedures'
      workers:
        description: 人员列表
        items:
          $ref: '#/definitions/common.ProcedureWorker'
        type: array
    type: object
info:
  contact: {}

 model/response/common.go

@@ -52,6 +52,7 @@
type ProductProgress struct {
    FinishNumber int `json:"finishNumber"`
    TotalNumber  int `json:"totalNumber"`
    PlcStatus    int `json:"plcStatus"`
}

type TaskCountdown struct {