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

更新依赖

Browse Source
This commit is contained in:
ChenYi 2025-06-10 09:18:58 +08:00
parent 5b7ee5d1b5
commit 7f72358d99
15 changed files with 326 additions and 290 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Directory.Build.props
View File

@ -2,7 +2,7 @@
<!-- 定义项目加载属性 -->
<PropertyGroup>
<!--JiShe.ServicePro版本-->
<ServiceProVersion>1.0.5.16</ServiceProVersion>
<ServiceProVersion>1.0.5.23</ServiceProVersion>
<!--Volo Abp 版本-->
<VoloAbpVersion>9.1.1</VoloAbpVersion>

3
protocols/JiShe.CollectBus.Protocol.T1882018/GlobalUsings.cs
View File

@ -7,3 +7,6 @@ global using JiShe.ServicePro.FreeRedisProvider;
global using JiShe.ServicePro.Consts;
global using JiShe.ServicePro.Core;
global using JiShe.ServicePro.ServerOptions;
global using JiShe.ServicePro.ApacheIoTDB.Provider.SessionPools;
global using JiShe.ServicePro.ApacheIoTDB.Provider.Options;
global using JiShe.ServicePro.ApacheIoTDB.Provider.TreeModels.SingleMeasuring;

3
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/DataStorage.cs
View File

@ -6,9 +6,6 @@ using JiShe.CollectBus.Protocol.Dto;
using JiShe.ServicePro.Consts;
using JiShe.ServicePro.Core;
using JiShe.ServicePro.Encrypt;
using JiShe.ServicePro.IoTDBManagement.Model;
using JiShe.ServicePro.IoTDBManagement.Options;
using JiShe.ServicePro.IoTDBManagement.SessionPools;
using JiShe.ServicePro.IoTDBManagement.TableModels;
using JiShe.ServicePro.IoTDBManagement.TreeModels;
using Microsoft.Extensions.Caching.Memory;

4
protocols/JiShe.CollectBus.Protocol.T37612012/GlobalUsings.cs
View File

@ -7,3 +7,7 @@ global using JiShe.ServicePro.FreeRedisProvider;
global using JiShe.ServicePro.Consts;
global using JiShe.ServicePro.Core;
global using JiShe.ServicePro.ServerOptions;
global using JiShe.ServicePro.ApacheIoTDB.Provider.SessionPools;
global using JiShe.ServicePro.ApacheIoTDB.Provider.Options;
global using JiShe.ServicePro.ApacheIoTDB.Provider.TreeModels.SingleMeasuring;
global using JiShe.ServicePro.ApacheIoTDB.Provider.Model;

3
protocols/JiShe.CollectBus.Protocol.T6452007/GlobalUsings.cs
View File

@ -7,3 +7,6 @@ global using JiShe.ServicePro.FreeRedisProvider;
global using JiShe.ServicePro.Consts;
global using JiShe.ServicePro.Core;
global using JiShe.ServicePro.ServerOptions;
global using JiShe.ServicePro.ApacheIoTDB.Provider.SessionPools;
global using JiShe.ServicePro.ApacheIoTDB.Provider.Options;
global using JiShe.ServicePro.ApacheIoTDB.Provider.TreeModels.SingleMeasuring;

4
protocols/JiShe.CollectBus.Protocol/GlobalUsings.cs
View File

@ -7,3 +7,7 @@ global using JiShe.ServicePro.FreeRedisProvider;
global using JiShe.ServicePro.Consts;
global using JiShe.ServicePro.Core;
global using JiShe.ServicePro.ServerOptions;
global using JiShe.ServicePro.ApacheIoTDB.Provider.SessionPools;
global using JiShe.ServicePro.ApacheIoTDB.Provider.Options;
global using JiShe.ServicePro.ApacheIoTDB.Provider.TreeModels.SingleMeasuring;
global using JiShe.ServicePro.ApacheIoTDB.Provider.Model;

18
protocols/JiShe.CollectBus.Protocol/Services/ProtocolService.cs
View File

