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

修复IoTDB驱动decimal类型解析赋值异常的问题

Browse Source
This commit is contained in:
ChenYi 2025-05-15 23:59:10 +08:00
parent 52207a92fa
commit 6d95430b63
11 changed files with 190 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/JiShe.CollectBus.IoTDB/Context/IoTDBRuntimeContext.cs
View File

@ -7,7 +7,7 @@ namespace JiShe.CollectBus.IoTDB.Context
/// <summary> /// <summary>
/// IoTDB SessionPool 运行时上下文 /// IoTDB SessionPool 运行时上下文
/// </summary> /// </summary>
public class IoTDBRuntimeContext: IScopedDependency public class IoTDBRuntimeContext: IScopedDependency//ITransientDependency
{ {
private readonly bool _defaultValue; private readonly bool _defaultValue;

2
modules/JiShe.CollectBus.IoTDB/Interface/IIoTDBProvider.cs
View File

@ -16,6 +16,8 @@ namespace JiShe.CollectBus.IoTDB.Interface
///// <param name="useTableSession">是否使用表模型</param> ///// <param name="useTableSession">是否使用表模型</param>
//void SwitchSessionPool(bool useTableSession); //void SwitchSessionPool(bool useTableSession);
IIoTDbProvider GetSessionPool(bool sessionpolType);
/// <summary> /// <summary>
/// 插入数据 /// 插入数据
/// </summary> /// </summary>

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

@ -42,6 +42,16 @@ namespace JiShe.CollectBus.IoTDB.Provider
private IIoTDbSessionPool CurrentSession => private IIoTDbSessionPool CurrentSession =>
_sessionFactory.GetSessionPool(_runtimeContext.UseTableSessionPool); _sessionFactory.GetSessionPool(_runtimeContext.UseTableSessionPool);
//private IIoTDbSessionPool CurrentSession { get; set; }
public IIoTDbProvider GetSessionPool(bool sessionpolType)
{
//CurrentSession = _sessionFactory.GetSessionPool(sessionpolType);
return this;
}
/// <summary> /// <summary>
/// IoTDbProvider /// IoTDbProvider
/// </summary> /// </summary>
@ -96,6 +106,11 @@ namespace JiShe.CollectBus.IoTDB.Provider
{ {
try try
{ {
if (entities == null || entities.Count() <= 0)
{
_logger.LogError($"{nameof(BatchInsertAsync)} 参数异常，-101");
return;
}
var metadata = await GetMetadata<T>(); var metadata = await GetMetadata<T>();
var batchSize = 1000; var batchSize = 1000;
@ -320,10 +335,7 @@ namespace JiShe.CollectBus.IoTDB.Provider
{ {
return null; return null;
} }
//var accessor = SourceEntityAccessorFactory.GetAccessor<T>();
//var memberCache = BuildMemberCache(accessor);
if (metadata.EntityType == null) if (metadata.EntityType == null)
{ {
@ -795,7 +807,8 @@ namespace JiShe.CollectBus.IoTDB.Provider
{ {
return declaredTypeName switch return declaredTypeName switch
{ {
"DATETIME" => value => value != null ? ((DateTime)value).GetDateTimeOffset().ToUnixTimeNanoseconds() : null, "DATETIME" => value => value != null ? Convert.ToDateTime(value).GetDateTimeOffset().ToUnixTimeNanoseconds() : null,
"DECIMAL" => value => value != null ? Convert.ToDouble( value) : null,
_ => value => value _ => value => value
}; };
} }
@ -897,7 +910,7 @@ namespace JiShe.CollectBus.IoTDB.Provider
["DATETIME"] = TSDataType.TIMESTAMP, ["DATETIME"] = TSDataType.TIMESTAMP,
["DATE"] = TSDataType.DATE, ["DATE"] = TSDataType.DATE,
["BLOB"] = TSDataType.BLOB, ["BLOB"] = TSDataType.BLOB,
["DECIMAL"] = TSDataType.STRING, ["DECIMAL"] = TSDataType.DOUBLE,
["STRING"] = TSDataType.STRING ["STRING"] = TSDataType.STRING
}; };
@ -933,7 +946,7 @@ namespace JiShe.CollectBus.IoTDB.Provider
TSDataType.BOOLEAN => Convert.ToBoolean(value), TSDataType.BOOLEAN => Convert.ToBoolean(value),
TSDataType.INT32 => Convert.ToInt32(value), TSDataType.INT32 => Convert.ToInt32(value),
TSDataType.INT64 => Convert.ToInt64(value), TSDataType.INT64 => Convert.ToInt64(value),
TSDataType.FLOAT => Convert.ToDouble(value), TSDataType.FLOAT => Convert.ToSingle(value),
TSDataType.DOUBLE => Convert.ToDouble(value), TSDataType.DOUBLE => Convert.ToDouble(value),
TSDataType.TEXT => Convert.ToString(value), TSDataType.TEXT => Convert.ToString(value),
TSDataType.NONE => null, TSDataType.NONE => null,

25
protocols/JiShe.CollectBus.Protocol.T6452007/SendData/Telemetry6452007PacketBuilder.cs
View File

@ -98,6 +98,29 @@ namespace JiShe.CollectBus.Protocol.T6452007.SendData
var dataList = Build645SendData.Build645SendCommand(request.MeterAddress, c_data, dataUnit); var dataList = Build645SendData.Build645SendCommand(request.MeterAddress, c_data, dataUnit);
return new Telemetry6452007PacketResponse() { Data = dataList }; return new Telemetry6452007PacketResponse() { Data = dataList };
} }
#endregion #endregion
#region 读数据
/// <summary>
/// 变量数据标识编码处理
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
public static Telemetry6452007PacketResponse C11_02_Send(Telemetry6452007PacketRequest request)
{
var itemCodeArr = request.ItemCode.Split('_');//11_02_80_00_02
var c_data = itemCodeArr[0];
var DI3 = itemCodeArr[1];
var DI2 = itemCodeArr[2];
var DI1 = itemCodeArr[3];
var DI0 = itemCodeArr[4];
var dataUnit = new List<string>() { DI3, DI2, DI1, DI0 };
var dataList = Build645SendData.Build645SendCommand(request.MeterAddress, c_data, dataUnit);
return new Telemetry6452007PacketResponse() { Data = dataList };
}
#endregion
} }
} }

