admin/JiShe.CollectBus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'dev' of https://310.jisheyun.com/daizan/JiShe.CollectBus into dev

Browse Source
This commit is contained in:
zenghongyao 2025-04-23 14:00:10 +08:00
commit 9c24f53eb6
15 changed files with 1161 additions and 442 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/JiShe.CollectBus.IoTDB/Interface/IIoTDBSessionPool.cs
View File

@ -13,6 +13,12 @@ namespace JiShe.CollectBus.IoTDB.Interface
/// <returns></returns> /// <returns></returns>
Task OpenAsync(); Task OpenAsync();
/// <summary>
/// 关闭连接池
/// </summary>
/// <returns></returns>
Task CloseAsync();
/// <summary> /// <summary>
/// 插入数据 /// 插入数据
/// </summary> /// </summary>

16
modules/JiShe.CollectBus.IoTDB/Model/IoTEntity.cs
View File

@ -11,29 +11,29 @@ namespace JiShe.CollectBus.IoTDB.Model
/// 系统名称 /// 系统名称
/// </summary> /// </summary>
[TAGColumn] [TAGColumn]
public string SystemName { get; set; } public string SystemName { get; set; }
/// <summary> /// <summary>
/// 项目编码 /// 项目编码
/// </summary> /// </summary>
[ATTRIBUTEColumn] [TAGColumn]
public string ProjectId { get; set; } public string ProjectId { get; set; }
/// <summary> /// <summary>
/// 设备类型集中器、电表、水表、流量计、传感器等 /// 设备类型集中器、电表、水表、流量计、传感器等
/// </summary> /// </summary>
[ATTRIBUTEColumn] [TAGColumn]
public string DeviceType { get; set; } public string DeviceType { get; set; }
/// <summary> /// <summary>
/// 设备ID，也就是通信设备的唯一标识符，例如集中器地址，或者其他传感器设备地址 /// 设备ID,数据生成者，例如集中器ID,电表ID、水表ID、流量计ID、传感器ID等
/// </summary> /// </summary>
[TAGColumn] [TAGColumn]
public string DeviceId { get; set; } public string DeviceId { get; set; }
/// <summary> /// <summary>
/// 时标，也就是业务时间戳，单位毫秒,必须通过DateTimeOffset获取 /// 时标，也就是业务时间戳，单位毫秒,必须通过DateTimeOffset获取
/// </summary> /// </summary>
public long Timestamps { get; set; } = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds(); public long Timestamps { get; set; } = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds();
} }
} }

5
modules/JiShe.CollectBus.IoTDB/Options/IoTDBOptions.cs
View File

@ -47,5 +47,10 @@
/// 时区，默认为："UTC+08:00" /// 时区，默认为："UTC+08:00"
/// </summary> /// </summary>
public string ZoneId { get; set; } = "UTC+08:00"; public string ZoneId { get; set; } = "UTC+08:00";
/// <summary>
/// 请求超时时间，单位毫秒，默认为：50000
/// </summary>
public long Timeout { get; set; } = 50000;
} }
} }

4
modules/JiShe.CollectBus.IoTDB/Provider/DevicePathBuilder.cs
View File

@ -15,7 +15,7 @@ namespace JiShe.CollectBus.IoTDB.Provider
/// <returns></returns> /// <returns></returns>
public static string GetDevicePath<T>(T entity) where T : IoTEntity public static string GetDevicePath<T>(T entity) where T : IoTEntity
{ {
return $"root.{entity.SystemName.ToLower()}.`{entity.DeviceId}`"; return $"root.{entity.SystemName.ToLower()}.`{entity.ProjectId}`.`{entity.DeviceType}`.`{entity.DeviceId}`";
} }
@ -39,7 +39,7 @@ namespace JiShe.CollectBus.IoTDB.Provider
/// <returns></returns> /// <returns></returns>
public static string GetDeviceTableName<T>(T entity) where T : IoTEntity public static string GetDeviceTableName<T>(T entity) where T : IoTEntity
{ {
return $"{entity.SystemName.ToLower()}.`{entity.DeviceId}`"; return $"{entity.SystemName.ToLower()}.`{entity.ProjectId}`.`{entity.DeviceType}`.`{entity.DeviceId}`";
} }
} }

74
modules/JiShe.CollectBus.IoTDB/Provider/IoTDBProvider.cs
View File

