Merge branch 'dev' of https://gitea.anxinyun.cn/lucas2/goUpload into dev

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: //二次衬彻应变

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