fix

zhangqian

2023-08-22 04cea6ec858be6ddef3982dcecabf6b3205a1f8b

 api/v1/plc.go

@@ -9,7 +9,7 @@
   "apsClient/pkg/logx"
   "apsClient/pkg/plc"
   "apsClient/service"
   "encoding/json"
   "encoding/binary"
   "github.com/gin-gonic/gin"
)

@@ -47,34 +47,31 @@
      ipAddr = plcConfig.Address
   }

   resp := new(response.ProductProgress)
   if startAddress == 0 || valueType == "" {
      ctx.FailWithMsg(ecode.UnknownErr, "请先配置PLC")
      ctx.OkWithDetailed(resp)
      logx.Warnf("请先配置PLC")
      return
   }

   conn, err := plc.NewModbusConnection(ipAddr)
   defer conn.Close()
   if err != nil {
      ctx.FailWithMsg(ecode.UnknownErr, "连接plc失败")
      ctx.OkWithDetailed(resp)
      logx.Errorf("GetProductProgress 连接plc失败: %v", err.Error())
      return
   }
   defer conn.Close()

   raw, err := plc.ReadHoldingRegister(conn, startAddress, dataLength)
   rawData, err := plc.ReadHoldingRegister(conn, startAddress, dataLength)
   if err != nil {
      ctx.FailWithMsg(ecode.UnknownErr, "获取plc数据失败")
      ctx.OkWithDetailed(resp)
      logx.Errorf("GetProductProgress 获取plc数据失败: %v", err.Error())
      return
   }
   var finishNumber int
   err = json.Unmarshal(raw, &finishNumber)
   resp.FinishNumber = int(binary.BigEndian.Uint16(rawData))
   if err != nil {
      ctx.FailWithMsg(ecode.UnknownErr, "获取生产进度数据解析失败")
      logx.Errorf("GetProductProgress 获取生产进度数据解析失败: %v, data: %v, valueType:%v", err.Error(), raw, valueType)
      ctx.OkWithDetailed(resp)
      logx.Errorf("GetProductProgress 获取生产进度数据解析失败: %v, data: %v, valueType:%v", err.Error(), rawData, valueType)
      return
   }
   resp := response.ProductProgress{
      FinishNumber: finishNumber,
   }
   ctx.OkWithDetailed(resp)
}