@ -1,6 +1,8 @@
using System; using System;
using System.Collections.Concurrent; using System.Collections.Concurrent;
using System.ComponentModel.DataAnnotations;
using System.Reflection; using System.Reflection;
using System.Reflection.Metadata.Ecma335;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using Apache.IoTDB; using Apache.IoTDB;
@ -23,7 +25,7 @@ namespace JiShe.CollectBus.IoTDB.Provider
/// <summary> /// <summary>
/// IoTDB数据源 /// IoTDB数据源
/// </summary> /// </summary>
public class IoTDbProvider : IIoTDbProvider, IScopedDependency public class IoTDbProvider : IIoTDbProvider, ITransientDependency
{ {
private static readonly ConcurrentDictionary<Type, DeviceMetadata> MetadataCache = new(); private static readonly ConcurrentDictionary<Type, DeviceMetadata> MetadataCache = new();
private readonly ILogger<IoTDbProvider> _logger; private readonly ILogger<IoTDbProvider> _logger;
@ -195,7 +197,7 @@ namespace JiShe.CollectBus.IoTDB.Provider
{ {
try try
{ {
var query =await BuildQuerySQL<T>(options); var query = await BuildQuerySQL<T>(options);
var sessionDataSet = await CurrentSession.ExecuteQueryStatementAsync(query); var sessionDataSet = await CurrentSession.ExecuteQueryStatementAsync(query);
@ -205,15 +207,16 @@ namespace JiShe.CollectBus.IoTDB.Provider
Items = await ParseResults<T>(sessionDataSet, options.PageSize), Items = await ParseResults<T>(sessionDataSet, options.PageSize),
PageIndex = options.PageIndex, PageIndex = options.PageIndex,
PageSize = options.PageSize, PageSize = options.PageSize,
}; };
result.HasNext = result.TotalCount > 0? result.TotalCount < result.PageSize : false; result.HasNext = result.TotalCount > 0 ? result.TotalCount < result.PageSize : false;
return result; return result;
} }
catch (Exception ex) catch (Exception ex)
{ {
CurrentSession.Dispose();
_logger.LogError(ex, $"{nameof(QueryAsync)} IoTDB查询数据时发生异常"); _logger.LogError(ex, $"{nameof(QueryAsync)} IoTDB查询数据时发生异常");
throw; throw;
} }
@ -414,7 +417,7 @@ namespace JiShe.CollectBus.IoTDB.Provider
private async Task<string> BuildQuerySQL<T>(IoTDBQueryOptions options) where T : IoTEntity private async Task<string> BuildQuerySQL<T>(IoTDBQueryOptions options) where T : IoTEntity
{ {
var metadata = await GetMetadata<T>(); var metadata = await GetMetadata<T>();
var sb = new StringBuilder("SELECT "); var sb = new StringBuilder("SELECT TIME as Timestamps,");
sb.AppendJoin(", ", metadata.ColumnNames); sb.AppendJoin(", ", metadata.ColumnNames);
sb.Append($" FROM {options.TableNameOrTreePath}"); sb.Append($" FROM {options.TableNameOrTreePath}");
@ -471,7 +474,7 @@ namespace JiShe.CollectBus.IoTDB.Provider
{ {
return condition.Operator switch return condition.Operator switch
{ {
">" => condition.IsNumber ? $"{condition.Field} > {condition.Value}": $"{condition.Field} > '{condition.Value}'", ">" => condition.IsNumber ? $"{condition.Field} > {condition.Value}" : $"{condition.Field} > '{condition.Value}'",
"<" => condition.IsNumber ? $"{condition.Field} < {condition.Value}" : $"{condition.Field} < '{condition.Value}'", "<" => condition.IsNumber ? $"{condition.Field} < {condition.Value}" : $"{condition.Field} < '{condition.Value}'",
"=" => condition.IsNumber ? $"{condition.Field} = {condition.Value}" : $"{condition.Field} = '{condition.Value}'", "=" => condition.IsNumber ? $"{condition.Field} = {condition.Value}" : $"{condition.Field} = '{condition.Value}'",
_ => throw new NotSupportedException($"{nameof(TranslateCondition)} 将查询条件转换为SQL语句时操作符 {condition.Operator} 属于异常情况") _ => throw new NotSupportedException($"{nameof(TranslateCondition)} 将查询条件转换为SQL语句时操作符 {condition.Operator} 属于异常情况")
@ -493,7 +496,16 @@ namespace JiShe.CollectBus.IoTDB.Provider
} }
var result = await CurrentSession.ExecuteQueryStatementAsync(countQuery); var result = await CurrentSession.ExecuteQueryStatementAsync(countQuery);
return result.HasNext() ? Convert.ToInt32(result.Next().Values[0]) : 0; if (result.HasNext())
{
await result.Close();
return 0;
}
var count = Convert.ToInt32(result.Next().Values[0]);
await result.Close();
return count;
} }
/// <summary> /// <summary>
@ -510,6 +522,13 @@ namespace JiShe.CollectBus.IoTDB.Provider
var properties = typeof(T).GetProperties(); var properties = typeof(T).GetProperties();
var columns = new List<string>() { "Timestamps" };
var dataTypes = new List<TSDataType>() { TSDataType.TIMESTAMP };
columns.AddRange(metadata.ColumnNames);
dataTypes.AddRange(metadata.DataTypes);
//metadata.ColumnNames.Insert(0, "Timestamps");
//metadata.DataTypes.Insert(0, TSDataType.TIMESTAMP);
while (dataSet.HasNext() && results.Count < pageSize) while (dataSet.HasNext() && results.Count < pageSize)
{ {
var record = dataSet.Next(); var record = dataSet.Next();
@ -518,30 +537,34 @@ namespace JiShe.CollectBus.IoTDB.Provider
Timestamps = record.Timestamps Timestamps = record.Timestamps
}; };
foreach (var measurement in metadata.ColumnNames) foreach (var measurement in columns)
{ {
int indexOf = metadata.ColumnNames.IndexOf(measurement); int indexOf = columns.IndexOf(measurement);
var value = record.Values[indexOf]; var value = record.Values[indexOf];
TSDataType tSDataType = dataTypes[indexOf];
var prop = properties.FirstOrDefault(p => var prop = properties.FirstOrDefault(p =>
p.Name.Equals(measurement, StringComparison.OrdinalIgnoreCase)); p.Name.Equals(measurement, StringComparison.OrdinalIgnoreCase));
if (prop != null) if (prop != null && !(value is System.DBNull))
{ {
if (measurement.EndsWith("time")) dynamic tempValue = GetTSDataValue(tSDataType, value);
if (measurement.ToLower().EndsWith("time"))
{ {
var tempValue = TimestampHelper.ConvertToDateTime(Convert.ToInt64(value), TimestampUnit.Nanoseconds); typeof(T).GetProperty(measurement)?.SetValue(entity, TimestampHelper.ConvertToDateTime(tempValue, TimestampUnit.Nanoseconds));
typeof(T).GetProperty(measurement)?.SetValue(entity, value);
} }
else else
{ {
typeof(T).GetProperty(measurement)?.SetValue(entity, value); typeof(T).GetProperty(measurement)?.SetValue(entity, tempValue);
} }
} }
} }
results.Add(entity); results.Add(entity);
} }
await dataSet.Close();
return results; return results;
} }
@ -759,5 +782,28 @@ namespace JiShe.CollectBus.IoTDB.Provider
["DECIMAL"] = "0.0", ["DECIMAL"] = "0.0",
["STRING"] = string.Empty ["STRING"] = string.Empty
}; };
/// <summary>
/// IoTDB 数据类型与.net类型映射
/// </summary>
/// <param name="tSDataType"></param>
/// <param name="value"></param>
/// <returns></returns>
private dynamic GetTSDataValue(TSDataType tSDataType, object value) =>
tSDataType switch
{
TSDataType.BOOLEAN => Convert.ToBoolean(value),
TSDataType.INT32 => Convert.ToInt32(value),
TSDataType.INT64 => Convert.ToInt64(value),
TSDataType.FLOAT => Convert.ToDouble(value),
TSDataType.DOUBLE => Convert.ToDouble(value),
TSDataType.TEXT => Convert.ToString(value),
TSDataType.NONE => null,
TSDataType.TIMESTAMP => Convert.ToInt64(value),
TSDataType.DATE => Convert.ToDateTime(value),
TSDataType.BLOB => Convert.ToByte(value),
TSDataType.STRING => Convert.ToString(value),
_ => Convert.ToString(value)
};
} }
} }

