From 59deea6f4ea2515633d6c900b886bc208d487cf4 Mon Sep 17 00:00:00 2001 From: LiuXin Date: Mon, 1 Dec 2025 18:47:23 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=8D=B1=E9=99=A9=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Common.Shared.Application.csproj | 2 +- .../RequestDto/SunPlaceBoardWorkOrderReqDto.cs | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/Common.Shared.Application.csproj b/WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/Common.Shared.Application.csproj index 2329a45..fcaec7c 100644 --- a/WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/Common.Shared.Application.csproj +++ b/WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/Common.Shared.Application.csproj @@ -7,7 +7,7 @@ Common.Shared.Application - 5.1 + 5.2 zrh-lx zrh-lx 包含所有公共使用的 DTO、契约、接口模型等，供微服务之间共享使用 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 4a792c9..48b60a6 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 @@ -110,6 +110,13 @@ namespace Common.Shared.Application.SafetyFirePro.RequestDto /// 必填项 [JsonPropertyName("ubpid")] public string? Ubpid { get; set; } + + /// + /// 作业活动所在区域id，查询区域本级及子子孙孙数据， + /// + /// 8888 + [JsonPropertyName("p_region_id")] + public int? P_Region_Id { get; set; } } /// From 8c084e165602594b36f5c26aff67087570e18fe0 Mon Sep 17 00:00:00 2001 From: LiuXin Date: Fri, 5 Dec 2025 15:16:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UCPlatform.API/.config/dotnet-tools.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 WeiCloud.Fusion/UC_PlatformServices/UCPlatform.API/.config/dotnet-tools.json diff --git a/WeiCloud.Fusion/UC_PlatformServices/UCPlatform.API/.config/dotnet-tools.json b/WeiCloud.Fusion/UC_PlatformServices/UCPlatform.API/.config/dotnet-tools.json new file mode 100644 index 0000000..0d6d304 --- /dev/null +++ b/WeiCloud.Fusion/UC_PlatformServices/UCPlatform.API/.config/dotnet-tools.json @@ -0,0 +1,13 @@ +{ + "version": 1, + "isRoot": true, + "tools": { + "dotnet-ef": { + "version": "10.0.0", + "commands": [ + "dotnet-ef" + ], + "rollForward": false + } + } +} \ No newline at end of file From a80bb17b3acfe1a88c459419e20f35f25d401ddb Mon Sep 17 00:00:00 2001 From: LiuXin Date: Mon, 15 Dec 2025 14:06:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E4=B8=8D=E7=AC=A6=E5=90=88=E8=A7=84=E8=8C=83=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Alarm.DomainService/DahAlarm/DahuaGeneralCtlService.cs | 2 +- .../PuCe/SunPlaceBoardWorkOrderService.cs | 2 +- .../PuTianSuYuan/SunPalaceBoardFacilityService.cs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/DahuaGeneralCtlService.cs b/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/DahuaGeneralCtlService.cs index de0ecd1..9de89c2 100644 --- a/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/DahuaGeneralCtlService.cs +++ b/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/DahuaGeneralCtlService.cs @@ -196,7 +196,7 @@ namespace Alarm.DomainService.DahAlarm { if (dto is null) { - result.Code = "500"; + result.Code = "2005"; result.Msg = "请求参数不能为空"; result.Data = false; _logger.LogWarning("大华报警事件订阅回调处理失败，参数不能为空"); diff --git a/WeiCloud.Fusion/ThirdPartyServices/ThirdPartyServices.DomainService/PuCe/SunPlaceBoardWorkOrderService.cs b/WeiCloud.Fusion/ThirdPartyServices/ThirdPartyServices.DomainService/PuCe/SunPlaceBoardWorkOrderService.cs index afbb93e..933bbaa 100644 --- a/WeiCloud.Fusion/ThirdPartyServices/ThirdPartyServices.DomainService/PuCe/SunPlaceBoardWorkOrderService.cs +++ b/WeiCloud.Fusion/ThirdPartyServices/ThirdPartyServices.DomainService/PuCe/SunPlaceBoardWorkOrderService.cs @@ -79,7 +79,7 @@ namespace ThirdPartyServices.DomainService.PuCe /// public async Task>> GetTimelineListByOrderId(string orderId) { - ApiResult> result = new ApiResult>() { Code = 200, Msg = "调用接口成功" }; + ApiResult> result = new() { Code = 200, Msg = "调用接口成功" }; var url = $"https://zrh.hservices.online/prod-api/yzs/timeline/getTimelineListByOrderId?orderId={orderId}"; diff --git a/WeiCloud.Fusion/ThirdPartyServices/ThirdPartyServices.DomainService/PuTianSuYuan/SunPalaceBoardFacilityService.cs b/WeiCloud.Fusion/ThirdPartyServices/ThirdPartyServices.DomainService/PuTianSuYuan/SunPalaceBoardFacilityService.cs index 47d7c2b..c4fcfea 100644 --- a/WeiCloud.Fusion/ThirdPartyServices/ThirdPartyServices.DomainService/PuTianSuYuan/SunPalaceBoardFacilityService.cs +++ b/WeiCloud.Fusion/ThirdPartyServices/ThirdPartyServices.DomainService/PuTianSuYuan/SunPalaceBoardFacilityService.cs @@ -19,7 +19,7 @@ namespace ThirdPartyServices.DomainService.PuTianSuYuan public async Task>> GetAssetDashboardEchart(SecSituationQueryDto dto) { - ApiResult> result = new ApiResult>() { Code = 200, Msg = "接口调用成功" }; + ApiResult> result = new ApiResult>() { Code = 200, Msg = "接口调用成功", Data = [] }; DateTime start = DateTime.Now; DateTime end = DateTime.Now; @@ -151,7 +151,7 @@ namespace ThirdPartyServices.DomainService.PuTianSuYuan /// public async Task>> GetAssetTypeEchart(SecSituationQueryDto dto) { - ApiResult> result = new ApiResult>() { Code = 200, Msg = "接口调用成功" }; + ApiResult> result = new ApiResult>() { Code = 200, Msg = "接口调用成功", Data = [] }; DateTime start = DateTime.Now; DateTime end = DateTime.Now;