From 29c7d613200b15d0b719b54478aaca9b8f7b0540 Mon Sep 17 00:00:00 2001 From: lucas Date: Mon, 7 Apr 2025 09:30:38 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=9B=B4=E6=96=B0=E5=86=9C=E6=9D=91?= =?UTF-8?q?=E5=85=AC=E8=B7=AF=20=E9=85=8D=E7=BD=AE=20=E5=92=8C=20=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=8C=B9=E9=85=8Did?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...¯åŠ¨to江è‹çœå†œæ‘公路桥æ¢ç›‘测.go | 3 +- .../config_江è‹å†œæ‘公路桥æ¢.json | 28 ++++++++++++++----- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/adaptors/振动to江è‹çœå†œæ‘公路桥æ¢ç›‘测.go b/adaptors/振动to江è‹çœå†œæ‘公路桥æ¢ç›‘测.go index cf41c82..25f9fad 100644 --- a/adaptors/振动to江è‹çœå†œæ‘公路桥æ¢ç›‘测.go +++ b/adaptors/振动to江è‹çœå†œæ‘公路桥æ¢ç›‘测.go @@ -39,7 +39,8 @@ func (the Adaptor_ZD_JSNCGLQL) ZDtoJSNCGLQL(zd models.ZDnew) (result []NeedPush) sensorDataList := zd.AccValues //获å–对方系统 id - sensorCode := the.getSensorCode(strconv.Itoa(zd.SensorId)) + sourceId := fmt.Sprintf("%d_%d", zd.SensorId, zd.Channel) + sensorCode := the.getSensorCode(sourceId) if sensorCode == "" { log.Printf("振动 设备[%s] 无匹é…çš„ 江è‹å†œæ‘公路桥æ¢ç›‘测系统 测点id,请检查é…置文件", zd.Module) return diff --git a/configFiles/config_江è‹å†œæ‘公路桥æ¢.json b/configFiles/config_江è‹å†œæ‘公路桥æ¢.json index 9c9ca5c..278aa82 100644 --- a/configFiles/config_江è‹å†œæ‘公路桥æ¢.json +++ b/configFiles/config_江è‹å†œæ‘公路桥æ¢.json @@ -3,8 +3,8 @@ "ioConfig": { "in": { "mqtt": { - "host": "10.8.30.160", - "port": 30883, + "host": "127.0.0.1", + "port": 1883, "userName": "goInOut", "password": "", "clientId": "goInOut_JSNCGLQL", @@ -15,8 +15,8 @@ }, "out": { "mqtt": { - "host": "10.8.30.160", - "port": 30883, + "host": "127.0.0.1", + "port": 1883, "userName": "upload", "password": "", "clientId": "goInOut", @@ -27,12 +27,26 @@ } }, "info": { - "bridgeCode": "G2320281L0012" + "bridgeCode": "G2513LR0470320324" }, "sensorInfo": { "ZDsensorMap": { - "35968": "LHTDQ-VIB-C08-001-01234", - "m1c2": "LHTDQ-VIB-L03-001-01" + "11870_1": "SGO-RSG-G03-001-01", + "11870_2": "SGO-RSG-G03-001-02", + "11870_3": "SGO-RSG-G03-001-03", + "11870_4": "SGO-RSG-G03-001-04", + "11870_5": "SGO-RSG-G03-001-05", + "11870_6": "SGO-RSG-G03-001-06", + "11870_7": "SGO-RSG-G03-001-07", + "11870_8": "SGO-RSG-G03-001-08", + "35968_1": "SGO-RSG-G03-001-09", + "35968_2": "SGO-RSG-G03-001-10", + "35968_3": "SGO-RSG-G03-001-11", + "35968_4": "SGO-RSG-G03-001-12", + "35968_5": "SGO-RSG-G03-001-13", + "35968_6": "SGO-RSG-G03-001-14", + "35968_7": "SGO-RSG-G03-001-15", + "35968_8": "SGO-RSG-G03-001-16" } } } \ No newline at end of file