20
modules/JiShe.CollectBus.IoTDB/Provider/SessionPoolAdapter.cs
View File

@ -47,6 +47,19 @@ namespace JiShe.CollectBus.IoTDB.Provider
} }
} }
/// <summary>
/// 关闭连接池
/// </summary>
/// <returns></returns>
public async Task CloseAsync()
{
if (_sessionPool == null)
{
return;
}
await _sessionPool.Close();
}
/// <summary> /// <summary>
/// 批量插入对齐时间序列数据 /// 批量插入对齐时间序列数据
/// </summary> /// </summary>
@ -59,7 +72,7 @@ namespace JiShe.CollectBus.IoTDB.Provider
{ {
throw new Exception($"{nameof(SessionPoolAdapter)} Tree模型数据入库没有成功，返回结果为：{result}"); throw new Exception($"{nameof(SessionPoolAdapter)} Tree模型数据入库没有成功，返回结果为：{result}");
} }
//await CloseAsync();
return result; return result;
} }
@ -70,7 +83,10 @@ namespace JiShe.CollectBus.IoTDB.Provider
/// <returns></returns> /// <returns></returns>
public async Task<SessionDataSet> ExecuteQueryStatementAsync(string sql) public async Task<SessionDataSet> ExecuteQueryStatementAsync(string sql)
{ {
return await _sessionPool.ExecuteQueryStatementAsync(sql); var result = await _sessionPool.ExecuteQueryStatementAsync(sql, _options.Timeout);
//await result.Close();
//await CloseAsync();
return result;
} }
public void Dispose() public void Dispose()

19
modules/JiShe.CollectBus.IoTDB/Provider/TableSessionPoolAdapter.cs
View File

