From b555874608be2e4bb40cceba60b497c04caef842 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 12 九月 2023 14:17:51 +0800
Subject: [PATCH] 三菱协议更改
---
api/v1/plc.go | 44 ++------------------------------------------
1 files changed, 2 insertions(+), 42 deletions(-)
diff --git a/api/v1/plc.go b/api/v1/plc.go
index c6a98a6..cba0bbd 100644
--- a/api/v1/plc.go
+++ b/api/v1/plc.go
@@ -5,7 +5,6 @@
"apsClient/model/response"
_ "apsClient/model/response"
"apsClient/pkg/contextx"
- "apsClient/pkg/ecode"
"apsClient/service"
"github.com/gin-gonic/gin"
"github.com/spf13/cast"
@@ -24,24 +23,8 @@
if !ok {
return
}
-
- plcConfig, code := service.NewDevicePlcService().GetDevicePlc()
- if code != ecode.OK {
- ctx.FailWithMsg(ecode.UnknownErr, "璇峰厛閰嶇疆PLC")
- return
- }
-
- 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
- }
-
+ finishNumber, _ := service.PlcCacheGet(constvar.PlcCacheKeyFinishNumber)
+ totalNumber, _ := service.PlcCacheGet(constvar.PlcCacheKeyTotalNumber)
resp := new(response.ProductProgress)
resp.FinishNumber = cast.ToInt(finishNumber)
resp.TotalNumber = cast.ToInt(totalNumber)
@@ -57,29 +40,6 @@
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
- }
-
- err := service.PlcWrite(plcConfig, constvar.PlcStartAddressTypeFinishNumber, taskData.Order.Amount.IntPart())
- if err != nil {
- ctx.FailWithMsg(ecode.UnknownErr, "璁剧疆澶辫触锛岃妫�鏌lc閰嶇疆")
return
}
ctx.Ok()
--
Gitblit v1.8.0