fix

zhangqian

2023-09-16 0d3d5a03d100614e0216249ec5ebbbbef8ff174c

 api/v1/plc.go

@@ -6,6 +6,7 @@
   "apsClient/model/response"
   _ "apsClient/model/response"
   "apsClient/pkg/contextx"
   "apsClient/pkg/plc/apacheplc4x"
   "apsClient/service"
   "github.com/gin-gonic/gin"
   "github.com/spf13/cast"
@@ -19,18 +20,30 @@
// @Produce   application/json
// @Param     object  body    request.SendProcessParams true  "查询参数"
// @Success   200   {object}  contextx.Response{data=response.ProductProgress}  "成功"
// @Router    /v1/plc/productProgress [get]
// @Router    /v1/plc/productProgress [post]
func (slf *PlcApi) GetProductProgress(c *gin.Context) {
   var params request.SendProcessParams
   var params request.GetProductProgress
   ctx, ok := contextx.NewContext(c, &params)
   if !ok {
      return
   }
   finishNumber, _ := service.PlcCacheGet(constvar.PlcCacheKeyFinishNumber)
   totalNumber, _ := service.PlcCacheGet(constvar.PlcCacheKeyTotalNumber)
   finishNumber, _ := service.PlcCacheGet(params.Position, constvar.PlcCacheKeyFinishNumber)
   totalNumber, _ := service.PlcCacheGet(params.Position, constvar.PlcCacheKeyTotalNumber)
   resp := new(response.ProductProgress)
   resp.FinishNumber = cast.ToInt(finishNumber)
   resp.TotalNumber = cast.ToInt(totalNumber)

   plcStatus := 1 //断开连接
   isConnect := apacheplc4x.IsConnect()
   if isConnect {
      if resp.FinishNumber > 0 { //生产
         plcStatus = 2
      } else { //待机
         plcStatus = 3
      }
   }
   resp.PlcStatus = plcStatus

   ctx.OkWithDetailed(resp)
}