From 8324f872ef3a4d0c978a9b1d062800c6a1701c12 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 01 十二月 2023 09:58:17 +0800
Subject: [PATCH] fix

---
 constvar/const.go |   28 +++++++++++++++++++++++++---
 1 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/constvar/const.go b/constvar/const.go
index 3f6fc2b..10a507d 100644
--- a/constvar/const.go
+++ b/constvar/const.go
@@ -8,6 +8,7 @@
 	NsqTopicDeviceUpdate              = "aps.%v.device.update"           //璁惧淇℃伅鏇存敼
 	NsqTopicPullDataRequest           = "aps.%v.pull.data.request"       //鎷夊彇鏁版嵁璇锋眰
 	NsqTopicPullDataResponse          = "aps.%v.pull.data.response"      //鎷夊彇鏁版嵁鍝嶅簲
+	NsqTopicApsClientReportData       = "aps.%v.apsClient.report.data"   //apsClient涓婃姤鏁版嵁
 )
 
 type PlcStartAddressType int
@@ -21,7 +22,8 @@
 
 const (
 	PlcStartAddressValueTypeString PlcStartAddressValueType = "string"
-	PlcStartAddressValueTypeInt    PlcStartAddressValueType = "int"
+	PlcStartAddressValueTypeInt16  PlcStartAddressValueType = "int16"
+	PlcStartAddressValueTypeInt32  PlcStartAddressValueType = "int32"
 )
 
 const (
@@ -80,7 +82,7 @@
 	ParityNull Parity = 3 //鏃犳牎楠�
 )
 
-func (p Parity) String() string {
+func (p Parity) ToString() string {
 	switch p {
 	case ParityEven:
 		return "E"
@@ -105,7 +107,7 @@
 	ProblemCodeNetwork                    ProblemCode = "network"                        //缃戠粶閿欒
 	ProblemCodeDB                         ProblemCode = "db"                             //鏁版嵁搴撹繛鎺ラ敊璇�
 	ProblemCodeSerf                       ProblemCode = "serf"                           //鏈姞鍏erf闆嗙兢
-	ProblemCodeNsq                        ProblemCode = "nsq"                            //鏈繛鎺ユ秷鎭槦鍒�
+	ProblemCodeCloud                      ProblemCode = "cloud"                          //鏈繛鎺ヤ簯绔�
 	ProblemCodeDevice                     ProblemCode = "device"                         //鏈粦瀹氳澶�
 	ProblemCodeProcessModel               ProblemCode = "process_model"                  //宸ヨ壓鍙傛暟缂哄け
 	ProblemCodePlcConfig                  ProblemCode = "plc_config"                     //plc閰嶇疆缂哄け
@@ -113,3 +115,23 @@
 	ProblemCodePlcProcessModelAddressList ProblemCode = "plc_process_model_address_list" //plc鍦板潃琛ㄧ己澶�
 	ProblemCodePlcConnect                 ProblemCode = "plc_connect"                    //plc杩炴帴澶辫触
 )
+
+type SystemStatusKey string
+
+const (
+	SystemStatusKeyNsq SystemStatusKey = "nsq"
+)
+
+type SystemStatusValue string
+
+const (
+	SystemStatusValueNormal   SystemStatusValue = "1"
+	SystemStatusValueUnNormal SystemStatusValue = "2"
+)
+
+type ReportType int //涓婃姤绫诲瀷
+
+const (
+	ReportTypeSystemDeviceID ReportType = 1
+	ReportTypeReportWork     ReportType = 2
+)

--
Gitblit v1.8.0