From b555874608be2e4bb40cceba60b497c04caef842 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期二, 12 九月 2023 14:17:51 +0800
Subject: [PATCH] 三菱协议更改

---
 constvar/const.go |   31 +++++++++++++++++++++++--------
 1 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/constvar/const.go b/constvar/const.go
index 087eeb5..d92f9f9 100644
--- a/constvar/const.go
+++ b/constvar/const.go
@@ -1,18 +1,28 @@
 package constvar
 
 const (
-	NsqTopicScheduleTask          = "aps.%v.scheduleTask" //鎺掔▼浠诲姟涓嬪彂
-	NsqTopicGetPlcAddress         = "aps.%v.getPlcAddress"
-	NsqTopicSendPlcAddress        = "aps.%v.sendPlcAddress"
-	NsqTopicProcessParamsRequest  = "aps.%v.processParams.request"
-	NsqTopicProcessParamsResponse = "aps.%v.processParams.response"
+	NsqTopicScheduleTask              = "aps.%v.scheduleTask" //鎺掔▼浠诲姟涓嬪彂
+	NsqTopicGetPlcAddress             = "aps.%v.getPlcAddress"
+	NsqTopicSendPlcAddress            = "aps.%v.sendPlcAddress"
+	NsqTopicProcessParamsRequest      = "aps.%v.processParams.request"
+	NsqTopicProcessParamsResponse     = "aps.%v.processParams.response"
+	NsqTopicApsProcessParams          = "aps.%v.aps.processParams"       //鏈変簡鏂扮殑宸ヨ壓妯″瀷
+	NsqTopicTaskProcedureStatusUpdate = "aps.%v.task.procedure.status"   //宸ュ簭鐘舵�佹洿鏂�
+	NsqTopicSyncTaskProgress          = "aps.%v.task.procedure.progress" //宸ュ簭鐢熶骇杩涘害
 )
 
-type PlcStartAddressType string
+type PlcStartAddressType int
 
 const (
-	PlcStartAddressTypeFinishNumber = 1
-	PlcStartAddressTypeTotalNumber  = 2
+	PlcStartAddressTypeFinishNumber PlcStartAddressType = 1
+	PlcStartAddressTypeTotalNumber  PlcStartAddressType = 2
+)
+
+type PlcStartAddressValueType string
+
+const (
+	PlcStartAddressValueTypeString PlcStartAddressValueType = "string"
+	PlcStartAddressValueTypeInt    PlcStartAddressValueType = "int"
 )
 
 const (
@@ -31,3 +41,8 @@
 func (slf PlcMethod) Valid() bool {
 	return slf == PlcMethodModbusTCP || slf == PlcMethodSerial
 }
+
+const (
+	PlcCacheKeyFinishNumber = "finish_number"
+	PlcCacheKeyTotalNumber  = "total_number"
+)

--
Gitblit v1.8.0