@ -38,10 +38,22 @@ namespace JiShe.CollectBus.Protocol.Services
{
var protocols = await _freeRedisProvider.Instance.HGetAllAsync<ProtocolInfo>(RedisConst.ProtocolKey);
var keyValuePair = protocols.FirstOrDefault(a => ContainsExactPartRegex(deviceCode, a.Value.RegularExpression));
if (!keyValuePair.Key.IsNullOrWhiteSpace() || keyValuePair.Value != null) return keyValuePair.Value;
if (isSpecial) throw new UserFriendlyException("The device protocol plugin does not exist!", ExceptionCode.NotFound);
if (!keyValuePair.Key.IsNullOrWhiteSpace() || keyValuePair.Value != null)
{
return keyValuePair.Value;
}
if (isSpecial)
{
throw new UserFriendlyException("The device protocol plugin does not exist!", ExceptionCode.NotFound);
}
//todo 默认协议插件应该根据表类型获取
var hasStandardProtocolPlugin = protocols.TryGetValue(_serverApplicationOptions.DefaultProtocolPlugin, out var protocolInfo);
if (!hasStandardProtocolPlugin) throw new UserFriendlyException("Standard protocol plugin does not exist!", ExceptionCode.NotFound);
if (!hasStandardProtocolPlugin)
{
throw new UserFriendlyException("Standard protocol plugin does not exist!", ExceptionCode.NotFound);
}
return protocolInfo;
}

6
services/JiShe.CollectBus.Application.Contracts/GlobalUsings.cs
View File

@ -4,8 +4,10 @@ global using System.Text;
global using Volo.Abp.Modularity;
global using JiShe.ServicePro.Enums;
global using JiShe.ServicePro.FreeRedisProvider;
global using JiShe.ServicePro.IoTDBManagement.Options;
global using JiShe.ServicePro.IoTDBManagement.SessionPools;
global using JiShe.ServicePro.ApacheIoTDB.Provider.SessionPools;
global using JiShe.ServicePro.ApacheIoTDB.Provider.Options;
global using JiShe.ServicePro.ApacheIoTDB.Provider.TreeModels.SingleMeasuring;
global using JiShe.ServicePro.ApacheIoTDB.Provider.Model;
global using JiShe.ServicePro.IoTDBManagement.TableModels;
global using JiShe.ServicePro.Kafka.Consts;
global using JiShe.ServicePro.Kafka.Internal;

4
services/JiShe.CollectBus.Application/GlobalUsings.cs
View File

@ -4,9 +4,9 @@ global using System.Text;
global using Volo.Abp.Modularity;
global using JiShe.ServicePro.Enums;
global using JiShe.ServicePro.FreeRedisProvider;
global using JiShe.ServicePro.IoTDBManagement.Options;
global using JiShe.ServicePro.IoTDBManagement.SessionPools;
global using JiShe.ServicePro.IoTDBManagement.TableModels;
global using JiShe.ServicePro.ApacheIoTDB.Provider.SessionPools;
global using JiShe.ServicePro.ApacheIoTDB.Provider.Options;
global using JiShe.ServicePro.Kafka.Consts;
global using JiShe.ServicePro.Kafka.Internal;
global using JiShe.ServicePro.Kafka.Attributes;

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

@ -6,8 +6,6 @@ using JiShe.CollectBus.IotSystems.Devices;
using JiShe.CollectBus.IotSystems.PrepayModel;
using JiShe.CollectBus.Protocol.Interfaces;
using JiShe.ServicePro.FreeSqlProvider;
using JiShe.ServicePro.IoTDBManagement.Options;
using JiShe.ServicePro.IoTDBManagement.SessionPools;
using JiShe.ServicePro.Kafka.Internal;
using JiShe.ServicePro.Kafka.Producer;
using Microsoft.AspNetCore.Authorization;

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

@ -493,6 +493,8 @@ namespace JiShe.CollectBus.ScheduledMeterReading
/// <param name="timestamps">采集频率对应的时间戳</param>
/// <returns></returns>
private async Task<List<MeterReadingTelemetryPacketInfo>> AmmerterCreatePublishTaskAction(int timeDensity, DeviceCacheInfo ammeterInfo, int groupIndex, DateTime timestamps)
{
try
{
var currentTime = DateTime.Now;
@ -648,6 +650,12 @@ namespace JiShe.CollectBus.ScheduledMeterReading
return taskList;
}
catch (Exception ex)
{
throw;
}
}
/// <summary>
/// 获取电表阀控配置

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