@ -45,6 +45,19 @@ namespace JiShe.CollectBus.IoTDB.Provider
} }
} }
/// <summary>
/// 关闭连接池
/// </summary>
/// <returns></returns>
public async Task CloseAsync()
{
if (_sessionPool == null)
{
return;
}
await _sessionPool.Close();
}
/// <summary> /// <summary>
/// 批量插入 /// 批量插入
/// </summary> /// </summary>
@ -58,6 +71,7 @@ namespace JiShe.CollectBus.IoTDB.Provider
throw new Exception($"{nameof(TableSessionPoolAdapter)} table模型数据入库没有成功，返回结果为：{result}"); throw new Exception($"{nameof(TableSessionPoolAdapter)} table模型数据入库没有成功，返回结果为：{result}");
} }
//await CloseAsync();
return result; return result;
} }
@ -68,7 +82,10 @@ namespace JiShe.CollectBus.IoTDB.Provider
/// <returns></returns> /// <returns></returns>
public async Task<SessionDataSet> ExecuteQueryStatementAsync(string sql) public async Task<SessionDataSet> ExecuteQueryStatementAsync(string sql)
{ {
return await _sessionPool.ExecuteQueryStatementAsync(sql); var result = await _sessionPool.ExecuteQueryStatementAsync(sql,_options.Timeout);
//await result.Close();
//await CloseAsync();
return result;
} }
public void Dispose() public void Dispose()

754
services/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs
View File

File diff suppressed because it is too large Load Diff

36
services/JiShe.CollectBus.Application/ScheduledMeterReading/EnergySystemScheduledMeterReadingService.cs
View File

@ -101,6 +101,7 @@ namespace JiShe.CollectBus.ScheduledMeterReading
// TypeName = 3, // TypeName = 3,
// DataTypes = "449,503,581,582,583,584,585,586,587,588,589,590,591,592,593,594,597,598,599,600,601,602,603,604,605,606,607,608,661,663,677,679", // DataTypes = "449,503,581,582,583,584,585,586,587,588,589,590,591,592,593,594,597,598,599,600,601,602,603,604,605,606,607,608,661,663,677,679",
// TimeDensity = 15, // TimeDensity = 15,
// BrandType = "",
//}); //});
//ammeterInfos.Add(new AmmeterInfo() //ammeterInfos.Add(new AmmeterInfo()
//{ //{
@ -115,6 +116,7 @@ namespace JiShe.CollectBus.ScheduledMeterReading
// TypeName = 1, // TypeName = 1,
// DataTypes = "581,589,592,597,601", // DataTypes = "581,589,592,597,601",
// TimeDensity = 15, // TimeDensity = 15,
// BrandType = "",
//}); //});
//return ammeterInfos; //return ammeterInfos;
@ -127,10 +129,10 @@ namespace JiShe.CollectBus.ScheduledMeterReading
WHERE 1=1 and C.Special = 0 "; WHERE 1=1 and C.Special = 0 ";
//TODO 记得移除特殊表过滤 //TODO 记得移除特殊表过滤
//if (!string.IsNullOrWhiteSpace(gatherCode)) if (!string.IsNullOrWhiteSpace(gatherCode))
//{ {
// sql = $@"{sql} AND A.GatherCode = '{gatherCode}'"; sql = $@"{sql} AND A.GatherCode = '{gatherCode}'";
//} }
return await SqlProvider.Instance.Change(DbEnum.EnergyDB) return await SqlProvider.Instance.Change(DbEnum.EnergyDB)
.Ado .Ado
.QueryAsync<AmmeterInfo>(sql); .QueryAsync<AmmeterInfo>(sql);
@ -186,30 +188,6 @@ namespace JiShe.CollectBus.ScheduledMeterReading
return await SqlProvider.Instance.Change(DbEnum.EnergyDB) return await SqlProvider.Instance.Change(DbEnum.EnergyDB)
.Ado .Ado
.QueryAsync<WatermeterInfo>(sql); .QueryAsync<WatermeterInfo>(sql);
} }
/// <summary>
/// 测试设备分组均衡控制算法
/// </summary>
/// <param name="deviceCount"></param>
/// <returns></returns>
[HttpGet]
public async Task TestDeviceGroupBalanceControl(int deviceCount = 200000)
{
var deviceList = new List<string>();
for (int i = 0; i < deviceCount; i++)
{
deviceList.Add($"Device_{Guid.NewGuid()}");
}
// 初始化缓存
DeviceGroupBalanceControl.InitializeCache(deviceList);
// 打印分布统计
DeviceGroupBalanceControl.PrintDistributionStats();
await Task.CompletedTask;
}
} }
} }

8
services/JiShe.CollectBus.Domain/IotSystems/MeterReadingRecords/MeterReadingTelemetryPacketInfo.cs
View File

@ -24,13 +24,7 @@ namespace JiShe.CollectBus.IotSystems.MeterReadingRecords
/// 排序索引分数值，具体值可以根据不同业务场景进行定义，例如时间戳、或者某一个固定的标识1 /// 排序索引分数值，具体值可以根据不同业务场景进行定义，例如时间戳、或者某一个固定的标识1
/// </summary> /// </summary>
[FIELDColumn] [FIELDColumn]
public string ScoreValue public string ScoreValue { get; set; }
{
get
{
return $"{DeviceId}.{TaskMark}".Md5Fun();
}
}
/// <summary> /// <summary>
/// 是否手动操作 /// 是否手动操作

