From 8a099c6c5c51d42a88978f90db159f148db3c164 Mon Sep 17 00:00:00 2001 From: 18209 Date: Wed, 21 May 2025 10:39:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=8A=A0=E4=BB=A5=E5=B0=94?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E7=9A=84=E6=A0=A1=E9=AA=8C=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adaptors/安心云es数据to南京智行.go | 2 +- consumers/consumerJYESNJZX.go | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/adaptors/安心云es数据to南京智行.go b/adaptors/安心云es数据to南京智行.go index 5a7f524..86515bf 100644 --- a/adaptors/安心云es数据to南京智行.go +++ b/adaptors/安心云es数据to南京智行.go @@ -91,7 +91,7 @@ func (the *Adaptor_AXYES_NJZX) getMonitorTypeByFactorId(factorId int) protoDataF case 18: //裂缝检测 return protoDataFiles.MonitoryType_CRK case 103: //净空收敛 - return protoDataFiles.MonitoryType_INC //无对应 + return protoDataFiles.MonitoryType_CRK case 102: //拱顶沉降 return protoDataFiles.MonitoryType_CRK //无对应 case 96: //二次衬彻应变 diff --git a/consumers/consumerJYESNJZX.go b/consumers/consumerJYESNJZX.go index b527603..231c45c 100644 --- a/consumers/consumerJYESNJZX.go +++ b/consumers/consumerJYESNJZX.go @@ -2,7 +2,6 @@ package consumers import ( "crypto/rc4" - "encoding/hex" "fmt" "goInOut/adaptors" "goInOut/consumers/HBJCAS" @@ -107,10 +106,6 @@ func (the *consumerJYESNJZX) getEsAggData() { log.Printf("esAggResultStr[%s]", esAggResultStr) needPushes := adaptor.Transform(structId, factorId, esAggResultStr) - for i := range needPushes { - needPushes[i].Payload = the.crc16rc4(needPushes[i].Payload) - log.Printf("topic[%s],Payload=> %s", needPushes[i].Topic, hex.EncodeToString(needPushes[i].Payload)) - } if len(needPushes) > 0 { the.ch <- needPushes