From cab6eea89a0d82710369604ecb51f1cdb122e433 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 19 十月 2023 17:26:34 +0800
Subject: [PATCH] fix
---
constvar/const.go | 67 +++++++++++++++++++++++++++------
1 files changed, 55 insertions(+), 12 deletions(-)
diff --git a/constvar/const.go b/constvar/const.go
index 087eeb5..5a294e8 100644
--- a/constvar/const.go
+++ b/constvar/const.go
@@ -1,18 +1,31 @@
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" //宸ュ簭鐢熶骇杩涘害
+ NsqTopicDeviceUpdate = "aps.%v.device.update" //璁惧淇℃伅鏇存敼
+ NsqTopicPullDataRequest = "aps.%v.pull.data.request" //鎷夊彇鏁版嵁璇锋眰
+ NsqTopicPullDataResponse = "aps.%v.pull.data.response" //鎷夊彇鏁版嵁鍝嶅簲
)
-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 (
@@ -24,10 +37,40 @@
type PlcMethod string
const (
- PlcMethodModbusTCP PlcMethod = "modbusTCP"
- PlcMethodSerial PlcMethod = "serial"
+ PlcMethodModbusTCP PlcMethod = "modbusTCP"
+ PlcMethodSerial PlcMethod = "serial"
+ PlcMethodModbusTCPChinese PlcMethod = "缃戠粶"
+ PlcMethodSerialChinese PlcMethod = "涓插彛"
)
-func (slf PlcMethod) Valid() bool {
- return slf == PlcMethodModbusTCP || slf == PlcMethodSerial
+func (slf *PlcMethod) ConvertToEnglish() {
+ if *slf == PlcMethodModbusTCPChinese {
+ *slf = PlcMethodModbusTCP
+ }
+ if *slf == PlcMethodSerialChinese {
+ *slf = PlcMethodSerial
+ }
}
+
+func (slf *PlcMethod) Valid() bool {
+ return *slf == PlcMethodModbusTCP || *slf == PlcMethodSerial
+}
+
+const (
+ PlcCacheKeyFinishNumber = "finish_number"
+ PlcCacheKeyTotalNumber = "total_number"
+)
+
+const (
+ PlcPackageApache = "apache"
+ PlcPackageGoBurrow = "goBurrow"
+ PlcPackageApacheLongConnection = "apacheLong"
+)
+
+type TaskMode int
+
+const (
+ TaskModeUnStarted TaskMode = 1 //鏈紑濮嬬殑
+ TaskModeCurrent TaskMode = 2 //鏈紑濮嬬殑鍜岃繘琛屼腑鐨�
+ TaskModeLastFinished TaskMode = 3 //涓婁竴涓粨鏉熺殑
+)
--
Gitblit v1.8.0