10
services/JiShe.CollectBus.Domain/IotSystems/Watermeter/WatermeterInfo.cs
View File

@ -18,7 +18,7 @@ namespace JiShe.CollectBus.IotSystems.Watermeter
/// 关系映射标识，用于ZSet的Member字段和Set的Value字段，具体值可以根据不同业务场景进行定义 /// 关系映射标识，用于ZSet的Member字段和Set的Value字段，具体值可以根据不同业务场景进行定义
/// </summary> /// </summary>
[Column(IsIgnore = true)] [Column(IsIgnore = true)]
public override string MemberId => $"{FocusId}:{MeterId}"; public override string MemberId => $"{FocusAddress}:{MeteringCode}";
/// <summary> /// <summary>
/// ZSet排序索引分数值，具体值可以根据不同业务场景进行定义，例如时间戳 /// ZSet排序索引分数值，具体值可以根据不同业务场景进行定义，例如时间戳
@ -90,6 +90,7 @@ namespace JiShe.CollectBus.IotSystems.Watermeter
//// 电表= 1,水表= 2,燃气表= 3,热能表= 4,水表流量计=5，燃气表流量计=6,特殊电表=7 //// 电表= 1,水表= 2,燃气表= 3,热能表= 4,水表流量计=5，燃气表流量计=6,特殊电表=7
/// </summary> /// </summary>
public MeterTypeEnum MeterType { get; set; } public MeterTypeEnum MeterType { get; set; }
/// <summary> /// <summary>
/// 设备品牌； /// 设备品牌；
/// (当 MeterType = 水表， 如 威铭、捷先 等) /// (当 MeterType = 水表， 如 威铭、捷先 等)
@ -138,12 +139,17 @@ namespace JiShe.CollectBus.IotSystems.Watermeter
/// 采集器编号 /// 采集器编号
/// </summary> /// </summary>
public string GatherCode { get; set; } public string GatherCode { get; set; }
/// <summary> /// <summary>
/// 项目ID /// 项目ID
/// </summary> /// </summary>
public int ProjectID { get; set; } public int ProjectID { get; set; }
/// <summary>
/// 数据库业务ID
/// </summary>
public int DatabaseBusiID { get; set; }
/// <summary> /// <summary>
/// 是否异常集中器 0:正常，1异常 /// 是否异常集中器 0:正常，1异常
/// </summary> /// </summary>

593
shared/JiShe.CollectBus.Common/Enums/BrandTypeEnum.cs Normal file
View File