40
services/JiShe.CollectBus.Application/Samples/SampleAppService.cs
View File

@ -55,8 +55,8 @@ public class SampleAppService : CollectBusAppService, ISampleAppService, IKafkaS
_dbContext = dbContext; _dbContext = dbContext;
_logger = logger; _logger = logger;
_redisDataCacheService = redisDataCacheService; _redisDataCacheService = redisDataCacheService;
_producerService =producerService; _producerService = producerService;
_tcpService=tcpService; _tcpService = tcpService;
} }
/// <summary> /// <summary>
@ -91,7 +91,8 @@ public class SampleAppService : CollectBusAppService, ISampleAppService, IKafkaS
//TableModelSingleMeasuringEntityExtension //TableModelSingleMeasuringEntityExtension
//TableModelSingleMeasuringEntityAccessor.GetSystemName(meter); //TableModelSingleMeasuringEntityAccessor.GetSystemName(meter);
//ElectricityMeterAccessor //ElectricityMeterAccessor
await _iotDBProvider.InsertAsync(meter); await _iotDBProvider.GetSessionPool(true).InsertAsync(meter);
await _iotDBProvider.InsertAsync(meter);
} }
/// <summary> /// <summary>
@ -101,7 +102,7 @@ public class SampleAppService : CollectBusAppService, ISampleAppService, IKafkaS
[HttpGet] [HttpGet]
public async Task UseTableSessionPool(DateTime time) public async Task UseTableSessionPool(DateTime time)
{ {
var testTime = time; var testTime = time;
ElectricityMeterTreeModel meter2 = new ElectricityMeterTreeModel() ElectricityMeterTreeModel meter2 = new ElectricityMeterTreeModel()
{ {
SystemName = "energy", SystemName = "energy",
@ -177,7 +178,7 @@ public class SampleAppService : CollectBusAppService, ISampleAppService, IKafkaS
await _iotDBProvider.InsertAsync(meter2); await _iotDBProvider.InsertAsync(meter2);
_dbContext.UseTableSessionPool = true; _dbContext.UseTableSessionPool = true;
ElectricityMeter meter3 = new ElectricityMeter() ElectricityMeter meter3 = new ElectricityMeter()
{ {
@ -211,14 +212,15 @@ public class SampleAppService : CollectBusAppService, ISampleAppService, IKafkaS
time = DateTime.Now; time = DateTime.Now;
//System.Reflection.PropertyInfo; //System.Reflection.PropertyInfo;
//System.Reflection.FieldInfo //System.Reflection.FieldInfo
var meter = new TreeModelSingleMeasuringEntity<DateTime>() //TreeModelSingleMeasuringEntityAccessor
var meter = new TreeModelSingleMeasuringEntity<decimal?>()
{ {
SystemName = "energy", SystemName = "energy",
DeviceId = "402440506", DeviceId = "402440506",
DeviceType = "1", DeviceType = "1",
ProjectId = "10059", ProjectId = "10059",
Timestamps = time.GetDateTimeOffset().ToUnixTimeMilliseconds(), Timestamps = time.GetDateTimeOffset().ToUnixTimeMilliseconds(),
SingleMeasuring = (measuring, time) SingleMeasuring = (measuring, 34.534m)
}; };
await _iotDBProvider.InsertAsync(meter); await _iotDBProvider.InsertAsync(meter);
} }
@ -264,7 +266,7 @@ public class SampleAppService : CollectBusAppService, ISampleAppService, IKafkaS
Timestamps = time.GetDateTimeOffset().ToUnixTimeMilliseconds(), Timestamps = time.GetDateTimeOffset().ToUnixTimeMilliseconds(),
SingleMeasuring = ("measuring", true) SingleMeasuring = ("measuring", true)
}; };
QueryCondition conditions = new QueryCondition() QueryCondition conditions = new QueryCondition()
{ {
Field = "DeviceId", Field = "DeviceId",
@ -273,13 +275,13 @@ public class SampleAppService : CollectBusAppService, ISampleAppService, IKafkaS
}; };
var query = new IoTDBQueryOptions() var query = new IoTDBQueryOptions()
{ {
TableNameOrTreePath = meter.DevicePath, TableNameOrTreePath = meter.DevicePath,
PageIndex = 1, PageIndex = 1,
PageSize = 1, PageSize = 1,
Conditions = new List<QueryCondition>() { conditions }, Conditions = new List<QueryCondition>() { conditions },
}; };
var pageResult = await _iotDBProvider.QueryAsync<DeviceTreeModelDataInfo>(query); var pageResult = await _iotDBProvider.QueryAsync<DeviceTreeModelDataInfo>(query);
@ -391,7 +393,7 @@ public class SampleAppService : CollectBusAppService, ISampleAppService, IKafkaS
//} //}
//DeviceGroupBalanceControl.InitializeCache(focusAddressDataLista); //DeviceGroupBalanceControl.InitializeCache(focusAddressDataLista);
//// 打印分布统计 //// 打印分布统计
//DeviceGroupBalanceControl.PrintDistributionStats(); //DeviceGroupBalanceControl.PrintDistributionStats();
@ -405,13 +407,13 @@ public class SampleAppService : CollectBusAppService, ISampleAppService, IKafkaS
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpGet]
public async Task TestGetDeviceGroupBalanceControl(string deviceAddress) public async Task TestGetDeviceGroupBalanceControl(string deviceAddress)
{ {
var groupId = DeviceGroupBalanceControl.GetDeviceGroupId(deviceAddress); var groupId = DeviceGroupBalanceControl.GetDeviceGroupId(deviceAddress);
Console.WriteLine(groupId); Console.WriteLine(groupId);
await Task.CompletedTask; await Task.CompletedTask;
} }
/// <summary> /// <summary>
/// 测试Redis批量读取10万条数据性能 /// 测试Redis批量读取10万条数据性能
@ -474,7 +476,7 @@ public class SampleAppService : CollectBusAppService, ISampleAppService, IKafkaS
{ {
DateTime nextTaskTime = Convert.ToDateTime(time); DateTime nextTaskTime = Convert.ToDateTime(time);
return await Task.FromResult(nextTaskTime.CalculateNextCollectionTime(timeDensity)); return await Task.FromResult(nextTaskTime.CalculateNextCollectionTime(timeDensity));
} }
@ -510,7 +512,7 @@ public class SampleAppService : CollectBusAppService, ISampleAppService, IKafkaS
[AllowAnonymous] [AllowAnonymous]
public bool GetTestProtocol() public bool GetTestProtocol()
{ {
var aa = LazyServiceProvider.GetKeyedService<IProtocolPlugin>("TestProtocolPlugin"); var aa = LazyServiceProvider.GetKeyedService<IProtocolPlugin>("TestProtocolPlugin");
return aa == null; return aa == null;
} }
@ -519,7 +521,7 @@ public class SampleAppService : CollectBusAppService, ISampleAppService, IKafkaS
public async Task<ISubscribeAck> KafkaSubscribeAsync(object obj) public async Task<ISubscribeAck> KafkaSubscribeAsync(object obj)
{ {
_logger.LogWarning($"收到订阅消息： {obj}"); _logger.LogWarning($"收到订阅消息： {obj}");
return SubscribeAck.Success(); return SubscribeAck.Success();
} }
/// <summary> /// <summary>
@ -530,7 +532,7 @@ public class SampleAppService : CollectBusAppService, ISampleAppService, IKafkaS
[AllowAnonymous] [AllowAnonymous]
public async Task<bool> KafkaSendAsync(KafkaSendDto input) public async Task<bool> KafkaSendAsync(KafkaSendDto input)
{ {
ArgumentException.ThrowIfNullOrWhiteSpace(input.Address); ArgumentException.ThrowIfNullOrWhiteSpace(input.Address);
ArgumentException.ThrowIfNullOrWhiteSpace(input.Frame); ArgumentException.ThrowIfNullOrWhiteSpace(input.Frame);
input.Frame = input.Frame.Replace(" ", ""); input.Frame = input.Frame.Replace(" ", "");
await _producerService.ProduceAsync<KafkaSendDto>(ProtocolConst.TESTSENDTOPIC, input); await _producerService.ProduceAsync<KafkaSendDto>(ProtocolConst.TESTSENDTOPIC, input);
@ -557,7 +559,7 @@ public class SampleAppService : CollectBusAppService, ISampleAppService, IKafkaS
{ {
_logger.LogWarning($"{dto.Address}集中器未上线： {dto.Serialize()}"); _logger.LogWarning($"{dto.Address}集中器未上线： {dto.Serialize()}");
} }
// 测试不管是否上线都ACK // 测试不管是否上线都ACK
return SubscribeAck.Success(); return SubscribeAck.Success();
} }

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

@ -45,7 +45,7 @@ namespace JiShe.CollectBus.ScheduledMeterReading
private readonly DataMigrationOptions _dataMigrationOptions; private readonly DataMigrationOptions _dataMigrationOptions;
private readonly KafkaOptionConfig _kafkaOptions; private readonly KafkaOptionConfig _kafkaOptions;
private readonly ServerApplicationOptions _applicationOptions; private readonly ServerApplicationOptions _applicationOptions;
private readonly IGuidGenerator _guidGenerator; private readonly IGuidGenerator _guidGenerator;
int pageSize = 10000; int pageSize = 10000;
@ -328,7 +328,7 @@ namespace JiShe.CollectBus.ScheduledMeterReading
/// <returns></returns> /// <returns></returns>
public virtual async Task InitAmmeterCacheData(string gatherCode = "") public virtual async Task InitAmmeterCacheData(string gatherCode = "")
{ {
//return; //return;
try try
{ {
@ -337,34 +337,34 @@ namespace JiShe.CollectBus.ScheduledMeterReading
_ = _dataChannelManage.ScheduledMeterTaskReadingAsync(DataChannelManage.TaskDataChannel.Reader); _ = _dataChannelManage.ScheduledMeterTaskReadingAsync(DataChannelManage.TaskDataChannel.Reader);
// //此处代码不要删除 // //此处代码不要删除
//#if DEBUG //#if DEBUG
// var redisCacheDeviceInfoHashKeyTemp = $"CollectBus:Energy:JiSheCollectBus2:DeviceInfo"; // var redisCacheDeviceInfoHashKeyTemp = $"CollectBus:Energy:JiSheCollectBus2:DeviceInfo";
// var timer1 = Stopwatch.StartNew(); // var timer1 = Stopwatch.StartNew();
// Dictionary<string, List<DeviceInfo>> keyValuePairsTemps = FreeRedisProvider.Instance.HGetAll<List<DeviceInfo>>(redisCacheDeviceInfoHashKeyTemp); // Dictionary<string, List<DeviceInfo>> keyValuePairsTemps = FreeRedisProvider.Instance.HGetAll<List<DeviceInfo>>(redisCacheDeviceInfoHashKeyTemp);
// List<DeviceInfo> meterInfos = new List<DeviceInfo>(); // List<DeviceInfo> meterInfos = new List<DeviceInfo>();
// List<string> focusAddressDataLista = new List<string>(); // List<string> focusAddressDataLista = new List<string>();
// foreach (var item in keyValuePairsTemps) // foreach (var item in keyValuePairsTemps)
// { // {
// foreach (var subItem in item.Value) // foreach (var subItem in item.Value)
// { // {
// if (subItem.MeterType == MeterTypeEnum.Ammeter && subItem.TimeDensity == 15) // if (subItem.MeterType == MeterTypeEnum.Ammeter && subItem.TimeDensity == 15)
// { // {
// meterInfos.Add(subItem); // meterInfos.Add(subItem);
// focusAddressDataLista.Add(subItem.MeterId.ToString()); // focusAddressDataLista.Add(subItem.MeterId.ToString());
// } // }
// } // }
// } // }
// timer1.Stop(); // timer1.Stop();
// _logger.LogError($"电表初始化读取数据总共花费时间{timer1.ElapsedMilliseconds}毫秒"); // _logger.LogError($"电表初始化读取数据总共花费时间{timer1.ElapsedMilliseconds}毫秒");
// DeviceGroupBalanceControl.InitializeCache(focusAddressDataLista, _kafkaOptions.NumPartitions); // DeviceGroupBalanceControl.InitializeCache(focusAddressDataLista, _kafkaOptions.NumPartitions);
// return; // return;
//#else //#else
// var meterInfos = await GetAmmeterInfoList(gatherCode); // var meterInfos = await GetAmmeterInfoList(gatherCode);
//#endif //#endif
var meterInfos = await GetAmmeterInfoList(gatherCode); var meterInfos = await GetAmmeterInfoList(gatherCode);
if (meterInfos == null || meterInfos.Count <= 0) if (meterInfos == null || meterInfos.Count <= 0)
{ {
@ -728,17 +728,27 @@ namespace JiShe.CollectBus.ScheduledMeterReading
//var aFN = (AFN)aFNStr.HexToDec(); //var aFN = (AFN)aFNStr.HexToDec();
//var fn = int.Parse(itemCodeArr[1]); //var fn = int.Parse(itemCodeArr[1]);
var itemCodeInfo = T37612012PacketItemCodeConst.MappingItemCodeTo645SubCodeRelationship(tempItem);
//TODO:特殊表 //TODO:特殊表
ProtocolBuildResponse builderResponse = await protocolPlugin.BuildAsync(new ProtocolBuildRequest() ProtocolBuildResponse builderResponse = await protocolPlugin.BuildAsync(new ProtocolBuildRequest()
{ {
FocusAddress = ammeterInfo.FocusAddress, FocusAddress = ammeterInfo.FocusAddress,
Pn = ammeterInfo.MeteringCode, Pn = ammeterInfo.MeteringCode,
ItemCode = tempItem, ItemCode = itemCodeInfo.Item1,
DataTimeMark = new Protocol.DataTimeMark() DataTimeMark = new Protocol.DataTimeMark()
{ {
Density = ammeterInfo.TimeDensity.GetFocusDensity(),//转换成协议的值 Density = ammeterInfo.TimeDensity.GetFocusDensity(),//转换成协议的值
Point = 1, Point = 1,
DataTime = timestamps, DataTime = timestamps,
},
SubProtocolRequest = new SubProtocolBuildRequest()
{
MeterAddress = ammeterInfo.MeterAddress,
Password = ammeterInfo.Password,
MeteringPort = ammeterInfo.MeteringPort,
Baudrate = ammeterInfo.Baudrate,
ItemCode = itemCodeInfo.Item2, //10_97 => 11_02_80_00_02
} }
}); });
if (builderResponse == null || builderResponse.Data.Length <= 0) if (builderResponse == null || builderResponse.Data.Length <= 0)
@ -816,7 +826,7 @@ namespace JiShe.CollectBus.ScheduledMeterReading
_logger.LogError($"{nameof(AmmeterScheduledAutoValveControl)} 定时阀控运行时间{currentTime}没有找到对应的协议组件,-105"); _logger.LogError($"{nameof(AmmeterScheduledAutoValveControl)} 定时阀控运行时间{currentTime}没有找到对应的协议组件,-105");
return null; return null;
} }
ProtocolBuildResponse builderResponse = await protocolPlugin.BuildAsync(new ProtocolBuildRequest() ProtocolBuildResponse builderResponse = await protocolPlugin.BuildAsync(new ProtocolBuildRequest()
{ {
FocusAddress = ammeterInfo.FocusAddress, FocusAddress = ammeterInfo.FocusAddress,
@ -1106,7 +1116,7 @@ namespace JiShe.CollectBus.ScheduledMeterReading
List<string> deviceIds = new List<string>();//用于处理Kafka主题分区数据的分发和处理。 List<string> deviceIds = new List<string>();//用于处理Kafka主题分区数据的分发和处理。
//根据采集频率分组，获得采集频率分组 //根据采集频率分组，获得采集频率分组
var meterInfoGroupByTimeDensity = meterInfos.Select(d=>d.TimeDensity).GroupBy(d => d); var meterInfoGroupByTimeDensity = meterInfos.Select(d => d.TimeDensity).GroupBy(d => d);
var currentTime = DateTime.Now; var currentTime = DateTime.Now;
if (_applicationOptions.FirstCollectionTime.HasValue == false) if (_applicationOptions.FirstCollectionTime.HasValue == false)
{ {
@ -1153,7 +1163,7 @@ namespace JiShe.CollectBus.ScheduledMeterReading
await _redisDataCacheService.BatchInsertDataAsync<DeviceInfo>( await _redisDataCacheService.BatchInsertDataAsync<DeviceInfo>(
redisCacheDeviceGroupSetIndexKey, redisCacheDeviceGroupSetIndexKey,
redisCacheDeviceInfoHashKey, redisCacheDeviceInfoHashKey,
keyValuePairs); keyValuePairs);
@ -1546,7 +1556,7 @@ namespace JiShe.CollectBus.ScheduledMeterReading
//} //}
Dictionary<string, List<T>> keyValuePairs = FreeRedisProvider.Instance.HGetAll<List<T>>(redisCacheDeviceInfoHashKey); Dictionary<string, List<T>> keyValuePairs = FreeRedisProvider.Instance.HGetAll<List<T>>(redisCacheDeviceInfoHashKey);
timer.Stop(); timer.Stop();
_logger.LogError($"{nameof(CreateMeterPublishTask)} 构建采集待下发任务，缓存获取信息共花费{timer.ElapsedMilliseconds}毫秒"); _logger.LogError($"{nameof(CreateMeterPublishTask)} 构建采集待下发任务，缓存获取信息共花费{timer.ElapsedMilliseconds}毫秒");
@ -1557,7 +1567,7 @@ namespace JiShe.CollectBus.ScheduledMeterReading
{ {
foreach (var subItem in item.Value) foreach (var subItem in item.Value)
{ {
if (subItem.MeterType == meterType && subItem.TimeDensity == timeDensity) if (subItem.MeterType == meterType && subItem.TimeDensity == timeDensity)
{ {
meterInfos.Add(subItem); meterInfos.Add(subItem);
} }
@ -1691,10 +1701,10 @@ namespace JiShe.CollectBus.ScheduledMeterReading
}; };
} }
catch (Exception ex) catch (Exception ex)
{ {
throw ex; throw ex;
} }
} }
#endregion #endregion
} }

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

@ -222,7 +222,8 @@ namespace JiShe.CollectBus.ScheduledMeterReading
#if DEBUG #if DEBUG
sql = $@"{sql} and c.Address in('542410000504','442405000040','442405000039','402410040506')"; // sql = $@"{sql} and c.Address in('542410000504','442405000040','442405000039','402410040506')";
sql = $@"{sql} and c.Address in('402410040506')";
#endif #endif
if (!string.IsNullOrWhiteSpace(gatherCode)) if (!string.IsNullOrWhiteSpace(gatherCode))
@ -294,35 +295,49 @@ namespace JiShe.CollectBus.ScheduledMeterReading
if (settingInfos == null || settingInfos.Count <= 0) if (settingInfos == null || settingInfos.Count <= 0)
{ {
settingInfos = new List<AmmeterAutoValveControlSetting>(); settingInfos = new List<AmmeterAutoValveControlSetting>();
settingInfos.Add(new AmmeterAutoValveControlSetting() //settingInfos.Add(new AmmeterAutoValveControlSetting()
{ //{
MeterType = MeterTypeEnum.Ammeter, // MeterType = MeterTypeEnum.Ammeter,
AmmerterAddress = "442405000040", // AmmerterAddress = "442405000040",
FocusAddress = "442400040", // FocusAddress = "442400040",
FocusId = 57683, // FocusId = 57683,
ProjectID = 1, // ProjectID = 1,
TripType = "on", // TripType = "on",
TripTime = $"{DateTime.Now:HH:mm}", // TripTime = $"{DateTime.Now:HH:mm}",
MeterId = 78971, // MeterId = 78971,
LoopType = "EachDay", // LoopType = "EachDay",
EachDayWithout = "周六,周日", // EachDayWithout = "周六,周日",
TimeDensity = 15, // TimeDensity = 15,
}); //});
settingInfos.Add(new AmmeterAutoValveControlSetting() //settingInfos.Add(new AmmeterAutoValveControlSetting()
{ //{
MeterType = MeterTypeEnum.Ammeter, // MeterType = MeterTypeEnum.Ammeter,
AmmerterAddress = "442405000039", // AmmerterAddress = "442405000039",
FocusAddress = "442400039", // FocusAddress = "442400039",
FocusId = 57684, // FocusId = 57684,
ProjectID = 1, // ProjectID = 1,
TripType = "on", // TripType = "on",
TripTime = $"{DateTime.Now:HH:mm}", // TripTime = $"{DateTime.Now:HH:mm}",
MeterId = 78972, // MeterId = 78972,
LoopType = "EachDay", // LoopType = "EachDay",
EachDayWithout = "周六,周日", // EachDayWithout = "周六,周日",
TimeDensity = 15, // TimeDensity = 15,
}); //});
//settingInfos.Add(new AmmeterAutoValveControlSetting()
//{
// MeterType = MeterTypeEnum.Ammeter,
// AmmerterAddress = "542410000504",
// FocusAddress = "542400504",
// FocusId = 57686,
// ProjectID = 1,
// TripType = "on",
// TripTime = $"{DateTime.Now:HH:mm}",
// MeterId = 78974,
// LoopType = "EachDay",
// EachDayWithout = "周六,周日",
// TimeDensity = 15,
//});
settingInfos.Add(new AmmeterAutoValveControlSetting() settingInfos.Add(new AmmeterAutoValveControlSetting()
{ {
@ -339,21 +354,6 @@ namespace JiShe.CollectBus.ScheduledMeterReading
TimeDensity = 15, TimeDensity = 15,
}); });
settingInfos.Add(new AmmeterAutoValveControlSetting()
{
MeterType = MeterTypeEnum.Ammeter,
AmmerterAddress = "542410000504",
FocusAddress = "542400504",
FocusId = 57686,
ProjectID = 1,
TripType = "on",
TripTime = $"{DateTime.Now:HH:mm}",
MeterId = 78974,
LoopType = "EachDay",
EachDayWithout = "周六,周日",
TimeDensity = 15,
});
FreeRedisProvider.Instance.Set(redisCacheDeviceSettingInfoHashKey, settingInfos); FreeRedisProvider.Instance.Set(redisCacheDeviceSettingInfoHashKey, settingInfos);
} }

20
shared/JiShe.CollectBus.Common/Consts/T37612012PacketItemCodeConst.cs
View File

@ -19,6 +19,12 @@ namespace JiShe.CollectBus.Common.Consts
/// </summary> /// </summary>
public const string AFN10HFN01H = $"10_01"; public const string AFN10HFN01H = $"10_01";
/// <summary>
/// 电网频率
/// </summary>
public const string AFN10HFN97H = $"10_97";
/// <summary> /// <summary>
/// 读取终端信息 /// 读取终端信息
/// </summary> /// </summary>
@ -181,5 +187,19 @@ namespace JiShe.CollectBus.Common.Consts
} }
#endregion #endregion
/// <summary>
/// 特殊645编码关系映射
/// </summary>
/// <param name="itemCode"></param>
/// <returns></returns>
public static (string,string) MappingItemCodeTo645SubCodeRelationship(string itemCode)
{
return itemCode switch
{
AFN10HFN97H => (AFN10HFN01H,T6452007PacketItemCodeConst.C1102800002),
_=> (itemCode,""),
};
}
} }
} }

10
shared/JiShe.CollectBus.Common/Consts/T6452007PacketItemCodeConst.cs
View File

@ -56,6 +56,16 @@ namespace JiShe.CollectBus.Common.Consts
/// </summary> /// </summary>
public const string C08 = "08"; public const string C08 = "08";
#endregion #endregion
#region 读数据
/// <summary>
/// 电网频率
/// </summary>
public const string C1102800002 = "11_02_80_00_02";
#endregion
#endregion #endregion
} }
} }

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

@ -6,7 +6,7 @@
@{ @{
Layout = null; Layout = null;
} }
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">

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

@ -141,7 +141,7 @@
} }
}, },
"ServerApplicationOptions": { "ServerApplicationOptions": {
"ServerTagName": "JiSheCollectBus99", "ServerTagName": "JiSheCollectBus8",
"SystemType": "Energy", "SystemType": "Energy",
"FirstCollectionTime": "2025-04-28 15:07:00", "FirstCollectionTime": "2025-04-28 15:07:00",
"AutomaticVerificationTime": "16:07:00", "AutomaticVerificationTime": "16:07:00",