From 78f6276b1e727326b9797451db82cd6c7c480852 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 25 八月 2023 11:45:00 +0800
Subject: [PATCH] 增加任务倒计时接口
---
api/v1/plc.go | 84 ++++++++++++++++++++++-------------------
1 files changed, 45 insertions(+), 39 deletions(-)
diff --git a/api/v1/plc.go b/api/v1/plc.go
index bec602d..c6a98a6 100644
--- a/api/v1/plc.go
+++ b/api/v1/plc.go
@@ -6,17 +6,15 @@
_ "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} "鎴愬姛"
@@ -33,48 +31,56 @@
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, err := service.PlcRead(plcConfig, constvar.PlcStartAddressTypeFinishNumber)
+ if err != nil {
+ ctx.FailWithMsg(ecode.UnknownErr, "璇诲彇鏁版嵁澶辫触锛岃妫�鏌lc閰嶇疆")
+ return
+ }
+ totalNumber, err := service.PlcRead(plcConfig, constvar.PlcStartAddressTypeTotalNumber)
+ if err != nil {
+ ctx.FailWithMsg(ecode.UnknownErr, "璇诲彇鏁版嵁澶辫触锛岃妫�鏌lc閰嶇疆")
+ return
}
- if startAddress == 0 || valueType == "" {
+ resp := new(response.ProductProgress)
+ 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
+ }
+
+ taskData, code := service.NewTaskService().GetTask()
+ if code != ecode.OK {
+ ctx.Fail(code)
+ return
+ }
+
+ if taskData.Order == nil {
+ ctx.FailWithMsg(ecode.UnknownErr, "褰撳墠娌℃湁寰呯敓浜у伐鍗�")
+ return
+ }
+
+ plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
+ if code != ecode.OK {
ctx.FailWithMsg(ecode.UnknownErr, "璇峰厛閰嶇疆PLC")
return
}
- conn, err := plc.NewModbusConnection(ipAddr)
- defer conn.Close()
+ err := service.PlcWrite(plcConfig, constvar.PlcStartAddressTypeFinishNumber, taskData.Order.Amount.IntPart())
if err != nil {
- ctx.FailWithMsg(ecode.UnknownErr, "杩炴帴plc澶辫触")
- logx.Errorf("GetProductProgress 杩炴帴plc澶辫触: %v", err.Error())
+ ctx.FailWithMsg(ecode.UnknownErr, "璁剧疆澶辫触锛岃妫�鏌lc閰嶇疆")
return
}
-
- raw, err := plc.ReadHoldingRegister(conn, startAddress, dataLength)
- if err != nil {
- ctx.FailWithMsg(ecode.UnknownErr, "鑾峰彇plc鏁版嵁澶辫触")
- logx.Errorf("GetProductProgress 鑾峰彇plc鏁版嵁澶辫触: %v", err.Error())
- return
- }
- var finishNumber int
- err = json.Unmarshal(raw, &finishNumber)
- if err != nil {
- ctx.FailWithMsg(ecode.UnknownErr, "鑾峰彇鐢熶骇杩涘害鏁版嵁瑙ｆ瀽澶辫触")
- logx.Errorf("GetProductProgress 鑾峰彇鐢熶骇杩涘害鏁版嵁瑙ｆ瀽澶辫触: %v, data: %v, valueType:%v", err.Error(), raw, valueType)
- return
- }
- resp := response.ProductProgress{
- FinishNumber: finishNumber,
- }
- ctx.OkWithDetailed(resp)
+ ctx.Ok()
}
--
Gitblit v1.8.0