From 1b56dbe4d5ac4801f99a03f482309c085da93603 Mon Sep 17 00:00:00 2001 From: guorui <774114798@qq.com> Date: Wed, 19 Nov 2025 10:19:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E5=9B=9E=E8=B7=AF=E5=B7=A1?= =?UTF-8?q?=E6=A3=80=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ndaryCircuitEventDrivenConfigAppService.cs | 258 +++++++++--------- ...TransformSubstationExportDataAppService.cs | 1 + ...tSecondaryCircuitEventDrivenConfigInput.cs | 2 +- ...ondaryCircuitInspectionResultAppService.cs | 72 ++++- .../YunDa.SOMS.MongoDB.Application.xml | 11 + .../appsettings.development.json | 4 +- .../YunDa.SOMS.Web.MVC/appsettings.json | 14 +- 7 files changed, 224 insertions(+), 138 deletions(-) diff --git a/src/YunDa.Application/YunDa.SOMS.Application/DataMonitoring/SecondaryCircuitInspection/SecondaryCircuitEventDrivenConfigAppService.cs b/src/YunDa.Application/YunDa.SOMS.Application/DataMonitoring/SecondaryCircuitInspection/SecondaryCircuitEventDrivenConfigAppService.cs index 621b94a..95fee7f 100644 --- a/src/YunDa.Application/YunDa.SOMS.Application/DataMonitoring/SecondaryCircuitInspection/SecondaryCircuitEventDrivenConfigAppService.cs +++ b/src/YunDa.Application/YunDa.SOMS.Application/DataMonitoring/SecondaryCircuitInspection/SecondaryCircuitEventDrivenConfigAppService.cs @@ -30,6 +30,7 @@ using YunDa.SOMS.Entities.DataMonitoring; using YunDa.SOMS.Entities.DataMonitoring.SecondaryCircuitInspection; using YunDa.SOMS.Entities.GeneralInformation; using YunDa.SOMS.Redis.Repositories; +using YunDa.SOMS.Application.DataMonitoring.SecondaryCircuitInspection.Test; namespace YunDa.SOMS.Application.DataMonitoring.SecondaryCircuitInspection { @@ -47,13 +48,23 @@ namespace YunDa.SOMS.Application.DataMonitoring.SecondaryCircuitInspection private readonly IRedisRepository _telemeteringRedisRepository; private readonly IRedisRepository _telesignalisationRedisRepository; private readonly IRepository _equipmentInfoRepository; - private readonly IRepository _telemeteringConfigurationRepository; - private readonly IRepository _telesignalisationConfigurationRepository; - private LoginUserOutput _currentUser = null; private IUnitOfWorkManager _unitOfWorkManager = null; private string _ISMSGateWayIp = "http://127.0.0.1:38094"; + // 测试数据服务（懒加载） + private SecondaryCircuitInspectionTestDataService _testDataService; + private SecondaryCircuitInspectionTestDataService TestDataService + { + get + { + if (_testDataService == null) + { + _testDataService = new SecondaryCircuitInspectionTestDataService(); + } + return _testDataService; + } + } public SecondaryCircuitEventDrivenConfigAppService( IRepository eventDrivenConfigRepository, @@ -64,8 +75,6 @@ namespace YunDa.SOMS.Application.DataMonitoring.SecondaryCircuitInspection IRedisRepository telemeteringRedisRepository, IRedisRepository telesignalisationRedisRepository, IRepository equipmentInfoRepository, - IRepository telemeteringConfigurationRepository, - IRepository telesignalisationConfigurationRepository, IUnitOfWorkManager unitOfWorkManager, ISessionAppService sessionAppService, IAppServiceConfiguration appServiceConfiguration) : base(sessionAppService, appServiceConfiguration) @@ -79,8 +88,6 @@ namespace YunDa.SOMS.Application.DataMonitoring.SecondaryCircuitInspection _telemeteringRedisRepository = telemeteringRedisRepository; _telesignalisationRedisRepository = telesignalisationRedisRepository; _equipmentInfoRepository = equipmentInfoRepository; - _telemeteringConfigurationRepository = telemeteringConfigurationRepository; - _telesignalisationConfigurationRepository = telesignalisationConfigurationRepository; _ISMSGateWayIp = appServiceConfiguration.IsmsGateWayIp; } @@ -241,60 +248,67 @@ namespace YunDa.SOMS.Application.DataMonitoring.SecondaryCircuitInspection await _eventDrivenConfigRepository.UpdateAsync(entity); // 重新插入（仅当有数据时） - if (input.SecondaryCircuitInspectionEventItems != null && input.SecondaryCircuitInspectionEventItems.Count > 0) + if (input.SecondaryCircuitInspectionEventItems != null ) { // 更新巡检项关联（删除后重新插入） // 删除现有关联 await _inspectionEventItemRepository.BatchDeleteAsync(t => t.InpectionEventDrivenId == entity.Id); - - var secondaryCircuitInspectionEventItems = _inspectionItemRepository.GetAll() - .Where(t => input.SecondaryCircuitInspectionEventItems.Contains(t.Id)) - .Select(t => t.Id); - foreach (var item in secondaryCircuitInspectionEventItems) + if (input.SecondaryCircuitInspectionEventItems.Count > 0) { - var secondaryCircuitInspectionEventItem = new SecondaryCircuitInspectionEventItem(entity.Id, item); - _inspectionEventItemRepository.Insert(secondaryCircuitInspectionEventItem); + var secondaryCircuitInspectionEventItems = _inspectionItemRepository.GetAll() + .Where(t => input.SecondaryCircuitInspectionEventItems.Contains(t.Id)) + .Select(t => t.Id); + foreach (var item in secondaryCircuitInspectionEventItems) + { + var secondaryCircuitInspectionEventItem = new SecondaryCircuitInspectionEventItem(entity.Id, item); + _inspectionEventItemRepository.Insert(secondaryCircuitInspectionEventItem); + } } } - // 重新插入遥测配置关联 - if (input.TelemetryConfigs != null && input.TelemetryConfigs.Count > 0) + if (input.TelemetryConfigs != null ) { // 更新遥测配置关联（删除后重新插入） // 删除现有遥测配置关联 await _telemetryConfigRepository.BatchDeleteAsync(t => t.SecondaryCircuitEventDrivenConfigId == entity.Id); - - foreach (var telemetryConfigId in input.TelemetryConfigs) + if (input.TelemetryConfigs.Count > 0) { - var telemetryConfig = new SecondaryCircuitInspectionTelemetryConfig + foreach (var telemetryConfigId in input.TelemetryConfigs) { - SecondaryCircuitEventDrivenConfigId = entity.Id, - TelemetryConfigurationId = telemetryConfigId, - IsActive = true - }; - await _telemetryConfigRepository.InsertAsync(telemetryConfig).ConfigureAwait(false); + var telemetryConfig = new SecondaryCircuitInspectionTelemetryConfig + { + SecondaryCircuitEventDrivenConfigId = entity.Id, + TelemetryConfigurationId = telemetryConfigId, + IsActive = true + }; + await _telemetryConfigRepository.InsertAsync(telemetryConfig).ConfigureAwait(false); + } } + } // 重新插入遥信配置关联 - if (input.TelesignalConfigs != null && input.TelesignalConfigs.Count > 0) + if (input.TelesignalConfigs != null ) { // 更新遥信配置关联（删除后重新插入） // 删除现有遥信配置关联 await _telesignalConfigRepository.BatchDeleteAsync(t => t.SecondaryCircuitEventDrivenConfigId == entity.Id); - - foreach (var telesignalConfigId in input.TelesignalConfigs) + if (input.TelesignalConfigs.Count > 0) { - var telesignalConfig = new SecondaryCircuitInspectionTelesignalConfig + foreach (var telesignalConfigId in input.TelesignalConfigs) { - SecondaryCircuitEventDrivenConfigId = entity.Id, - TelesignalConfigurationId = telesignalConfigId, - IsActive = true - }; - await _telesignalConfigRepository.InsertAsync(telesignalConfig).ConfigureAwait(false); + var telesignalConfig = new SecondaryCircuitInspectionTelesignalConfig + { + SecondaryCircuitEventDrivenConfigId = entity.Id, + TelesignalConfigurationId = telesignalConfigId, + IsActive = true + }; + await _telesignalConfigRepository.InsertAsync(telesignalConfig).ConfigureAwait(false); + } } + } rst.ResultData = ObjectMapper.Map(entity); @@ -669,26 +683,13 @@ namespace YunDa.SOMS.Application.DataMonitoring.SecondaryCircuitInspection return rst; } - // 查询所有关联的巡检事件项 - var eventItems = await _inspectionEventItemRepository.GetAll() - .Include(t => t.InspectionItem) - .ThenInclude(t => t.TelemetryConfigs) - .ThenInclude(t => t.TelemeteringConfiguration) - .ThenInclude(t => t.EquipmentInfo) - .Where(t => t.InpectionEventDrivenId == eventDrivenConfigId && t.IsActive) - .ToListAsync(); - - if (eventItems == null || !eventItems.Any()) - { - rst.Message = "未找到关联的巡检项"; - rst.Flag = true; - rst.ResultData = new List(); - return rst; - } - // 获取所有遥测配置（仅综自数据源） - var telemetryConfigs = _telemeteringConfigurationRepository.GetAll() - .Where(t => t.DataSourceCategory == DataSourceCategoryEnum.Zongzi); + var telemetryConfigs = await _telemetryConfigRepository.GetAll() + .Include(t => t.TelemeteringConfiguration) + .ThenInclude(t => t.EquipmentInfo) + .Where(t => t.SecondaryCircuitEventDrivenConfigId == eventDrivenConfigId) + .Where(t => t.DataSourceCategory == DataSourceCategoryEnum.Zongzi) + .ToListAsync(); string url = $"{_ISMSGateWayIp}/api/CallYCByDataId"; var ids = new List(); @@ -696,34 +697,30 @@ namespace YunDa.SOMS.Application.DataMonitoring.SecondaryCircuitInspection var telemetryNameMap = new Dictionary(); // 收集所有遥测ID - foreach (var eventItem in eventItems) + foreach (var telemetryConfig in telemetryConfigs) { - if (eventItem.InspectionItem?.TelemetryConfigs != null && eventItem.InspectionItem.TelemetryConfigs.Any()) + if (telemetryConfig.TelemeteringConfiguration != null && + !string.IsNullOrEmpty(telemetryConfig.TelemeteringConfiguration.ismsbaseYCId)) { - foreach (var item in eventItem.InspectionItem.TelemetryConfigs) + var ismsId = telemetryConfig.TelemeteringConfiguration.ismsbaseYCId; + + if (!ids.Contains(ismsId)) { - var telemetryConfig = telemetryConfigs.FirstOrDefault(t => t.Id == item.TelemetryConfigurationId); - if (telemetryConfig != null && !string.IsNullOrEmpty(telemetryConfig.ismsbaseYCId)) - { - if (!ids.Contains(telemetryConfig.ismsbaseYCId)) - { - ids.Add(telemetryConfig.ismsbaseYCId); - } + ids.Add(ismsId); + } - // 映射设备名称 - if (!equipmentNameMap.ContainsKey(telemetryConfig.ismsbaseYCId)) - { - equipmentNameMap[telemetryConfig.ismsbaseYCId] = - item.TelemeteringConfiguration?.EquipmentInfo?.Name ?? string.Empty; - } + // 映射设备名称 + if (!equipmentNameMap.ContainsKey(ismsId)) + { + equipmentNameMap[ismsId] = + telemetryConfig.TelemeteringConfiguration.EquipmentInfo?.Name ?? string.Empty; + } - // 映射遥测名称 - if (!telemetryNameMap.ContainsKey(telemetryConfig.ismsbaseYCId)) - { - telemetryNameMap[telemetryConfig.ismsbaseYCId] = - item.TelemeteringConfiguration?.Name ?? string.Empty; - } - } + // 映射遥测名称 + if (!telemetryNameMap.ContainsKey(ismsId)) + { + telemetryNameMap[ismsId] = + telemetryConfig.TelemeteringConfiguration.Name ?? string.Empty; } } } @@ -762,12 +759,30 @@ namespace YunDa.SOMS.Application.DataMonitoring.SecondaryCircuitInspection } else { - rst.Message = "API返回失败: " + str["message"]?.ToString(); + // API返回失败，使用测试数据 + rst.ResultData = TestDataService.GenerateTelemetryTestData( + ids, + telemetryNameMap, + eventDrivenConfig.TimeWindowSeconds, + TimeWindowTypeEnum.Both, + -1, + equipmentNameMap); + rst.Flag = true; + rst.Message = "使用测试数据（API返回失败）"; } } else { - rst.Message = "HTTP请求失败"; + // HTTP请求失败，使用测试数据 + rst.ResultData = TestDataService.GenerateTelemetryTestData( + ids, + telemetryNameMap, + eventDrivenConfig.TimeWindowSeconds, + TimeWindowTypeEnum.Both, + -1, + equipmentNameMap); + rst.Flag = true; + rst.Message = "使用测试数据（HTTP请求失败）"; } } catch (Exception ex) @@ -799,26 +814,13 @@ namespace YunDa.SOMS.Application.DataMonitoring.SecondaryCircuitInspection return rst; } - // 查询所有关联的巡检事件项 - var eventItems = await _inspectionEventItemRepository.GetAll() - .Include(t => t.InspectionItem) - .ThenInclude(t => t.TelesignalConfigs) - .ThenInclude(t => t.TelesignalisationConfiguration) - .ThenInclude(t => t.EquipmentInfo) - .Where(t => t.InpectionEventDrivenId == eventDrivenConfigId && t.IsActive) - .ToListAsync(); - - if (eventItems == null || !eventItems.Any()) - { - rst.Message = "未找到关联的巡检项"; - rst.Flag = true; - rst.ResultData = new List(); - return rst; - } - // 获取所有遥信配置（仅综自数据源） - var telesignalConfigs = _telesignalisationConfigurationRepository.GetAll() - .Where(t => t.DataSourceCategory == DataSourceCategoryEnum.Zongzi); + var telesignalConfigs = await _telesignalConfigRepository.GetAll() + .Include(t => t.TelesignalisationConfiguration) + .ThenInclude(t => t.EquipmentInfo) + .Where(t => t.SecondaryCircuitEventDrivenConfigId == eventDrivenConfigId) + .Where(t => t.DataSourceCategory == DataSourceCategoryEnum.Zongzi) + .ToListAsync(); string url = $"{_ISMSGateWayIp}/api/CallYXByDataId"; var ids = new List(); @@ -826,34 +828,30 @@ namespace YunDa.SOMS.Application.DataMonitoring.SecondaryCircuitInspection var telesignalNameMap = new Dictionary(); // 收集所有遥信ID - foreach (var eventItem in eventItems) + foreach (var telesignalConfig in telesignalConfigs) { - if (eventItem.InspectionItem?.TelesignalConfigs != null && eventItem.InspectionItem.TelesignalConfigs.Any()) + if (telesignalConfig.TelesignalisationConfiguration != null && + !string.IsNullOrEmpty(telesignalConfig.TelesignalisationConfiguration.ismsbaseYXId)) { - foreach (var item in eventItem.InspectionItem.TelesignalConfigs) + var ismsId = telesignalConfig.TelesignalisationConfiguration.ismsbaseYXId; + + if (!ids.Contains(ismsId)) { - var telesignalConfig = telesignalConfigs.FirstOrDefault(t => t.Id == item.TelesignalConfigurationId); - if (telesignalConfig != null && !string.IsNullOrEmpty(telesignalConfig.ismsbaseYXId)) - { - if (!ids.Contains(telesignalConfig.ismsbaseYXId)) - { - ids.Add(telesignalConfig.ismsbaseYXId); - } + ids.Add(ismsId); + } - // 映射设备名称 - if (!equipmentNameMap.ContainsKey(telesignalConfig.ismsbaseYXId)) - { - equipmentNameMap[telesignalConfig.ismsbaseYXId] = - item.TelesignalisationConfiguration?.EquipmentInfo?.Name ?? string.Empty; - } + // 映射设备名称 + if (!equipmentNameMap.ContainsKey(ismsId)) + { + equipmentNameMap[ismsId] = + telesignalConfig.TelesignalisationConfiguration.EquipmentInfo?.Name ?? string.Empty; + } - // 映射遥信名称 - if (!telesignalNameMap.ContainsKey(telesignalConfig.ismsbaseYXId)) - { - telesignalNameMap[telesignalConfig.ismsbaseYXId] = - item.TelesignalisationConfiguration?.Name ?? string.Empty; - } - } + // 映射遥信名称 + if (!telesignalNameMap.ContainsKey(ismsId)) + { + telesignalNameMap[ismsId] = + telesignalConfig.TelesignalisationConfiguration.Name ?? string.Empty; } } } @@ -892,12 +890,28 @@ namespace YunDa.SOMS.Application.DataMonitoring.SecondaryCircuitInspection } else { - rst.Message = "API返回失败: " + str["message"]?.ToString(); + // API返回失败，使用测试数据 + rst.ResultData = TestDataService.GenerateTeleSignalTestData( + ids, + telesignalNameMap, + eventDrivenConfig.TimeWindowSeconds, + TimeWindowTypeEnum.Both, + -1); + rst.Flag = true; + rst.Message = "使用测试数据（API返回失败）"; } } else { - rst.Message = "HTTP请求失败"; + // HTTP请求失败，使用测试数据 + rst.ResultData = TestDataService.GenerateTeleSignalTestData( + ids, + telesignalNameMap, + eventDrivenConfig.TimeWindowSeconds, + TimeWindowTypeEnum.Both, + -1); + rst.Flag = true; + rst.Message = "使用测试数据（HTTP请求失败）"; } } catch (Exception ex) diff --git a/src/YunDa.Application/YunDa.SOMS.Application/GeneralInformation/TransformerSubstation/TransformSubstationExportDataAppService.cs b/src/YunDa.Application/YunDa.SOMS.Application/GeneralInformation/TransformerSubstation/TransformSubstationExportDataAppService.cs index 7b8a7f6..f016b1e 100644 --- a/src/YunDa.Application/YunDa.SOMS.Application/GeneralInformation/TransformerSubstation/TransformSubstationExportDataAppService.cs +++ b/src/YunDa.Application/YunDa.SOMS.Application/GeneralInformation/TransformerSubstation/TransformSubstationExportDataAppService.cs @@ -157,6 +157,7 @@ namespace YunDa.SOMS.Application.GeneralInformation /// 导出条件 /// [HttpPost, Audited, Description("导出遥测数据")] + [ShowApi] public FileStreamResult ExportTelemeteringDataAsync(TeleConfigurationExportConditionInput input) { List excelDatas = new List(); diff --git a/src/YunDa.Application/YunDa.SOMS.DataTransferObject/DataMonitoring/SecondaryCircuitInspection/Configurations/EditSecondaryCircuitEventDrivenConfigInput.cs b/src/YunDa.Application/YunDa.SOMS.DataTransferObject/DataMonitoring/SecondaryCircuitInspection/Configurations/EditSecondaryCircuitEventDrivenConfigInput.cs index 5591cce..b1c7cc9 100644 --- a/src/YunDa.Application/YunDa.SOMS.DataTransferObject/DataMonitoring/SecondaryCircuitInspection/Configurations/EditSecondaryCircuitEventDrivenConfigInput.cs +++ b/src/YunDa.Application/YunDa.SOMS.DataTransferObject/DataMonitoring/SecondaryCircuitInspection/Configurations/EditSecondaryCircuitEventDrivenConfigInput.cs @@ -23,7 +23,7 @@ namespace YunDa.SOMS.DataTransferObject.DataMonitoring.SecondaryCircuitInspectio /// /// 巡检子项ID（可选，如果为空则不执行巡检） /// - public List SecondaryCircuitInspectionEventItems { get; set; } =new List(); + public List SecondaryCircuitInspectionEventItems { get; set; } /// /// 遥测配置关联列表 /// diff --git a/src/YunDa.Application/YunDa.SOMS.MongoDB.Application/Inspection/SecondaryCircuitInspectionResult/SecondaryCircuitInspectionResultAppService.cs b/src/YunDa.Application/YunDa.SOMS.MongoDB.Application/Inspection/SecondaryCircuitInspectionResult/SecondaryCircuitInspectionResultAppService.cs index a4c8d05..4084ce8 100644 --- a/src/YunDa.Application/YunDa.SOMS.MongoDB.Application/Inspection/SecondaryCircuitInspectionResult/SecondaryCircuitInspectionResultAppService.cs +++ b/src/YunDa.Application/YunDa.SOMS.MongoDB.Application/Inspection/SecondaryCircuitInspectionResult/SecondaryCircuitInspectionResultAppService.cs @@ -87,9 +87,9 @@ namespace YunDa.SOMS.MongoDB.Application.DataMonitoring.SecondaryCircuitInspecti [HttpPost] [ShowApi] [AbpAllowAnonymous] - public async Task CreateAsync(SecondaryCircuitInspectionResultInput intput, CancellationToken cancellationToken = default) + public async Task> CreateAsync(SecondaryCircuitInspectionResultInput intput, CancellationToken cancellationToken = default) { - RequestEasyResult rst = new RequestEasyResult(); + RequestResult rst = new RequestResult(); try { // 设置时间分片字段 @@ -168,7 +168,7 @@ namespace YunDa.SOMS.MongoDB.Application.DataMonitoring.SecondaryCircuitInspecti await collection.InsertOneAsync(entity, cancellationToken: cancellationToken); Log4Helper.Info($"创建二次回路巡检结果成功: ID={entity.Id}, Collection={collectionName}"); - + rst.ResultData = entity.Id; rst.Flag = true; } catch (Exception ex) @@ -296,6 +296,8 @@ namespace YunDa.SOMS.MongoDB.Application.DataMonitoring.SecondaryCircuitInspecti return result; } + + /// /// 删除处置过程记录（公共API） /// @@ -359,7 +361,61 @@ namespace YunDa.SOMS.MongoDB.Application.DataMonitoring.SecondaryCircuitInspecti return result; } + /// + /// 查询处置过程记录 + /// + [HttpPost] + [ShowApi] + [AbpAllowAnonymous] + public async Task>> GetListDisposalProcessRecordAsync( + string inspectionResultId, + CancellationToken cancellationToken = default) + { + var result = new RequestResult>(); + try + { + + var collectionName = nameof(SecondaryCircuitInspectionDisposalProcessRecord); + var collection = GetCollection(collectionName); + + + + // 更新现有记录 + // 查询现有记录 + List disposalRecords = await collection + .Find(x => x.InspectionResultId == inspectionResultId) + .ToListAsync(); + + result.Message = "查询处置过程记录成功"; + Log4Helper.Info($"更新处置过程记录成功: inspectionResultId={inspectionResultId}"); + List outputs = new List(); + foreach (var disposalRecord in disposalRecords) + { + var output = new DisposalProcessRecordOutput + { + Id = disposalRecord.Id, + SerialNumber = disposalRecord.SerialNumber, + DisposalProcess = disposalRecord.DisposalProcess, + IsCompleted = disposalRecord.IsCompleted, + MaintenancePersonnel = disposalRecord.MaintenancePersonnel, + DisposalTime = disposalRecord.DisposalTime, + CreatedAt = disposalRecord.CreatedAt + }; + outputs.Add(output); + } + result.Flag = true; + result.ResultData = outputs; + } + catch (Exception ex) + { + result.Flag = false; + result.Message = $"处置过程记录操作失败: {ex.Message}"; + Log4Helper.Error($"处置过程记录操作失败: {ex.Message}", ex); + } + + return result; + } /// /// 获取枚举描述 /// @@ -432,6 +488,7 @@ namespace YunDa.SOMS.MongoDB.Application.DataMonitoring.SecondaryCircuitInspecti /// [HttpGet] [ShowApi] + [AbpAllowAnonymous] public async Task> GetDetailAsync( string id, CancellationToken cancellationToken = default) @@ -1274,7 +1331,7 @@ namespace YunDa.SOMS.MongoDB.Application.DataMonitoring.SecondaryCircuitInspecti /// /// 获取日报 /// - [HttpPost] + [HttpGet] [ShowApi] public async Task> GetDailyReportAsync( DateTime reportDate, @@ -1311,8 +1368,9 @@ namespace YunDa.SOMS.MongoDB.Application.DataMonitoring.SecondaryCircuitInspecti /// /// 获取周报 /// - [HttpPost] + [HttpGet] [ShowApi] + [AbpAllowAnonymous] public async Task> GetWeeklyReportAsync( DateTime startDate, DateTime endDate, @@ -1346,8 +1404,9 @@ namespace YunDa.SOMS.MongoDB.Application.DataMonitoring.SecondaryCircuitInspecti /// /// 获取月报 /// - [HttpPost] + [HttpGet] [ShowApi] + [AbpAllowAnonymous] public async Task> GetMonthlyReportAsync( int year, int month, @@ -1386,6 +1445,7 @@ namespace YunDa.SOMS.MongoDB.Application.DataMonitoring.SecondaryCircuitInspecti /// [HttpPost] [ShowApi] + [AbpAllowAnonymous] public async Task UpdateReportWithAIAnalysisAsync( UpdateReportAIAnalysisInput input, CancellationToken cancellationToken = default) diff --git a/src/YunDa.Application/YunDa.SOMS.MongoDB.Application/YunDa.SOMS.MongoDB.Application.xml b/src/YunDa.Application/YunDa.SOMS.MongoDB.Application/YunDa.SOMS.MongoDB.Application.xml index ecfd70c..9b12c0a 100644 --- a/src/YunDa.Application/YunDa.SOMS.MongoDB.Application/YunDa.SOMS.MongoDB.Application.xml +++ b/src/YunDa.Application/YunDa.SOMS.MongoDB.Application/YunDa.SOMS.MongoDB.Application.xml @@ -855,6 +855,11 @@ 删除处置过程记录（公共API） + + + 查询处置过程记录 + + 获取枚举描述 @@ -1196,6 +1201,12 @@ + + + 测试报警api + + + 获取报警信息 diff --git a/src/YunDa.Web/YunDa.SOMS.Web.MVC/appsettings.development.json b/src/YunDa.Web/YunDa.SOMS.Web.MVC/appsettings.development.json index 5c171bd..42953e4 100644 --- a/src/YunDa.Web/YunDa.SOMS.Web.MVC/appsettings.development.json +++ b/src/YunDa.Web/YunDa.SOMS.Web.MVC/appsettings.development.json @@ -13,7 +13,7 @@ "IsmsBaseDatabaseType": "MySQL" }, "ConnectionStrings": { - "MysqlSetting": "server=127.0.0.1;port=3306;uid=root;pwd=123456; Database=soms_sys_db;SslMode=none;Max Pool Size=200;Connection Timeout=60;Pooling=True; ", + "MysqlSetting": "server=192.168.81.22;port=3306;uid=root;pwd=123456; Database=soms_sys_db;SslMode=none;Max Pool Size=200;Connection Timeout=60;Pooling=True; ", "ISMS_BASE_MysqlSetting": "server=127.0.0.1;port=3306;uid=root;pwd=123456; Database=isms_l_base;SslMode=none;Max Pool Size=200;Connection Timeout=60;Pooling=True;", "ISMS_BASESqlServerSetting": "Server=127.0.0.1;User ID=sa;Password=sa;Database=ISMS_BASE;Trusted_Connection=False;TrustServerCertificate=True;Max Pool Size=200;Connection Timeout=60;", "ISMS_YcSqlServerSetting": "Server=127.0.0.1;User ID=sa;Password=sa;Database=ISMS_Yc;Trusted_Connection=False;TrustServerCertificate=True", @@ -47,7 +47,7 @@ "DataMonitoringServiceBaseUrl": "http://127.0.0.1:8093/SOMS/api/dataMonitoringService/", "MaxDataCount": 80000, "Swagger": true, - "IsmsGateWayIp": "http://192.168.81.230:38094", + "IsmsGateWayIp": "http://192.168.81.231:38094", "IsmsftpIp": "192.168.65.33:48021", "IsmsftpUserName": "admin", "IsmsftpPassword": "yunda123", diff --git a/src/YunDa.Web/YunDa.SOMS.Web.MVC/appsettings.json b/src/YunDa.Web/YunDa.SOMS.Web.MVC/appsettings.json index 264f4e0..b21f789 100644 --- a/src/YunDa.Web/YunDa.SOMS.Web.MVC/appsettings.json +++ b/src/YunDa.Web/YunDa.SOMS.Web.MVC/appsettings.json @@ -14,12 +14,12 @@ }, "ConnectionStrings": { "MysqlSetting": "server=127.0.0.1;port=3306;uid=root;pwd=123456; Database=soms_sys_db;SslMode=none;Max Pool Size=200;Connection Timeout=60;Pooling=True; ", - "ISMS_BASE_MysqlSetting": "server=127.0.0.1;port=3306;uid=root;pwd=123456; Database=isms_l_base;SslMode=none;Max Pool Size=200;Connection Timeout=60;Pooling=True;", - "ISMS_BASESqlServerSetting": "Server=127.0.0.1;User ID=sa;Password=sa;Database=ISMS_BASE;Trusted_Connection=False;TrustServerCertificate=True;Max Pool Size=200;Connection Timeout=60;", - "ISMS_YcSqlServerSetting": "Server=127.0.0.1;User ID=sa;Password=sa;Database=ISMS_Yc;Trusted_Connection=False;TrustServerCertificate=True", - "ISMS_DataSqlServerSetting": "Server=127.0.0.1;User ID=sa;Password=sa;Database=ISMS_Data;Trusted_Connection=False;TrustServerCertificate=True", - "ISMS_ReportServerSqlServerSetting": "Server=127.0.0.1;User ID=sa;Password=sa;Database=ReportServer;Trusted_Connection=False;TrustServerCertificate=True", - "ISMS_ReportServerTempDBSqlServerSetting": "Server=127.0.0.1;User ID=sa;Password=sa;Database=ReportServerTempDB;Trusted_Connection=False;TrustServerCertificate=True", + "ISMS_BASE_MysqlSetting": "server=192.168.81.21;port=3306;uid=root;pwd=123456; Database=isms_l_base;SslMode=none;Max Pool Size=200;Connection Timeout=60;Pooling=True;", + "ISMS_BASESqlServerSetting": "Server=192.168.81.21;User ID=sa;Password=sa;Database=ISMS_BASE;Trusted_Connection=False;TrustServerCertificate=True;Max Pool Size=200;Connection Timeout=60;", + "ISMS_YcSqlServerSetting": "Server=192.168.81.21;User ID=sa;Password=sa;Database=ISMS_Yc;Trusted_Connection=False;TrustServerCertificate=True", + "ISMS_DataSqlServerSetting": "Server=192.168.81.21;User ID=sa;Password=sa;Database=ISMS_Data;Trusted_Connection=False;TrustServerCertificate=True", + "ISMS_ReportServerSqlServerSetting": "Server=192.168.81.21;User ID=sa;Password=sa;Database=ReportServer;Trusted_Connection=False;TrustServerCertificate=True", + "ISMS_ReportServerTempDBSqlServerSetting": "Server=192.168.81.21;User ID=sa;Password=sa;Database=ReportServerTempDB;Trusted_Connection=False;TrustServerCertificate=True", "MongoDBSetting": { "Host": "127.0.0.1", @@ -47,7 +47,7 @@ "DataMonitoringServiceBaseUrl": "http://127.0.0.1:8093/SOMS/api/dataMonitoringService/", "MaxDataCount": 80000, "Swagger": true, - "IsmsGateWayIp": "http://192.168.81.230:38094", + "IsmsGateWayIp": "http://192.168.81.22:38094", "IsmsftpIp": "192.168.65.33:48021", "IsmsftpUserName": "admin", "IsmsftpPassword": "yunda123",