From ef7d02ce56e98e8cbc5ed6ec746ea39bf0b8c9e2 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期六, 16 九月 2023 22:44:58 +0800
Subject: [PATCH] 增加实时获取生产进度接口

---
 api/v1/plc.go |   92 +++++++++++++++++++++++++++++++++++----------
 1 files changed, 71 insertions(+), 21 deletions(-)

diff --git a/api/v1/plc.go b/api/v1/plc.go
index 254845f..69edb19 100644
--- a/api/v1/plc.go
+++ b/api/v1/plc.go
@@ -2,10 +2,13 @@
 
 import (
 	"apsClient/constvar"
+	"apsClient/model/request"
 	"apsClient/model/response"
 	_ "apsClient/model/response"
 	"apsClient/pkg/contextx"
 	"apsClient/pkg/ecode"
+	"apsClient/pkg/logx"
+	"apsClient/pkg/plc/apacheplc4x"
 	"apsClient/service"
 	"github.com/gin-gonic/gin"
 	"github.com/spf13/cast"
@@ -17,18 +20,32 @@
 // @Tags      鐢熶骇鏁伴噺
 // @Summary   鑾峰彇鐢熶骇杩涘害
 // @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) {
-	ctx, ok := contextx.NewContext(c, nil)
+	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)
 }
 
@@ -43,28 +60,61 @@
 	if !ok {
 		return
 	}
+	ctx.Ok()
+}
 
-	taskData, code := service.NewTaskService().GetTask()
-	if code != ecode.OK {
-		ctx.Fail(code)
-		return
-	}
-
-	if taskData.Order == nil {
-		ctx.FailWithMsg(ecode.UnknownErr, "褰撳墠娌℃湁寰呯敓浜у伐鍗�")
-		return
-	}
-
+// GetProductProgressRealTime
+// @Tags      鐢熶骇鏁伴噺
+// @Summary   瀹炴椂鑾峰彇鐢熶骇杩涘害
+// @Produce   application/json
+// @Param     object  body    request.SendProcessParams true  "鏌ヨ鍙傛暟"
+// @Success   200   {object}  contextx.Response{data=response.ProductProgress}  "鎴愬姛"
+// @Router    /v1/plc/productProgressRealTime [post]
+func (slf *PlcApi) GetProductProgressRealTime(c *gin.Context) {
+	var finishNumber, totalNumber int64
 	plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
 	if code != ecode.OK {
-		ctx.FailWithMsg(ecode.UnknownErr, "璇峰厛閰嶇疆PLC")
 		return
+	}
+	for _, addressItem := range plcConfig.Details {
+		if addressItem.FieldName == constvar.PlcStartAddressTypeFinishNumber {
+			value, err := service.PlcReadDirect(plcConfig, addressItem.StartAddress, addressItem.Length, addressItem.Type)
+			if err != nil {
+				logx.Infof("plc read finish number err: %v", err)
+				continue
+			}
+			finishNumber = cast.ToInt64(value)
+			logx.Infof("plc read finish number: %v", finishNumber)
+			break
+		}
 	}
 
-	err := service.PlcWrite(plcConfig, constvar.PlcStartAddressTypeTotalNumber, taskData.Order.Amount.IntPart())
-	if err != nil {
-		ctx.FailWithMsg(ecode.UnknownErr, "璁剧疆澶辫触锛岃妫�鏌lc閰嶇疆")
-		return
+	for _, addressItem := range plcConfig.Details {
+		if addressItem.FieldName == constvar.PlcStartAddressTypeTotalNumber {
+			value, err := service.PlcReadDirect(plcConfig, addressItem.StartAddress, addressItem.Length, addressItem.Type)
+			if err != nil {
+				logx.Infof("plc read total number err: %v", err)
+				continue
+			}
+			totalNumber = cast.ToInt64(value)
+			logx.Infof("plc read total number: %v", totalNumber)
+			break
+		}
 	}
-	ctx.Ok()
+	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)
 }

--
Gitblit v1.8.0