fix

zhangqian

2023-08-27 8dfb8feb32bb5e4e460e23dcde42612a26fa2bcb

 api/v1/plc.go

@@ -5,18 +5,15 @@
   "apsClient/model/response"
   _ "apsClient/model/response"
   "apsClient/pkg/contextx"
   "apsClient/pkg/ecode"
   "apsClient/pkg/logx"
   "apsClient/pkg/plc"
   "apsClient/service"
   "encoding/json"
   "github.com/gin-gonic/gin"
   "github.com/spf13/cast"
)

type PlcApi struct{}

// GetProductProgress
// @Tags      获取动态数据
// @Tags      生产数量
// @Summary   获取生产进度
// @Produce   application/json
// @Success   200   {object}  contextx.Response{data=response.ProductProgress}  "成功"
@@ -26,56 +23,24 @@
   if !ok {
      return
   }

   plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
   if code != ecode.OK {
      ctx.FailWithMsg(ecode.UnknownErr, "请先配置PLC")
      return
   }

   var startAddress int
   var valueType string
   var dataLength int
   var ipAddr string

   for _, pc := range plcConfig.Details {
      if pc.FieldName == constvar.PlcStartAddressTypeFinishNumber {
         startAddress = pc.StartAddress
         valueType = pc.Type
         dataLength = pc.Length
      }
      ipAddr = plcConfig.Address
   }

   finishNumber, _ := service.PlcCacheGet(constvar.PlcCacheKeyFinishNumber)
   totalNumber, _ := service.PlcCacheGet(constvar.PlcCacheKeyTotalNumber)
   resp := new(response.ProductProgress)
   if startAddress == 0 || valueType == "" {
      ctx.OkWithDetailed(resp)
      logx.Warnf("请先配置PLC")
      return
   }
   conn, err := plc.NewModbusConnection(ipAddr)
   if conn != nil {
      defer conn.Close()
   }

   if err != nil {
      ctx.OkWithDetailed(resp)
      logx.Errorf("GetProductProgress 连接plc失败: %v", err.Error())
      return
   }

   rawData, err := plc.ReadHoldingRegister(conn, startAddress, dataLength)
   if err != nil {
      ctx.OkWithDetailed(resp)
      logx.Errorf("GetProductProgress 获取plc数据失败: %v", err.Error())
      return
   }
   var finishNumber interface{}
   err = json.Unmarshal(rawData, &finishNumber)
   if err != nil {
      ctx.OkWithDetailed(resp)
      logx.Errorf("GetProductProgress 获取生产进度数据解析失败: %v, data: %v, valueType:%v", err.Error(), rawData, valueType)
      return
   }
   resp.FinishNumber = cast.ToInt(finishNumber)
   resp.TotalNumber = cast.ToInt(totalNumber)
   ctx.OkWithDetailed(resp)
}

// SetProductNumber
// @Tags      生产数量
// @Summary   设置生产总量
// @Produce   application/json
// @Success   200   {object}  contextx.Response{}  "成功"
// @Router    /v1/plc/setProductNumber [post]
func (slf *PlcApi) SetProductNumber(c *gin.Context) {
   ctx, ok := contextx.NewContext(c, nil)
   if !ok {
      return
   }
   ctx.Ok()
}