diff --git a/WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/SafetyFirePro/RequestDto/SunPlaceBoardWorkOrderReqDto.cs b/WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/SafetyFirePro/RequestDto/SunPlaceBoardWorkOrderReqDto.cs index 3321d8f..75c15b3 100644 --- a/WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/SafetyFirePro/RequestDto/SunPlaceBoardWorkOrderReqDto.cs +++ b/WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/SafetyFirePro/RequestDto/SunPlaceBoardWorkOrderReqDto.cs @@ -169,8 +169,8 @@ namespace Common.Shared.Application.SafetyFirePro.RequestDto public int Total { get; set; } /// - /// + /// 类型名：0待核查，1待整改，2待验收，3治理完毕，4不是隐患， /// - public string Name { get; set; } + public required string Name { get; set; } } } \ No newline at end of file diff --git a/WeiCloud.Fusion/ThirdPartyServices/ThirdPartyServices.API/Controllers/ShenZhouShengAn/SunPalaceBoardSafetyController.cs b/WeiCloud.Fusion/ThirdPartyServices/ThirdPartyServices.API/Controllers/ShenZhouShengAn/SunPalaceBoardSafetyController.cs index 91655c6..9009b54 100644 --- a/WeiCloud.Fusion/ThirdPartyServices/ThirdPartyServices.API/Controllers/ShenZhouShengAn/SunPalaceBoardSafetyController.cs +++ b/WeiCloud.Fusion/ThirdPartyServices/ThirdPartyServices.API/Controllers/ShenZhouShengAn/SunPalaceBoardSafetyController.cs @@ -132,10 +132,10 @@ namespace ThirdPartyServices.API.Controllers.ShenZhouShengAn /// 获得本月隐患数据 /// /// - [HttpGet] - public async Task>> GetDangerHome() + [HttpPost] + public async Task>> GetDangerHome(DangerInfoQueryDto dto) { - return await _secSituationService.GetDangerHome(); + return await _secSituationService.GetDangerHome(dto); } } } \ No newline at end of file diff --git a/WeiCloud.Fusion/ThirdPartyServices/ThirdPartyServices.DomainService/ShenZhouShengAn/ISunPalaceBoardSafetyService.cs b/WeiCloud.Fusion/ThirdPartyServices/ThirdPartyServices.DomainService/ShenZhouShengAn/ISunPalaceBoardSafetyService.cs index c222557..e8846c3 100644 --- a/WeiCloud.Fusion/ThirdPartyServices/ThirdPartyServices.DomainService/ShenZhouShengAn/ISunPalaceBoardSafetyService.cs +++ b/WeiCloud.Fusion/ThirdPartyServices/ThirdPartyServices.DomainService/ShenZhouShengAn/ISunPalaceBoardSafetyService.cs @@ -42,6 +42,6 @@ namespace ThirdPartyServices.DomainService.ShenZhouShengAn Task>> GetStatistics(WorkTaskQueryParamsDto dto); - Task>> GetDangerHome(); + Task>> GetDangerHome(DangerInfoQueryDto regionId); } } \ No newline at end of file diff --git a/WeiCloud.Fusion/ThirdPartyServices/ThirdPartyServices.DomainService/ShenZhouShengAn/SunPalaceBoardSafetyService.cs b/WeiCloud.Fusion/ThirdPartyServices/ThirdPartyServices.DomainService/ShenZhouShengAn/SunPalaceBoardSafetyService.cs index 5346348..d7b72b7 100644 --- a/WeiCloud.Fusion/ThirdPartyServices/ThirdPartyServices.DomainService/ShenZhouShengAn/SunPalaceBoardSafetyService.cs +++ b/WeiCloud.Fusion/ThirdPartyServices/ThirdPartyServices.DomainService/ShenZhouShengAn/SunPalaceBoardSafetyService.cs @@ -1,6 +1,7 @@ using Common.Shared.Application.BaseModels; using Common.Shared.Application.SafetyFirePro.RequestDto; using Common.Shared.Application.SafetyFirePro.ResponseDto; +using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; using System.Text.Json; @@ -211,13 +212,6 @@ namespace ThirdPartyServices.DomainService.ShenZhouShengAn return ApiResult.IsFail("GetDangerInfos接口获取用户配置失败"); } - //获取单位信息 - HttpClientResult branchs = await _tokenProviderService.GetBranchPermissions(token, loginUsers.Data.Uid); - if (branchs.Code == "Error") - { - _logger.LogWarning("GetDangerInfos接口获取单位信息失败"); - return ApiResult.IsFail("GetDangerInfos接口获取单位信息失败"); - } dto.Ubpid = loginUsers.Data.Ubpid; // dto.Branch_id = branchs.Data.BranchPermissionIds[0]; @@ -651,69 +645,44 @@ namespace ThirdPartyServices.DomainService.ShenZhouShengAn ]; } - public async Task>> GetDangerHome() + /// + /// 获取 + /// + /// + /// + public async Task>> GetDangerHome(DangerInfoQueryDto dto) { - ApiResult> result = new ApiResult>() { Code = 200, Msg = "接口调用成功", Data = [] }; + ApiResult> result = new ApiResult>() { Code = 200, Msg = "接口调用成功", Data = new List() }; - try + Dictionary statusTotal = new Dictionary { - //获取token - var token = await _tokenProviderService.GetTokenAsync(_configuration["ThirdParty:SzdunanCode"]!); - if (string.IsNullOrWhiteSpace(token)) - { - _logger.LogWarning("GetRegionRootInfo接口获取token失败"); - return ApiResult>.IsFail("GetRegionRootInfo接口获取token失败"); - } + { "待核查隐患数", 0 }, + { "待整改隐患数", 0 }, + { "待验收隐患数", 0 }, + { "整改完毕隐患数", 0 } + }; - //获取用户配置 - HttpClientResult loginUsers = await _tokenProviderService.GetUserConfiguration(token); - if (loginUsers.Code == "Error") + foreach (var item in statusTotal) + { + dto.Status = item.Key switch { - _logger.LogWarning("GetRegionRootInfo接口获取用户配置失败"); - return ApiResult>.IsFail("GetRegionRootInfo接口获取用户配置失败"); - } - Params dto = new(); - dto.Ubpid = loginUsers.Data.Ubpid; - - HttpClientResult riskResult = await _tokenProviderService - .SendAndParseAsync>( - "https://zrh.szdunan.cn/v1/api/home/danger", - token, dto, HttpMethod.Get); + "待核查隐患数" => "0", + "待整改隐患数" => "1", + "待验收隐患数" => "2", + "整改完毕隐患数" => "3", + _ => "" + }; + var dangerInfo = await this.GetDangerInfos(dto); - if (riskResult != null && riskResult.Data != null && riskResult.Data.ToString()!.Length > 10) + if (dangerInfo.Data != null) { - DangerStatsRootResDto httpClientResult = JsonSerializer.Deserialize(riskResult.Data.ToString()!)!; - if (httpClientResult != null) + result.Data.Add(new DangerHomeResDto { - // 定义固定的状态名称（顺序必须与dangerStatusCount数组一致） - var statusNames = new List - { - "待核查隐患数", - "待整改隐患数", - "待验收隐患数", - "整改完毕隐患数" - }; - - // 构建结果集合（处理数组长度不匹配的情况） - var resultItem = new List(); - for (int i = 0; i < statusNames.Count; i++) - { - resultItem.Add(new DangerHomeResDto - { - Name = statusNames[i], - Total = httpClientResult?.DangerStatusCount?.ElementAtOrDefault(i) ?? 0 - }); - } - - result.Data = resultItem; - } + Name = item.Key, + Total = dangerInfo.Data.Total + }); } } - catch (Exception ex) - { - _logger.LogWarning(ex, "GetRegionRootInfo接口出错"); - return ApiResult>.IsFail($"GetRegionRootInfo接口出错{ex.Message}"); - } return result; } diff --git a/WeiCloud.Fusion/VideoService/Video.API/Controllers/DaHua/VideoManageController.cs b/WeiCloud.Fusion/VideoService/Video.API/Controllers/DaHua/VideoManageController.cs index 0633816..176c235 100644 --- a/WeiCloud.Fusion/VideoService/Video.API/Controllers/DaHua/VideoManageController.cs +++ b/WeiCloud.Fusion/VideoService/Video.API/Controllers/DaHua/VideoManageController.cs @@ -179,7 +179,7 @@ namespace Video.API.Controllers.DaHua /// 视频id /// [HttpGet("dh/snapshot")] - public async Task> InvokeSnapshot(string deviceCode, long id, int channelId) + public async Task> InvokeSnapshot(string deviceCode, long id, int channelId = 0) { return await _dahGeneralCtlService.InvokeSnapshot(deviceCode, id, channelId); } diff --git a/WeiCloud.Fusion/VideoService/Video.API/appsettings.json b/WeiCloud.Fusion/VideoService/Video.API/appsettings.json index 45fd41c..55f564f 100644 --- a/WeiCloud.Fusion/VideoService/Video.API/appsettings.json +++ b/WeiCloud.Fusion/VideoService/Video.API/appsettings.json @@ -30,6 +30,7 @@ "Real": { "DefaultRoot": "192.168.21.18:9102", "DefaultReplace": "demo.weienergy.cn:15235", + "websocket": "5443", "Overrides": { "192.168.21.18:9100": "demo.weienergy.cn:15235", "10.20.30.40:9100": "demo.weienergy.cn:15235" @@ -38,6 +39,7 @@ "Time": { "DefaultRoot": "192.168.21.18:9322", "DefaultReplace": "demo.weienergy.cn:15232", + "websocket": "5444", "Overrides": { "192.168.21.18:9320": "demo.weienergy.cn:15232" }