@ -87,149 +87,149 @@ namespace JiShe.CollectBus.ScheduledMeterReading
//[Route($"ammeter/list")]
public override async Task<List<DeviceCacheInfo>> GetAmmeterInfoList(string gatherCode = "V4-Gather-8890")
{
#if DEBUG
var redisCacheDeviceCacheInfoHashKeyTemp = $"CollectBus:Energy:JiSheCollectBus109:DeviceCacheInfo";
//#if DEBUG
// var redisCacheDeviceCacheInfoHashKeyTemp = $"CollectBus:Energy:JiSheCollectBus109:DeviceCacheInfo";
List<DeviceCacheInfo> ammeterInfos = FreeRedisProvider.Instance.Get<List<DeviceCacheInfo>>(redisCacheDeviceCacheInfoHashKeyTemp);//542400504
// List<DeviceCacheInfo> ammeterInfos = FreeRedisProvider.Instance.Get<List<DeviceCacheInfo>>(redisCacheDeviceCacheInfoHashKeyTemp);//542400504
if (ammeterInfos == null || ammeterInfos.Count <= 0)
{
ammeterInfos = new List<DeviceCacheInfo>();
//ammeterInfos.Add(new DeviceCacheInfo()
// if (ammeterInfos == null || ammeterInfos.Count <= 0)
// {
// Baudrate = 2400,
// FocusAddress = "442400040",
// Name = "保利单箱电表1",
// FocusId = 95780,
// DatabaseBusiID = 1,
// MeteringCode = 0,
// MeterAddress = "442405000040",
// MeterId = 127035,
// TypeName = 1,
// DataTypes = "581,589,592,597,601",
// TimeDensity = 15,
// BrandType = "DTS1980",
// MeterType = MeterTypeEnum.Ammeter,
// ProjectID = 1,
// MeteringPort = MeteringPortConst.MeteringPortTwo,
// Password = "000000",
//});
// ammeterInfos = new List<DeviceCacheInfo>();
// //ammeterInfos.Add(new DeviceCacheInfo()
// //{
// // Baudrate = 2400,
// // FocusAddress = "442400040",
// // Name = "保利单箱电表1",
// // FocusId = 95780,
// // DatabaseBusiID = 1,
// // MeteringCode = 0,
// // MeterAddress = "442405000040",
// // MeterId = 127035,
// // TypeName = 1,
// // DataTypes = "581,589,592,597,601",
// // TimeDensity = 15,
// // BrandType = "DTS1980",
// // MeterType = MeterTypeEnum.Ammeter,
// // ProjectID = 1,
// // MeteringPort = MeteringPortConst.MeteringPortTwo,
// // Password = "000000",
// //});
// //ammeterInfos.Add(new DeviceCacheInfo()
// //{
// // Baudrate = 2400,
// // FocusAddress = "442400039",
// // Name = "保利单箱电表2",
// // FocusId = 69280,
// // DatabaseBusiID = 1,
// // MeteringCode = 0,
// // MeterAddress = "442405000039",
// // MeterId = 95594,
// // TypeName = 1,
// // DataTypes = "581,589,592,597,601",
// // TimeDensity = 15,
// // BrandType = "DTS1980",
// // MeterType = MeterTypeEnum.Ammeter,
// // ProjectID = 1,
// // MeteringPort = MeteringPortConst.MeteringPortTwo,
// // Password = "000000",
// //});
// //ammeterInfos.Add(new DeviceCacheInfo()
// //{
// // Baudrate = 2400,
// // FocusAddress = "402440506",
// // Name = "中环半导体9#冷却泵-220KW(三相电表)",
// // FocusId = 106857,
// // DatabaseBusiID = 1,
// // MeteringCode = 0,
// // MeterAddress = "402410040506",
// // MeterId = 139059,
// // 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",
// // TimeDensity = 15,
// // BrandType = "DTS1980",
// // Password = "000000",
// // ProjectID = 1,
// // MeterType = MeterTypeEnum.Ammeter,
// // MeteringPort = MeteringPortConst.MeteringPortTwo,
// //});
// //ammeterInfos.Add(new DeviceCacheInfo()
// //{
// // Baudrate = 2400,
// // FocusAddress = "942411321",
// // Name = "DDS1980-T4(5-60) ML307A 长稳 942408011321",
// // FocusId = 57682,
// // DatabaseBusiID = 1,
// // MeteringCode = 0,
// // MeterAddress = "942408011321",
// // MeterId = 78970,
// // 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",
// // TimeDensity = 15,
// // BrandType = "DTS1980",
// // Password = "000000",
// // ProjectID = 1,
// // MeterType = MeterTypeEnum.Ammeter,
// // MeteringPort = MeteringPortConst.MeteringPortTwo,
// //});
// //ammeterInfos.Add(new DeviceCacheInfo()
// //{
// // Baudrate = 2400,
// // FocusAddress = "942411319",
// // Name = "DDS1980-T4(5-60) ML307A 长稳 942408011319",
// // FocusId = 57685,
// // DatabaseBusiID = 1,
// // MeteringCode = 0,
// // MeterAddress = "942408011319",
// // MeterId = 78973,
// // 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",
// // TimeDensity = 15,
// // BrandType = "DTS1980",
// // Password = "000000",
// // ProjectID = 1,
// // MeterType = MeterTypeEnum.Ammeter,
// // MeteringPort = MeteringPortConst.MeteringPortTwo,
// //});
// ammeterInfos.Add(new DeviceCacheInfo()
// {
// Baudrate = 2400,
// FocusAddress = "442400039",
// Name = "保利单箱电表2",
// FocusId = 69280,
// DatabaseBusiID = 1,
// MeteringCode = 0,
// MeterAddress = "442405000039",
// MeterId = 95594,
// TypeName = 1,
// DataTypes = "581,589,592,597,601",
// TimeDensity = 15,
// BrandType = "DTS1980",
// MeterType = MeterTypeEnum.Ammeter,
// ProjectID = 1,
// MeteringPort = MeteringPortConst.MeteringPortTwo,
// Password = "000000",
//});
//ammeterInfos.Add(new DeviceCacheInfo()
//{
// Baudrate = 2400,
// FocusAddress = "402440506",
// Name = "中环半导体9#冷却泵-220KW(三相电表)",
// FocusId = 106857,
// DatabaseBusiID = 1,
// MeteringCode = 0,
// MeterAddress = "402410040506",
// MeterId = 139059,
// 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",
// TimeDensity = 15,
// BrandType = "DTS1980",
// Password = "000000",
// ProjectID = 1,
// MeterType = MeterTypeEnum.Ammeter,
// MeteringPort = MeteringPortConst.MeteringPortTwo,
//});
//ammeterInfos.Add(new DeviceCacheInfo()
//{
// Baudrate = 2400,
// FocusAddress = "942411321",
// Name = "DDS1980-T4(5-60) ML307A 长稳 942408011321",
// FocusId = 57682,
// DatabaseBusiID = 1,
// MeteringCode = 0,
// MeterAddress = "942408011321",
// MeterId = 78970,
// 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",
// TimeDensity = 15,
// BrandType = "DTS1980",
// Password = "000000",
// ProjectID = 1,
// MeterType = MeterTypeEnum.Ammeter,
// MeteringPort = MeteringPortConst.MeteringPortTwo,
//});
//ammeterInfos.Add(new DeviceCacheInfo()
//{
// Baudrate = 2400,
// FocusAddress = "942411319",
// Name = "DDS1980-T4(5-60) ML307A 长稳 942408011319",
// FocusAddress = "322011149",
// Name = "DDS1980-T4(5-60) ML307A 长稳 322011149",
// FocusId = 57685,
// DatabaseBusiID = 1,
// MeteringCode = 0,
// MeterAddress = "942408011319",
// MeterAddress = "31240010270",
// MeterId = 78973,
// 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",
// TimeDensity = 15,
// BrandType = "DTS1980",
// Password = "000000",
// ProjectID = 1,
// MeterType = MeterTypeEnum.Ammeter,
// MeteringPort = MeteringPortConst.MeteringPortTwo,
// SystemName = SystemType,
// IoTDataType = IOTDBDataTypeConst.Data,
// ProjectId = "1",
// DeviceType = JiShe.ServicePro.Enums.MeterTypeEnum.Ammeter.ToString(),
// DeviceId = "78973",
// });
ammeterInfos.Add(new DeviceCacheInfo()
{
Baudrate = 2400,
FocusAddress = "322011149",
Name = "DDS1980-T4(5-60) ML307A 长稳 322011149",
FocusId = 57685,
DatabaseBusiID = 1,
MeteringCode = 0,
MeterAddress = "31240010270",
MeterId = 78973,
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",
TimeDensity = 15,
BrandType = "DTS1980",
Password = "000000",
MeterType = MeterTypeEnum.Ammeter,
MeteringPort = MeteringPortConst.MeteringPortTwo,
SystemName = SystemType,
IoTDataType = IOTDBDataTypeConst.Data,
ProjectId = "1",
DeviceType = JiShe.ServicePro.Enums.MeterTypeEnum.Ammeter.ToString(),
DeviceId = "78973",
// FreeRedisProvider.Instance.Set(redisCacheDeviceCacheInfoHashKeyTemp, ammeterInfos);
// }
});
FreeRedisProvider.Instance.Set(redisCacheDeviceCacheInfoHashKeyTemp, ammeterInfos);
}
return ammeterInfos;
#else
// return ammeterInfos;
//#else
#endif
//#endif
try
@ -272,7 +272,7 @@ namespace JiShe.CollectBus.ScheduledMeterReading
#if DEBUG
// sql = $@"{sql} and c.Address in('542410000504','442405000040','442405000039','402410040506')";
sql = $@"{sql} and c.Address in('402410040506')";
//sql = $@"{sql} and c.Address in('402410040506')";
#endif
if (!string.IsNullOrWhiteSpace(gatherCode))

2
services/JiShe.CollectBus.DbMigrator/DbMigratorHostedService.cs
View File

@ -7,7 +7,7 @@ using JiShe.CollectBus.Data;
using Serilog;
using Volo.Abp;
using Volo.Abp.Data;
using JiShe.ServicePro.IoTDBManagement.SessionPools;
using JiShe.ServicePro.ApacheIoTDB.Provider.SessionPools;
namespace JiShe.CollectBus.DbMigrator;

5
web/JiShe.CollectBus.Host/appsettings.Development.json
View File

@ -4,5 +4,10 @@
"Default": "Warning",
"Microsoft.AspNetCore": "Warning"
}
},
"ConnectionStrings": {
"Default": "",
"PrepayDB": "server=rm-m5el3d1u1k0wzk70n2o.sqlserver.rds.aliyuncs.com,3433;database=jishe.sysdb;uid=v3sa;pwd=JiShe123;Encrypt=False;Trust Server Certificate=False",
"EnergyDB": "server=rm-wz9hw529i3j1e3b5fbo.sqlserver.rds.aliyuncs.com,3433;database=db_energy;uid=yjdb;pwd=Kdjdhf+9*7ad222LL;Encrypt=False;Trust Server Certificate=False"
}
}

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

@ -1,9 +1,9 @@
{
"ConnectionStrings": {
"Default": "",
"PrepayDB": "server=118.190.144.92;database=jishe.sysdb;uid=sa;pwd=admin@2023;Encrypt=False;Trust Server Certificate=False",
"EnergyDB": "server=118.190.144.92;database=db_energy;uid=sa;pwd=admin@2023;Encrypt=False;Trust Server Certificate=False"
},
//"ConnectionStrings": {
// "Default": "",
// "PrepayDB": "server=118.190.144.92;database=jishe.sysdb;uid=sa;pwd=admin@2023;Encrypt=False;Trust Server Certificate=False",
// "EnergyDB": "server=118.190.144.92;database=db_energy;uid=sa;pwd=admin@2023;Encrypt=False;Trust Server Certificate=False"
//},
"FreeRedisOptions": {
"ConnectionString": "47.110.53.196:6379,password=1q3J@BGf!yhTaD46nS#,syncTimeout=30000,abortConnect=false,connectTimeout=30000,allowAdmin=true,maxPoolSize=50,defaultdatabase=14",
"UseDistributedCache": false