From 25b7d8866e2dfae52050c4276047f060ccb20ea1 Mon Sep 17 00:00:00 2001 From: Dai Mr <1822802785@qq.com> Date: Tue, 24 Dec 2024 18:45:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cmd3761Matching.txt | 196 +++ .../cmd3761TdcMatching.txt | 1189 +++++++++++++++++ src/JiShe.CollectBus.Common/Enums/376Enums.cs | 4 +- .../Abstracts/BaseProtocolPlugin.cs | 9 + 4 files changed, 1396 insertions(+), 2 deletions(-) diff --git a/src/JiShe.CollectBus.Application/cmd3761Matching.txt b/src/JiShe.CollectBus.Application/cmd3761Matching.txt index 2c1afb5..5cab1eb 100644 --- a/src/JiShe.CollectBus.Application/cmd3761Matching.txt +++ b/src/JiShe.CollectBus.Application/cmd3761Matching.txt @@ -266,6 +266,202 @@ ] } ] + }, + { + "Id": 0, + "Fn": 161, + "Text": "日冻结正向有功电能示值", + "UpList": [ + { + "Id": 1, + "Name": "日冻结类数据时标Td_d", + "DataType": "ATd_d", + "DataIndex": 0, + "DataCount": 3, + "Sort": 1 + }, + { + "Id": 2, + "Name": "终端抄表时间", + "DataType": "A15", + "DataIndex": 3, + "DataCount": 5, + "Sort": 2 + }, + { + "Id": 3, + "Name": "费率数M", + "DataType": "BIN", + "DataIndex": 8, + "DataCount": 1, + "Sort": 3 + }, + { + "Id": 4, + "Name": "正向有功总电能示值", + "DataType": "A14", + "DataIndex": 9, + "DataCount": 5, + "Sort": 4, + "Tb3761UpChildlList": [ + { + "Id": 0, + "Name": "费率{0}正向有功电能示值", + "DataType": "A14", + "DataIndex": 0, + "DataCount": 5, + "Sort": 0 + } + ] + } + ] + }, + { + "Id": 0, + "Fn": 163, + "Text": "日冻结反向有功电能示值", + "UpList": [ + { + "Id": 1, + "Name": "日冻结类数据时标Td_d", + "DataType": "ATd_d", + "DataIndex": 0, + "DataCount": 3, + "Sort": 1 + }, + { + "Id": 2, + "Name": "终端抄表时间", + "DataType": "A15", + "DataIndex": 3, + "DataCount": 5, + "Sort": 2 + }, + { + "Id": 3, + "Name": "费率数M", + "DataType": "BIN", + "DataIndex": 8, + "DataCount": 1, + "Sort": 3 + }, + { + "Id": 4, + "Name": "反向有功总电能示值", + "DataType": "A14", + "DataIndex": 9, + "DataCount": 5, + "Sort": 4, + "Tb3761UpChildlList": [ + { + "Id": 0, + "Name": "费率{0}反向有功电能示值", + "DataType": "A14", + "DataIndex": 0, + "DataCount": 5, + "Sort": 0 + } + ] + } + ] + }, + { + "Id": 0, + "Fn": 177, + "Text": "月冻结正向有功电能示值", + "UpList": [ + { + "Id": 1, + "Name": "月冻结类数据时标Td_m", + "DataType": "ATd_m", + "DataIndex": 0, + "DataCount": 2, + "Sort": 1 + }, + { + "Id": 2, + "Name": "终端抄表时间", + "DataType": "A15", + "DataIndex": 2, + "DataCount": 5, + "Sort": 2 + }, + { + "Id": 3, + "Name": "费率数M", + "DataType": "BIN", + "DataIndex": 7, + "DataCount": 1, + "Sort": 3 + }, + { + "Id": 4, + "Name": "正向有功总电能示值", + "DataType": "A14", + "DataIndex": 8, + "DataCount": 5, + "Sort": 4, + "Tb3761UpChildlList": [ + { + "Id": 0, + "Name": "费率{0}正向有功电能示值", + "DataType": "A14", + "DataIndex": 0, + "DataCount": 5, + "Sort": 0 + } + ] + } + ] + }, + { + "Id": 0, + "Fn": 179, + "Text": "月冻结反向有功电能示值", + "UpList": [ + { + "Id": 1, + "Name": "月冻结类数据时标Td_m", + "DataType": "ATd_m", + "DataIndex": 0, + "DataCount": 2, + "Sort": 1 + }, + { + "Id": 2, + "Name": "终端抄表时间", + "DataType": "A15", + "DataIndex": 2, + "DataCount": 5, + "Sort": 2 + }, + { + "Id": 3, + "Name": "费率数M", + "DataType": "BIN", + "DataIndex": 7, + "DataCount": 1, + "Sort": 3 + }, + { + "Id": 4, + "Name": "反向有功总电能示值", + "DataType": "A14", + "DataIndex": 8, + "DataCount": 5, + "Sort": 4, + "Tb3761UpChildlList": [ + { + "Id": 0, + "Name": "费率{0}反向有功电能示值", + "DataType": "A14", + "DataIndex": 0, + "DataCount": 5, + "Sort": 0 + } + ] + } + ] } ] } diff --git a/src/JiShe.CollectBus.Application/cmd3761TdcMatching.txt b/src/JiShe.CollectBus.Application/cmd3761TdcMatching.txt index 3557ca2..a432620 100644 --- a/src/JiShe.CollectBus.Application/cmd3761TdcMatching.txt +++ b/src/JiShe.CollectBus.Application/cmd3761TdcMatching.txt @@ -43,6 +43,1195 @@ ] } ] + }, + { + "Id": 0, + "Fn": 82, + "Text": "A相有功功率", + "UpList": [ + { + "Id": 1, + "Name": "起始时间", + "DataType": "A15", + "DataIndex": 0, + "DataCount": 5, + "Sort": 1 + }, + { + "Id": 2, + "Name": "数据冻结密度m", + "DataType": "BIN", + "DataIndex": 5, + "DataCount": 1, + "Sort": 2 + }, + { + "Id": 3, + "Name": "数据点数", + "DataType": "BIN", + "DataIndex": 6, + "DataCount": 1, + "Sort": 3, + "Tb3761UpChildlList": [ + { + "Id": 0, + "Name": "有功功率{0}", + "DataType": "A09", + "DataIndex": 0, + "DataCount": 3, + "Sort": 0 + } + ] + } + ] + }, + { + "Id": 0, + "Fn": 83, + "Text": "B相有功功率", + "UpList": [ + { + "Id": 1, + "Name": "起始时间", + "DataType": "A15", + "DataIndex": 0, + "DataCount": 5, + "Sort": 1 + }, + { + "Id": 2, + "Name": "数据冻结密度m", + "DataType": "BIN", + "DataIndex": 5, + "DataCount": 1, + "Sort": 2 + }, + { + "Id": 3, + "Name": "数据点数", + "DataType": "BIN", + "DataIndex": 6, + "DataCount": 1, + "Sort": 3, + "Tb3761UpChildlList": [ + { + "Id": 0, + "Name": "有功功率{0}", + "DataType": "A09", + "DataIndex": 0, + "DataCount": 3, + "Sort": 0 + } + ] + } + ] + }, + { + "Id": 0, + "Fn": 84, + "Text": "C相有功功率", + "UpList": [ + { + "Id": 1, + "Name": "起始时间", + "DataType": "A15", + "DataIndex": 0, + "DataCount": 5, + "Sort": 1 + }, + { + "Id": 2, + "Name": "数据冻结密度m", + "DataType": "BIN", + "DataIndex": 5, + "DataCount": 1, + "Sort": 2 + }, + { + "Id": 3, + "Name": "数据点数", + "DataType": "BIN", + "DataIndex": 6, + "DataCount": 1, + "Sort": 3, + "Tb3761UpChildlList": [ + { + "Id": 0, + "Name": "有功功率{0}", + "DataType": "A09", + "DataIndex": 0, + "DataCount": 3, + "Sort": 0 + } + ] + } + ] + }, + { + "Id": 0, + "Fn": 85, + "Text": "总无功功率", + "UpList": [ + { + "Id": 1, + "Name": "起始时间", + "DataType": "A15", + "DataIndex": 0, + "DataCount": 5, + "Sort": 1 + }, + { + "Id": 2, + "Name": "数据冻结密度m", + "DataType": "BIN", + "DataIndex": 5, + "DataCount": 1, + "Sort": 2 + }, + { + "Id": 3, + "Name": "数据点数", + "DataType": "BIN", + "DataIndex": 6, + "DataCount": 1, + "Sort": 3, + "Tb3761UpChildlList": [ + { + "Id": 0, + "Name": "无功功率{0}", + "DataType": "A09", + "DataIndex": 0, + "DataCount": 3, + "Sort": 0 + } + ] + } + ] + }, + { + "Id": 0, + "Fn": 86, + "Text": "A相无功功率", + "UpList": [ + { + "Id": 1, + "Name": "起始时间", + "DataType": "A15", + "DataIndex": 0, + "DataCount": 5, + "Sort": 1 + }, + { + "Id": 2, + "Name": "数据冻结密度m", + "DataType": "BIN", + "DataIndex": 5, + "DataCount": 1, + "Sort": 2 + }, + { + "Id": 3, + "Name": "数据点数", + "DataType": "BIN", + "DataIndex": 6, + "DataCount": 1, + "Sort": 3, + "Tb3761UpChildlList": [ + { + "Id": 0, + "Name": "无功功率{0}", + "DataType": "A09", + "DataIndex": 0, + "DataCount": 3, + "Sort": 0 + } + ] + } + ] + }, + { + "Id": 0, + "Fn": 87, + "Text": "B相无功功率", + "UpList": [ + { + "Id": 1, + "Name": "起始时间", + "DataType": "A15", + "DataIndex": 0, + "DataCount": 5, + "Sort": 1 + }, + { + "Id": 2, + "Name": "数据冻结密度m", + "DataType": "BIN", + "DataIndex": 5, + "DataCount": 1, + "Sort": 2 + }, + { + "Id": 3, + "Name": "数据点数", + "DataType": "BIN", + "DataIndex": 6, + "DataCount": 1, + "Sort": 3, + "Tb3761UpChildlList": [ + { + "Id": 0, + "Name": "无功功率{0}", + "DataType": "A09", + "DataIndex": 0, + "DataCount": 3, + "Sort": 0 + } + ] + } + ] + }, + { + "Id": 0, + "Fn": 88, + "Text": "C相无功功率", + "UpList": [ + { + "Id": 1, + "Name": "起始时间", + "DataType": "A15", + "DataIndex": 0, + "DataCount": 5, + "Sort": 1 + }, + { + "Id": 2, + "Name": "数据冻结密度m", + "DataType": "BIN", + "DataIndex": 5, + "DataCount": 1, + "Sort": 2 + }, + { + "Id": 3, + "Name": "数据点数", + "DataType": "BIN", + "DataIndex": 6, + "DataCount": 1, + "Sort": 3, + "Tb3761UpChildlList": [ + { + "Id": 0, + "Name": "无功功率{0}", + "DataType": "A09", + "DataIndex": 0, + "DataCount": 3, + "Sort": 0 + } + ] + } + ] + }, + { + "Id": 0, + "Fn": 89, + "Text": "A相电压", + "UpList": [ + { + "Id": 1, + "Name": "起始时间", + "DataType": "A15", + "DataIndex": 0, + "DataCount": 5, + "Sort": 1 + }, + { + "Id": 2, + "Name": "数据冻结密度m", + "DataType": "BIN", + "DataIndex": 5, + "DataCount": 1, + "Sort": 2 + }, + { + "Id": 3, + "Name": "数据点数", + "DataType": "BIN", + "DataIndex": 6, + "DataCount": 1, + "Sort": 3, + "Tb3761UpChildlList": [ + { + "Id": 0, + "Name": "电压数据{0}", + "DataType": "A07", + "DataIndex": 0, + "DataCount": 2, + "Sort": 0 + } + ] + } + ] + }, + { + "Id": 0, + "Fn": 90, + "Text": "B相电压", + "UpList": [ + { + "Id": 1, + "Name": "起始时间", + "DataType": "A15", + "DataIndex": 0, + "DataCount": 5, + "Sort": 1 + }, + { + "Id": 2, + "Name": "数据冻结密度m", + "DataType": "BIN", + "DataIndex": 5, + "DataCount": 1, + "Sort": 2 + }, + { + "Id": 3, + "Name": "数据点数", + "DataType": "BIN", + "DataIndex": 6, + "DataCount": 1, + "Sort": 3, + "Tb3761UpChildlList": [ + { + "Id": 0, + "Name": "电压数据{0}", + "DataType": "A07", + "DataIndex": 0, + "DataCount": 2, + "Sort": 0 + } + ] + } + ] + }, + { + "Id": 0, + "Fn": 91, + "Text": "C相电压", + "UpList": [ + { + "Id": 1, + "Name": "起始时间", + "DataType": "A15", + "DataIndex": 0, + "DataCount": 5, + "Sort": 1 + }, + { + "Id": 2, + "Name": "数据冻结密度m", + "DataType": "BIN", + "DataIndex": 5, + "DataCount": 1, + "Sort": 2 + }, + { + "Id": 3, + "Name": "数据点数", + "DataType": "BIN", + "DataIndex": 6, + "DataCount": 1, + "Sort": 3, + "Tb3761UpChildlList": [ + { + "Id": 0, + "Name": "电压数据{0}", + "DataType": "A07", + "DataIndex": 0, + "DataCount": 2, + "Sort": 0 + } + ] + } + ] + }, + { + "Id": 0, + "Fn": 92, + "Text": "A相电流", + "UpList": [ + { + "Id": 1, + "Name": "起始时间", + "DataType": "A15", + "DataIndex": 0, + "DataCount": 5, + "Sort": 1 + }, + { + "Id": 2, + "Name": "数据冻结密度m", + "DataType": "BIN", + "DataIndex": 5, + "DataCount": 1, + "Sort": 2 + }, + { + "Id": 3, + "Name": "数据点数", + "DataType": "BIN", + "DataIndex": 6, + "DataCount": 1, + "Sort": 3, + "Tb3761UpChildlList": [ + { + "Id": 0, + "Name": "电流数据{0}", + "DataType": "A25", + "DataIndex": 0, + "DataCount": 3, + "Sort": 0 + } + ] + } + ] + }, + { + "Id": 0, + "Fn": 93, + "Text": "B相电流", + "UpList": [ + { + "Id": 1, + "Name": "起始时间", + "DataType": "A15", + "DataIndex": 0, + "DataCount": 5, + "Sort": 1 + }, + { + "Id": 2, + "Name": "数据冻结密度m", + "DataType": "BIN", + "DataIndex": 5, + "DataCount": 1, + "Sort": 2 + }, + { + "Id": 3, + "Name": "数据点数", + "DataType": "BIN", + "DataIndex": 6, + "DataCount": 1, + "Sort": 3, + "Tb3761UpChildlList": [ + { + "Id": 0, + "Name": "电流数据{0}", + "DataType": "A25", + "DataIndex": 0, + "DataCount": 3, + "Sort": 0 + } + ] + } + ] + }, + { + "Id": 0, + "Fn": 94, + "Text": "C相电流", + "UpList": [ + { + "Id": 1, + "Name": "起始时间", + "DataType": "A15", + "DataIndex": 0, + "DataCount": 5, + "Sort": 1 + }, + { + "Id": 2, + "Name": "数据冻结密度m", + "DataType": "BIN", + "DataIndex": 5, + "DataCount": 1, + "Sort": 2 + }, + { + "Id": 3, + "Name": "数据点数", + "DataType": "BIN", + "DataIndex": 6, + "DataCount": 1, + "Sort": 3, + "Tb3761UpChildlList": [ + { + "Id": 0, + "Name": "电流数据{0}", + "DataType": "A25", + "DataIndex": 0, + "DataCount": 3, + "Sort": 0 + } + ] + } + ] + }, + { + "Id": 0, + "Fn": 97, + "Text": "正向有功电量", + "UpList": [ + { + "Id": 1, + "Name": "起始时间", + "DataType": "A15", + "DataIndex": 0, + "DataCount": 5, + "Sort": 1 + }, + { + "Id": 2, + "Name": "数据冻结密度m", + "DataType": "BIN", + "DataIndex": 5, + "DataCount": 1, + "Sort": 2 + }, + { + "Id": 3, + "Name": "数据点数", + "DataType": "BIN", + "DataIndex": 6, + "DataCount": 1, + "Sort": 3, + "Tb3761UpChildlList": [ + { + "Id": 0, + "Name": "有功电量{0}", + "DataType": "A13", + "DataIndex": 0, + "DataCount": 4, + "Sort": 0 + } + ] + } + ] + }, + { + "Id": 0, + "Fn": 98, + "Text": "正向无功电量", + "UpList": [ + { + "Id": 1, + "Name": "起始时间", + "DataType": "A15", + "DataIndex": 0, + "DataCount": 5, + "Sort": 1 + }, + { + "Id": 2, + "Name": "数据冻结密度m", + "DataType": "BIN", + "DataIndex": 5, + "DataCount": 1, + "Sort": 2 + }, + { + "Id": 3, + "Name": "数据点数", + "DataType": "BIN", + "DataIndex": 6, + "DataCount": 1, + "Sort": 3, + "Tb3761UpChildlList": [ + { + "Id": 0, + "Name": "无功电量{0}", + "DataType": "A13", + "DataIndex": 0, + "DataCount": 4, + "Sort": 0 + } + ] + } + ] + }, + { + "Id": 0, + "Fn": 99, + "Text": "反向有功电量", + "UpList": [ + { + "Id": 1, + "Name": "起始时间", + "DataType": "A15", + "DataIndex": 0, + "DataCount": 5, + "Sort": 1 + }, + { + "Id": 2, + "Name": "数据冻结密度m", + "DataType": "BIN", + "DataIndex": 5, + "DataCount": 1, + "Sort": 2 + }, + { + "Id": 3, + "Name": "数据点数", + "DataType": "BIN", + "DataIndex": 6, + "DataCount": 1, + "Sort": 3, + "Tb3761UpChildlList": [ + { + "Id": 0, + "Name": "有功电量{0}", + "DataType": "A13", + "DataIndex": 0, + "DataCount": 4, + "Sort": 0 + } + ] + } + ] + }, + { + "Id": 0, + "Fn": 100, + "Text": "反向无功电量", + "UpList": [ + { + "Id": 1, + "Name": "起始时间", + "DataType": "A15", + "DataIndex": 0, + "DataCount": 5, + "Sort": 1 + }, + { + "Id": 2, + "Name": "数据冻结密度m", + "DataType": "BIN", + "DataIndex": 5, + "DataCount": 1, + "Sort": 2 + }, + { + "Id": 3, + "Name": "数据点数", + "DataType": "BIN", + "DataIndex": 6, + "DataCount": 1, + "Sort": 3, + "Tb3761UpChildlList": [ + { + "Id": 0, + "Name": "无功电量{0}", + "DataType": "A13", + "DataIndex": 0, + "DataCount": 4, + "Sort": 0 + } + ] + } + ] + }, + { + "Id": 0, + "Fn": 101, + "Text": "正向有功电量示值", + "UpList": [ + { + "Id": 1, + "Name": "起始时间", + "DataType": "A15", + "DataIndex": 0, + "DataCount": 5, + "Sort": 1 + }, + { + "Id": 2, + "Name": "数据冻结密度m", + "DataType": "BIN", + "DataIndex": 5, + "DataCount": 1, + "Sort": 2 + }, + { + "Id": 3, + "Name": "数据点数", + "DataType": "BIN", + "DataIndex": 6, + "DataCount": 1, + "Sort": 3, + "Tb3761UpChildlList": [ + { + "Id": 0, + "Name": "电能示值{0}", + "DataType": "A11", + "DataIndex": 0, + "DataCount": 4, + "Sort": 0 + } + ] + } + ] + }, + { + "Id": 0, + "Fn": 102, + "Text": "正向无功电量示值", + "UpList": [ + { + "Id": 1, + "Name": "起始时间", + "DataType": "A15", + "DataIndex": 0, + "DataCount": 5, + "Sort": 1 + }, + { + "Id": 2, + "Name": "数据冻结密度m", + "DataType": "BIN", + "DataIndex": 5, + "DataCount": 1, + "Sort": 2 + }, + { + "Id": 3, + "Name": "数据点数", + "DataType": "BIN", + "DataIndex": 6, + "DataCount": 1, + "Sort": 3, + "Tb3761UpChildlList": [ + { + "Id": 0, + "Name": "电能示值{0}", + "DataType": "A11", + "DataIndex": 0, + "DataCount": 4, + "Sort": 0 + } + ] + } + ] + }, + { + "Id": 0, + "Fn": 103, + "Text": "反向有功电量示值", + "UpList": [ + { + "Id": 1, + "Name": "起始时间", + "DataType": "A15", + "DataIndex": 0, + "DataCount": 5, + "Sort": 1 + }, + { + "Id": 2, + "Name": "数据冻结密度m", + "DataType": "BIN", + "DataIndex": 5, + "DataCount": 1, + "Sort": 2 + }, + { + "Id": 3, + "Name": "数据点数", + "DataType": "BIN", + "DataIndex": 6, + "DataCount": 1, + "Sort": 3, + "Tb3761UpChildlList": [ + { + "Id": 0, + "Name": "电能示值{0}", + "DataType": "A11", + "DataIndex": 0, + "DataCount": 4, + "Sort": 0 + } + ] + } + ] + }, + { + "Id": 0, + "Fn": 104, + "Text": "反向无功电量示值", + "UpList": [ + { + "Id": 1, + "Name": "起始时间", + "DataType": "A15", + "DataIndex": 0, + "DataCount": 5, + "Sort": 1 + }, + { + "Id": 2, + "Name": "数据冻结密度m", + "DataType": "BIN", + "DataIndex": 5, + "DataCount": 1, + "Sort": 2 + }, + { + "Id": 3, + "Name": "数据点数", + "DataType": "BIN", + "DataIndex": 6, + "DataCount": 1, + "Sort": 3, + "Tb3761UpChildlList": [ + { + "Id": 0, + "Name": "电能示值{0}", + "DataType": "A11", + "DataIndex": 0, + "DataCount": 4, + "Sort": 0 + } + ] + } + ] + }, + { + "Id": 0, + "Fn": 105, + "Text": "总功率因数", + "UpList": [ + { + "Id": 1, + "Name": "起始时间", + "DataType": "A15", + "DataIndex": 0, + "DataCount": 5, + "Sort": 1 + }, + { + "Id": 2, + "Name": "数据冻结密度m", + "DataType": "BIN", + "DataIndex": 5, + "DataCount": 1, + "Sort": 2 + }, + { + "Id": 3, + "Name": "数据点数", + "DataType": "BIN", + "DataIndex": 6, + "DataCount": 1, + "Sort": 3, + "Tb3761UpChildlList": [ + { + "Id": 0, + "Name": "功率因数{0}", + "DataType": "A05", + "DataIndex": 0, + "DataCount": 2, + "Sort": 0 + } + ] + } + ] + }, + { + "Id": 0, + "Fn": 106, + "Text": "A相功率因数", + "UpList": [ + { + "Id": 1, + "Name": "起始时间", + "DataType": "A15", + "DataIndex": 0, + "DataCount": 5, + "Sort": 1 + }, + { + "Id": 2, + "Name": "数据冻结密度m", + "DataType": "BIN", + "DataIndex": 5, + "DataCount": 1, + "Sort": 2 + }, + { + "Id": 3, + "Name": "数据点数", + "DataType": "BIN", + "DataIndex": 6, + "DataCount": 1, + "Sort": 3, + "Tb3761UpChildlList": [ + { + "Id": 0, + "Name": "功率因数{0}", + "DataType": "A05", + "DataIndex": 0, + "DataCount": 2, + "Sort": 0 + } + ] + } + ] + }, + { + "Id": 0, + "Fn": 107, + "Text": "B相功率因数", + "UpList": [ + { + "Id": 1, + "Name": "起始时间", + "DataType": "A15", + "DataIndex": 0, + "DataCount": 5, + "Sort": 1 + }, + { + "Id": 2, + "Name": "数据冻结密度m", + "DataType": "BIN", + "DataIndex": 5, + "DataCount": 1, + "Sort": 2 + }, + { + "Id": 3, + "Name": "数据点数", + "DataType": "BIN", + "DataIndex": 6, + "DataCount": 1, + "Sort": 3, + "Tb3761UpChildlList": [ + { + "Id": 0, + "Name": "功率因数{0}", + "DataType": "A05", + "DataIndex": 0, + "DataCount": 2, + "Sort": 0 + } + ] + } + ] + }, + { + "Id": 0, + "Fn": 108, + "Text": "C相功率因数", + "UpList": [ + { + "Id": 1, + "Name": "起始时间", + "DataType": "A15", + "DataIndex": 0, + "DataCount": 5, + "Sort": 1 + }, + { + "Id": 2, + "Name": "数据冻结密度m", + "DataType": "BIN", + "DataIndex": 5, + "DataCount": 1, + "Sort": 2 + }, + { + "Id": 3, + "Name": "数据点数", + "DataType": "BIN", + "DataIndex": 6, + "DataCount": 1, + "Sort": 3, + "Tb3761UpChildlList": [ + { + "Id": 0, + "Name": "功率因数{0}", + "DataType": "A05", + "DataIndex": 0, + "DataCount": 2, + "Sort": 0 + } + ] + } + ] + }, + { + "Id": 0, + "Fn": 145, + "Text": "一象限无功", + "UpList": [ + { + "Id": 1, + "Name": "起始时间", + "DataType": "A15", + "DataIndex": 0, + "DataCount": 5, + "Sort": 1 + }, + { + "Id": 2, + "Name": "数据冻结密度m", + "DataType": "BIN", + "DataIndex": 5, + "DataCount": 1, + "Sort": 2 + }, + { + "Id": 3, + "Name": "数据点数", + "DataType": "BIN", + "DataIndex": 6, + "DataCount": 1, + "Sort": 3, + "Tb3761UpChildlList": [ + { + "Id": 0, + "Name": "电能示值{0}", + "DataType": "A11", + "DataIndex": 0, + "DataCount": 4, + "Sort": 0 + } + ] + } + ] + }, + { + "Id": 0, + "Fn": 146, + "Text": "四象限无功", + "UpList": [ + { + "Id": 1, + "Name": "起始时间", + "DataType": "A15", + "DataIndex": 0, + "DataCount": 5, + "Sort": 1 + }, + { + "Id": 2, + "Name": "数据冻结密度m", + "DataType": "BIN", + "DataIndex": 5, + "DataCount": 1, + "Sort": 2 + }, + { + "Id": 3, + "Name": "数据点数", + "DataType": "BIN", + "DataIndex": 6, + "DataCount": 1, + "Sort": 3, + "Tb3761UpChildlList": [ + { + "Id": 0, + "Name": "电能示值{0}", + "DataType": "A11", + "DataIndex": 0, + "DataCount": 4, + "Sort": 0 + } + ] + } + ] + }, + { + "Id": 0, + "Fn": 147, + "Text": "二象限无功", + "UpList": [ + { + "Id": 1, + "Name": "起始时间", + "DataType": "A15", + "DataIndex": 0, + "DataCount": 5, + "Sort": 1 + }, + { + "Id": 2, + "Name": "数据冻结密度m", + "DataType": "BIN", + "DataIndex": 5, + "DataCount": 1, + "Sort": 2 + }, + { + "Id": 3, + "Name": "数据点数", + "DataType": "BIN", + "DataIndex": 6, + "DataCount": 1, + "Sort": 3, + "Tb3761UpChildlList": [ + { + "Id": 0, + "Name": "电能示值{0}", + "DataType": "A11", + "DataIndex": 0, + "DataCount": 4, + "Sort": 0 + } + ] + } + ] + }, + { + "Id": 0, + "Fn": 148, + "Text": "三象限无功", + "UpList": [ + { + "Id": 1, + "Name": "起始时间", + "DataType": "A15", + "DataIndex": 0, + "DataCount": 5, + "Sort": 1 + }, + { + "Id": 2, + "Name": "数据冻结密度m", + "DataType": "BIN", + "DataIndex": 5, + "DataCount": 1, + "Sort": 2 + }, + { + "Id": 3, + "Name": "数据点数", + "DataType": "BIN", + "DataIndex": 6, + "DataCount": 1, + "Sort": 3, + "Tb3761UpChildlList": [ + { + "Id": 0, + "Name": "电能示值{0}", + "DataType": "A11", + "DataIndex": 0, + "DataCount": 4, + "Sort": 0 + } + ] + } + ] } ] } diff --git a/src/JiShe.CollectBus.Common/Enums/376Enums.cs b/src/JiShe.CollectBus.Common/Enums/376Enums.cs index 4120a93..661c250 100644 --- a/src/JiShe.CollectBus.Common/Enums/376Enums.cs +++ b/src/JiShe.CollectBus.Common/Enums/376Enums.cs @@ -260,9 +260,9 @@ namespace JiShe.CollectBus.Common.Enums 二象限无功 =147, [Description("Td_c")] 三象限无功 =148, - [Description("Td_c")] + [Description("Td_d")] 日冻结电量示值 = 161, - [Description("Td_c")] + [Description("Td_d")] 日冻结反向电量示值 =163, [Description("Td_m")] 月冻结电量示值 =177, diff --git a/src/JiShe.CollectBus.Protocol.Contracts/Abstracts/BaseProtocolPlugin.cs b/src/JiShe.CollectBus.Protocol.Contracts/Abstracts/BaseProtocolPlugin.cs index c5d09a8..27f6b4b 100644 --- a/src/JiShe.CollectBus.Protocol.Contracts/Abstracts/BaseProtocolPlugin.cs +++ b/src/JiShe.CollectBus.Protocol.Contracts/Abstracts/BaseProtocolPlugin.cs @@ -619,6 +619,15 @@ namespace JiShe.CollectBus.Protocol.Contracts.Abstracts value = AnalyzeDataAccordingToA15(valueList[0], valueList[1], valueList[2], valueList[3], valueList[4]); } break; + case "ATd_d": + var day = valueList[0]; + var month = valueList[1]; + var year = valueList[2]; + break; + case "ATd_m": + var tdmMonth = valueList[0]; + var tdmYear = valueList[1]; + break; } return value;