@ -0,0 +1,593 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace JiShe.CollectBus.Common.Enums
{
/// <summary>
/// 水表\流量计\特殊电表品牌
/// </summary>
public enum BrandTypeEnum
{
/// <summary>
/// 默认（OC_129）
/// </summary>
//None = 0,
/// <summary>
/// 冻结数据（0D_101）
/// </summary>
//Freeze = 1,
/// <summary>
/// 默认（OC_129）or 冻结数据（0D_101）
/// </summary>
NoneOrFreeze = 0,
/// <summary>
/// 188-良禾
/// </summary>
LiangHe188 = 1,
/// <summary>
/// 188-威铭
/// </summary>
WeiMing188 = 2,
/// <summary>
/// 188-宁波
/// </summary>
NingBo188 = 3,
/// <summary>
/// 西恩电磁流量计
/// </summary>
XEDC = 4,
/// <summary>
/// 西恩超声波流量计
/// </summary>
XECSB = 5,
/// <summary>
/// 电磁流量计(LDG-DN200)
/// </summary>
DCLDGDN200 = 6,
/// <summary>
/// 燃气表抄读
/// </summary>
Gasmeter = 7,
/// <summary>
/// 涡街流量计
/// </summary>
WJFlowmeter = 8,
/// <summary>
/// 流量计
/// </summary>
Flowmeter = 9,
/// <summary>
/// 涡街流量计(LUGBDN100)
/// </summary>
WJFlowmeterLUGBDN100 = 10,
/// <summary>
/// 涡街流量计(ZC-LUGB-232ZDNNY)
/// </summary>
WJFlowmeterZCLUGB232ZDNNY = 11,
/// <summary>
/// SB2100蒸汽表
/// </summary>
ZQBSB2100Flowmeter = 12,
/// <summary>
/// (HD)热式流量计
/// </summary>
RSHDFlowmeter = 13,
/// <summary>
/// (HDWMNDN300)热式流量计
/// </summary>
RSHDWMNDN300 = 14,
/// <summary>
/// 热式流量计(FLRS110-C100)
/// </summary>
RSFLRS110C100 = 15,
/// <summary>
/// 通用188协议
/// </summary>
Universal188 = 16,
#region 特殊电表
DTZ719 = 17,
AKKJMC800PY = 18,
HRKJ001 = 19,
THYB9D1 = 20,
DTSD342 = 21,
/// <summary>
/// 谐波
/// </summary>
AFN16_F109 = 22,
/// <summary>
/// DL/T 645—2007 规约时采用该类
/// </summary>
CustomItemCode_93 = 23,
/// <summary>
/// 电表组合有功示值透抄CustomItemCode_95
/// </summary>
AFN16_F95 = 24,
#endregion
/// <summary>
/// 非特殊表
/// </summary>
None = 25,
/// <summary>
/// SDM630MCT 导轨电表
/// </summary>
SDM630MCT = 26,
/// <summary>
/// 水表通过0C_129采集
/// </summary>
Watermeter0C_129 = 27,
/// <summary>
/// YYD电磁流量计
/// </summary>
YYDFlowmeter = 28,
/// <summary>
/// 透明转发 跳合闸(水表)
/// </summary>
AFN16_F99 = 29,
/// <summary>
/// 透明转发 跳合闸(气表)
/// </summary>
AFN16_F100 = 30,
/// <summary>
/// 温度压力补偿涡街流量计(TPC1001)涡街流量计
/// </summary>
WJTPC1001 = 31,
/// <summary>
/// (LDG-SP25)树普电磁流量计
/// </summary>
ShupuLDGSP25Flowmeter = 32,
/// <summary>
/// 西恩涡街流量计(LUGBC-100)
/// </summary>
XEWJLUGBC100 = 33,
/// <summary>
/// 智能涡街流量计(UG-1132A)
/// </summary>
WJUG1132A = 34,
/// <summary>
/// 水表通过0D_101采集
/// </summary>
Watermeter0D_101 = 35,
/// <summary>
/// 读取SIM卡号
/// </summary>
AFN16_F101 = 36,
/// <summary>
/// 恒瑞科技三相导轨式电能表 or 恒瑞科技嵌入式电表测试
/// </summary>
DTS600 = 37,
/// <summary>
/// 恒瑞科技单相导轨式电能表（DDS600）
/// </summary>
DDS600 = 38,
/// <summary>
/// 旋进漩涡流量计(LUXB) 天津凯隆仪表科技有限公司
/// </summary>
XJXWLUXB = 39,
/// <summary>
/// DDSD720-L科陆单相导轨表
/// </summary>
DDSD720L = 40,
/// <summary>
/// 东久电磁流量计DJLD
/// </summary>
DJLD = 41,
/// <summary>
/// DTSD720-L科陆三相导轨表
/// </summary>
DTSD720L = 42,
/// <summary>
/// 世成（社为表计）涡街流量计
/// </summary>
SCLUGB = 43,
/// <summary>
/// CL7339MN-ZY科陆三相表
/// </summary>
CL7339MNZY = 44,
/// <summary>
/// 江森智能SNY723MC数显表
/// </summary>
SNY723MC = 45,
/// <summary>
/// 珠海派诺科技PMAC770三相数显表
/// </summary>
PMAC770 = 46,
/// <summary>
/// 北京中科涡街流量计（ZKTD-LUCBY）
/// </summary>
ZKTD_LUGBY = 47,
/// <summary>
/// 夏仪股份蒸汽流量计(LUGB-DN）
/// </summary>
LUGB_DN = 48,
/// <summary>
/// LWQ-D2型气体涡轮流量计
/// </summary>
LWQ_D2 = 49,
/// <summary>
/// 西恩涡街流量计分体式（流量积算仪32FC系列）
/// </summary>
XEJSY32FC = 50,
/// <summary>
/// 寺崎科技PD652E-9S4电表
/// </summary>
PD652E9S4 = 51,
/// <summary>
/// 液体涡轮流量计(LWGY)
/// </summary>
LWGY = 52,
/// <summary>
/// 多功能积算仪(RW-A)
/// </summary>
DGNRWA = 53,
/// <summary>
/// 杭梅电气DTS804导轨表
/// </summary>
DTS804 = 54,
/// <summary>
/// 杭梅电气HG194-D93数显表
/// </summary>
HG194D93 = 55,
/// <summary>
/// 连水超声波水表188
/// </summary>
Lianshui188 = 56,
/// <summary>
/// 湖北回盛生物科技有限公司EZT96Y数显表
/// </summary>
EZT96Y,
/// <summary>
/// 上海肖月智能流量积算仪
/// </summary>
ZNLLJ,
/// <summary>
/// 西安诚通电磁流量计
/// </summary>
CTLDE250SC31GM8FB,
/// <summary>
/// 雅达YD2040
/// </summary>
YD2040,
/// <summary>
/// EVC智能体积修正仪
/// </summary>
EVC,
/// <summary>
/// 气体超声流量计IGSM-TS
/// </summary>
IGSMTS,
/// <summary>
/// YX-9SYE三相多功能表
/// </summary>
YX9SYE,
/// <summary>
/// 世成液体涡轮流量计(SCLWGY-DN50)
/// </summary>
SCLWGYDN50,
/// <summary>
/// 杭州盘古积算仪(FX6000F)
/// </summary>
FX6000F,
/// <summary>
/// "盘古电磁流量计(PMF-GM4.0A1-50M11K1F1T0C3)
/// </summary>
PFMGM40A150M11K1F1T0C3,
/// <summary>
/// 西恩液体涡轮流量计(SEAN LWGY-50)
/// </summary>
SeanLWGY50,
/// <summary>
/// 雷泰电磁流量计LD-LDE-DN50
/// </summary>
LDLDEDN50,
/// <summary>
/// 雷泰涡街流量计(LT-LUGB-DN50)
/// </summary>
LTLUGBDN50,
/// <summary>
/// 珠海派诺科技股份有限公司SPM33电力仪表
/// </summary>
SPM33,
/// <summary>
/// 株洲斯瑞克电气有限公司三相数显多功能电力仪表PD369E-AS4
/// </summary>
PD369EAS4,
/// <summary>
/// 湖北回盛生物科技有限公司-涡街流量计(10VTEAD03A200C1A2HOAG)
/// </summary>
WJ10VTEAD03A200C1A2HOAG,
/// <summary>
/// 世成旋进旋涡流量计SCLUX-DN25
/// </summary>
SCLUXDN25,
/// <summary>
/// 世成气体涡轮流量计(SCLWGQ-DN50)
/// </summary>
SCLWGQDN50,
/// <summary>
/// 智能电磁流量计(MDL210)
/// </summary>
MDL210,
/// <summary>
/// 江苏华海涡街流量计Focvor4202
/// </summary>
Focvor4202,
/// <summary>
/// 华凯电力HK194E-9S4
/// </summary>
HK194E9S4,
/// <summary>
/// 威胜测试-DTSD342_9N
/// </summary>
DTSD342Test,
/// <summary>
///科迈捷涡街流量计VFM-60
/// </summary>
VFM60,
/// <summary>
///江苏华海涡街流量计积算仪
/// </summary>
HHJSY,
/// <summary>
///宏江4G水表
/// </summary>
HJDN15,
/// <summary>
///世成4G涡街流量计
/// </summary>
LPV2,
/// <summary>
///浙江正泰DTSU666
/// </summary>
DTSU666,
/// <summary>
/// 浙江启唯电气-数码三相多功能电表QV194E-9S4
/// </summary>
QV194E9S4,
/// <summary>
/// 施耐德PM2100
/// </summary>
PM2100,
/// <summary>
/// 天康电磁流量计
/// </summary>
TK1100FT,
/// <summary>
/// 西恩气体涡轮流量计(SEANLWQ)
/// </summary>
SEANLWQ,
/// <summary>
/// V880BR涡街流量计
/// </summary>
V880BR,
/// <summary>
/// 大导SDD194E-9
/// </summary>
SDD194E_9,
/// <summary>
///泉高阀门科技有限公司-超声波水表
/// </summary>
QGFMCSB,
#region 传感器型号
SensorMeter,
#endregion
/// <summary>
/// 分体式超声波明渠流量计SC-6000F
/// </summary>
SC6000F,
/// <summary>
/// 江苏京仪JLWQ型气体流量计JLWQ型气体流量计
/// </summary>
JLWQ,
/// <summary>
/// 广州智光SMC200
/// </summary>
SMC200,
/// <summary>
/// 左拓ZFM2-621
/// </summary>
ZFM2621,
/// <summary>
/// 江苏华尔威涡街旋进流量计
/// </summary>
HRW520,
/// <summary>
/// 施耐德PM5350P
/// </summary>
PM5350P,
/// <summary>
/// 施耐德PM810MG
/// </summary>
PM810MG,
/// <summary>
/// 浙江之高ZL96-3E
/// </summary>
ZL96_3E,
/// <summary>
/// 拓普电子PD284Z-9S4
/// </summary>
PD284Z_9S4,
/// <summary>
/// 上海普川DTSU5886
/// </summary>
DTSU5886,
/// <summary>
/// 安德利SC194E-9S4
/// </summary>
SC194E9S4,
/// <summary>
/// 浙江天电电气TD700E-AS3
/// </summary>
TD700EAS3,
/// <summary>
/// 世成分体式涡街流量计SW-SCLUGB-DN
/// </summary>
SWSCLUGBDN,
/// <summary>
/// 东久电磁冷热量计SW-DJLD
/// </summary>
SWDJLD,
/// <summary>
/// 北京中科拓达ZKTD-LUGB
/// </summary>
ZKTD_LUGB,
/// <summary>
/// 江苏英美迪自动化有限公司三相液晶多功能仪表YMD96A-E4
/// </summary>
YMD96A_E4,
/// <summary>
/// 金湖盛元LWQ气体涡轮流量计
/// </summary>
JHSYLWQ,
/// <summary>
/// 天康涡街流量计TK2000
/// </summary>
TK2000,
/// <summary>
/// 浙江迈拓三相导轨电表DTSF1709
/// </summary>
DTSF1709,
/// <summary>
/// 杭州逸控科技超声波流量计ECUL30B-L2C1NSVC
/// </summary>
ECUL30BL2C1NSVC,
/// <summary>
/// 数字电测表HTD288-DM44/R
/// </summary>
HTD288,
/// <summary>
/// 杭州逸控科技有限公司ECLUGB2305W3C2N
/// </summary>
ECLUGB2305W3C2N,
/// <summary>
/// 江苏华海测控科技有限公司温压补偿流量积算仪
/// </summary>
XMJA9000,
/// <summary>
/// 湖南佳一机电设备有限公司精致型蒸汽热能积算仪
/// </summary>
F3200H,
/// <summary>
/// 合兴加能电梯能量回馈装置
/// </summary>
IPCPFE04MNDC,
/// <summary>
/// 宁波创盛旋涡流量计
/// </summary>
CX25,
/// <summary>
/// 群力电气QDCZY1N
/// </summary>
QDCZY1N,
/// <summary>
///深圳中电PMCS963C
/// </summary>
PMCS963C,
/// <summary>
/// 迅尔燃气表D2SD2ET3D4S
/// </summary>
D2SD2ET3D4S,
/// <summary>
/// INTELLIGENT积算仪F2000X
/// </summary>
F2000X,
/// <summary>
///多盟-DM194Z-9SY
/// </summary>
DM194Z9SY,
/// <summary>
/// 纳宇PD760
/// </summary>
PD760,
/// <summary>
/// 纳宇DTS90031LPD
/// </summary>
DTS90031LPD,
/// <summary>
/// 上海施易克SEIK680数显表
/// </summary>
SEIK680,
/// <summary>
/// 中灵电气ZL125SC
/// </summary>
ZL125SC,
/// <summary>
/// 江苏京仪气体涡轮流量计JLWQE
/// </summary>
JLWQE,
/// <summary>
/// HART智能转换器
/// </summary>
SM100,
/// <summary>
/// 拓思特涡街流量计H880BR
/// </summary>
H880BR,
/// <summary>
/// DDSD720-L-单相电子式导轨表
/// </summary>
DDSD720L2,
/// <summary>
/// 浙江智电三相三线大功率有功电能表
/// </summary>
ZJZDSXSX,
/// <summary>
/// 山水翔水表LXSY
/// </summary>
LXSY,
/// <summary>
/// 衡水多元仪表有限公司气体涡轮流量计DYWQ
/// </summary>
DYWQ,
/// <summary>
/// 安徽聚积电子
/// </summary>
DDS2052,
/// <summary>
/// 湖南中麦
/// </summary>
ZMDTSD3429N,
/// <summary>
///DTS2377三相导轨式多功能智能电表
/// </summary>
DTS2377
}
}

