From 462d1032609c047072d9e290814d5eceddda6634 Mon Sep 17 00:00:00 2001 From: yfh Date: Tue, 12 Nov 2024 15:18:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=BA10.0.30.142=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.yaml | 33 ++++++++++++++++----------------- et_calc/group/calcTask_test.go | 4 ++-- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/config.yaml b/config.yaml index f502f7c..d6e7ceb 100644 --- a/config.yaml +++ b/config.yaml @@ -1,35 +1,34 @@ pprof: enable: false kafka: - groupId: consumer_group_et_go3 + groupId: local_et_go2 brokers: - - 10.8.30.160:30992 + - 10.8.30.142:30992 topics: -# 输入流 +# data_theme: native_theme data_raw: RawData - data_agg: native_agg -# 输出流 - data_theme: native_theme +# data_agg: native_agg alarm_iota: Alert alarm_anxinyun: native_alarm redis: - address: 10.8.30.160:30379 + address: 10.8.30.142:30379 es: enable: true addresses: - - http://10.8.30.160:30092 + - http://10.8.30.142:30092 +# - http://10.8.30.160:30092 user: "" pwd: "" index: - raw: native_raws - vib: native_vbraws - theme: native_themes + raw: native_raws_new10 + vib: native_vbraws_new10 + theme: native_themes_new10 group: native_group_themes influxDB: enable: true - address: http://10.8.30.160:30086 - token: EJcUCii65nAWBivWjV_7ro-V1yAiarPD41iuxJgRPZBRqXst4hSPt7L8VEhUoY_hdR0kvmPHFN5lv1wlX12t-A== - organization: dongjiang + address: http://10.8.30.142:30086 + token: m-biJsdVzL0nxmz4fqYeE5p0mia_FiMFwGr8em09EjBJVr5pSFZ37G8FBDlx7uxDTyKtpMgfEvte9bZaOuMBLg== + organization: localtest buckets: raw: raw vib: vib @@ -42,18 +41,18 @@ prometheus: push: mqtt: enable: false - host: 10.8.30.160 + host: 10.8.30.142 port: 30883 clientIdPrefix: push_et_go kafka: enable: false groupId: push_et_go_lk brokers: - - 10.8.30.160:30992 + - 10.8.30.142:30992 # 节点信息 # master: port: 50000 - hostNameTag: "0" #多状态副本 master 节点的 hostName 标记 + hostNameTag: "0" #多状态副本 master 节点的 hostName 标记 DESKTOP-1QK809D node: remoteMasterHost: 10.8.30.104 #用于 node Register -> master hostIpPrefix: 10.8. #多网卡筛选ip网段 diff --git a/et_calc/group/calcTask_test.go b/et_calc/group/calcTask_test.go index 16173f2..767f6a6 100644 --- a/et_calc/group/calcTask_test.go +++ b/et_calc/group/calcTask_test.go @@ -10,8 +10,8 @@ import ( "time" ) -var configHelper = common_utils.NewConfigHelper("10.8.30.160:30379") -var group, _ = configHelper.GetStationGroup(36) +var configHelper = common_utils.NewConfigHelper("10.8.30.142:30379") +var group, _ = configHelper.GetStationGroup(54) var processDataStrWSD_noFormula = ` {"DeviceData":{"DeviceId":"ed0f1d94-49a9-415b-9336-f965a2b0a985","Name":"温湿度传感器m1","ThingId":"5da9aa1b-05b7-4943-be57-dedb34f7a1bd","StructId":3,"TaskId":"0e1c7d3d-257d-4763-a335-198aef0fc625","AcqTime":"2024-03-20T04:20:48.000125336+08:00","RealTime":"2024-03-20T04:20:48.000251942+08:00","ErrCode":0,"Raw":{"Temp":27.9,"humidy":13.5},"RawUnit":{"Temp":"℃","humidy":"%"},"DeviceInfo":{"id":"ed0f1d94-49a9-415b-9336-f965a2b0a985","name":"温湿度传感器m1","structure":{"thingId":"5da9aa1b-05b7-4943-be57-dedb34f7a1bd","id":3,"name":"添加边坡","type":"边坡","orgId":1,"latitude":0,"longitude":0},"device_meta":{"id":"d5bf6f22-3d7a-4ab0-9043-1020e9516bcc","name":"温湿度传感器","model":"FS-BDS-WSD","properties":[],"capabilities":[{"capabilityCategoryId":3,"id":"d2add1b3-b21c-420b-82a4-e0c55ee3a019","name":"采集","properties":[{"category":"Output","name":"Temp","showName":"温度","unit":"℃"},{"category":"Output","name":"humidy","showName":"湿度","unit":"%"}]}]}},"DimensionId":"76c75371-bb9a-4f71-a25d-58adf7938296","DataType":""},"Stations":[{"Info":{"id":197,"name":"温湿度测点1","structure":3,"thingId":"5da9aa1b-05b7-4943-be57-dedb34f7a1bd","struct_name":"添加边坡","factor":2,"manual_data":false,"formula":0,"params_value":null,"Factor":{"id":2,"name":"环境温湿度","protoCode":"1002","protoName":"温湿度","items":[{"id":3,"name":"温度","field_name":"temperature","unit_name":"℃","precision":0},{"id":4,"name":"湿度","field_name":"humidity","unit_name":"%RH","precision":0}],"units":{"humidity":"%RH","temperature":"℃"}},"proto":"1002","Proto":{"code":"1002","name":"温湿度","items":[{"id":3,"name":"温度","field_name":"temperature","unit_name":"℃","precision":0},{"id":4,"name":"湿度","field_name":"humidity","unit_name":"%RH","precision":0}]},"Devices":[{"formula_id":0,"params":{},"iota_device_id":"ed0f1d94-49a9-415b-9336-f965a2b0a985","iota_device_serial":0,"FormulaInfo":{"id":0,"expression":"","params":null,"ioFields":{"input":null,"output":null},"type":""},"DeviceFactorProto":{"formula":0,"field_val":{"Temp":"temperature","humidy":"humidity"},"FieldValUnitK":null}}],"Labels":"{}","CombineInfo":""},"Data":{"DeviceCalcData":null,"ThemeData":null,"CollectTime":"0001-01-01T00:00:00Z","AlarmLevel":0},"Threshold":{"Items":[{"item":3,"field_name":"temperature","name":"温度","level":1,"lower":20,"upper":100000,"begin":null,"end":null},{"item":3,"field_name":"temperature","name":"温度","level":2,"lower":10,"upper":20,"begin":null,"end":null},{"item":4,"field_name":"humidity","name":"湿度","level":1,"lower":6,"upper":16,"begin":null,"end":null}]}}]}`