From 10c65da3d2af7056f48d9301e83f53f102f76e18 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 30 十月 2023 14:52:11 +0800
Subject: [PATCH] fix
---
constvar/const.go | 40 ++++++++++++++++++++++++++++++++++------
1 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/constvar/const.go b/constvar/const.go
index 8b56942..abe1c72 100644
--- a/constvar/const.go
+++ b/constvar/const.go
@@ -1,14 +1,13 @@
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" //鎺掔▼浠诲姟涓嬪彂
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 int
@@ -35,6 +34,7 @@
const (
PlcMethodModbusTCP PlcMethod = "modbusTCP"
+ PlcMethodModbusRTU PlcMethod = "modbusRTU"
PlcMethodSerial PlcMethod = "serial"
PlcMethodModbusTCPChinese PlcMethod = "缃戠粶"
PlcMethodSerialChinese PlcMethod = "涓插彛"
@@ -50,7 +50,7 @@
}
func (slf *PlcMethod) Valid() bool {
- return *slf == PlcMethodModbusTCP || *slf == PlcMethodSerial
+ return *slf == PlcMethodModbusTCP || *slf == PlcMethodSerial || *slf == PlcMethodModbusRTU
}
const (
@@ -63,3 +63,31 @@
PlcPackageGoBurrow = "goBurrow"
PlcPackageApacheLongConnection = "apacheLong"
)
+
+type TaskMode int
+
+const (
+ TaskModeUnStarted TaskMode = 1 //鏈紑濮嬬殑
+ TaskModeCurrent TaskMode = 2 //鏈紑濮嬬殑鍜岃繘琛屼腑鐨�
+ TaskModeLastFinished TaskMode = 3 //涓婁竴涓粨鏉熺殑
+)
+
+type Parity int
+
+const (
+ ParityEven Parity = 1 //濂囨牎楠�
+ ParityOdd Parity = 2 //鍋舵牎楠�
+ ParityNull Parity = 3 //鏃犳牎楠�
+)
+
+func (p Parity) String() string {
+ switch p {
+ case ParityEven:
+ return "E"
+ case ParityOdd:
+ return "O"
+ case ParityNull:
+ return "N"
+ }
+ return ""
+}
--
Gitblit v1.8.0