54
shared/JiShe.CollectBus.Common/Enums/MeterLinkProtocol.cs Normal file
View File

@ -0,0 +1,54 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace JiShe.CollectBus.Common.Enums
{
/// <summary>
/// 表计连接通讯协议--表计与集中器的通讯协议
/// </summary>
public enum MeterLinkProtocol
{
/// <summary>
/// 无
/// </summary>
None = 0,
/// <summary>
/// DL/T 645—1997
/// </summary>
DLT_645_1997 = 1,
/// <summary>
/// 交流采样装置通信协议(电表)
/// </summary>
ACSamplingDevice = 2,
/// <summary>
/// DL/T 645—2007
/// </summary>
DLT_645_2007 = 30,
/// <summary>
/// 载波通信
/// </summary>
Carrierwave = 31,
/// <summary>
/// CJ/T 188—2018协议(水表)
/// </summary>
CJT_188_2018 = 32,
/// <summary>
/// CJ/T 188—2004协议
/// </summary>
CJT_188_2004 = 33,
/// <summary>
/// MODBUS-RTU
/// </summary>
MODBUS_RTU = 34,
}
}

2
web/JiShe.CollectBus.Host/Pages/Monitor.cshtml
View File

@ -18,7 +18,7 @@
<title>后端服务</title> <title>后端服务</title>
</head> </head>
<body> <body>
<div class="container projects"> <div class="container projects">
<div class="projects-header page-header"> <div class="projects-header page-header">

2
web/JiShe.CollectBus.Host/appsettings.json
View File

@ -93,7 +93,7 @@
"ClusterList": [ "192.168.1.9:6667" ], "ClusterList": [ "192.168.1.9:6667" ],
"PoolSize": 2, "PoolSize": 2,
"DataBaseName": "energy", "DataBaseName": "energy",
"OpenDebugMode": false, "OpenDebugMode": true,
"UseTableSessionPoolByDefault": false "UseTableSessionPoolByDefault": false
}, },
"Cassandra": { "Cassandra": {