Merge pull request 'dev_lx' (#42) from dev_lx into main

Reviewed-on: #42

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("大华报警事件订阅回调处理失败，参数不能为空");

WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/Common.Shared.Application.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 <PropertyGroup>
   <PackageId>Common.Shared.Application</PackageId>
-  <Version>5.1</Version>
+  <Version>5.2</Version>
   <Authors>zrh-lx</Authors>
   <Company>zrh-lx</Company> <!-- 可选 -->
   <Description>包含所有公共使用的 DTO、契约、接口模型等，供微服务之间共享使用</Description>

WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/SafetyFirePro/RequestDto/SunPlaceBoardWorkOrderReqDto.cs

@@ -110,6 +110,13 @@ namespace Common.Shared.Application.SafetyFirePro.RequestDto
         /// <remarks>必填项</remarks>
         [JsonPropertyName("ubpid")]
         public string? Ubpid { get; set; }
+
+        /// <summary>
+        /// 作业活动所在区域id，查询区域本级及子子孙孙数据，
+        /// </summary>
+        /// <example>8888</example>
+        [JsonPropertyName("p_region_id")]
+        public int? P_Region_Id { get; set; }
     }
 
     /// <summary>

WeiCloud.Fusion/ThirdPartyServices/ThirdPartyServices.DomainService/PuCe/SunPlaceBoardWorkOrderService.cs

@@ -79,7 +79,7 @@ namespace ThirdPartyServices.DomainService.PuCe
         /// <returns></returns>
         public async Task<ApiResult<List<WorkOrderTimelineDto>>> GetTimelineListByOrderId(string orderId)
         {
-            ApiResult<List<WorkOrderTimelineDto>> result = new ApiResult<List<WorkOrderTimelineDto>>() { Code = 200, Msg = "调用接口成功" };
+            ApiResult<List<WorkOrderTimelineDto>> result = new() { Code = 200, Msg = "调用接口成功" };
 
             var url = $"https://zrh.hservices.online/prod-api/yzs/timeline/getTimelineListByOrderId?orderId={orderId}";
 

WeiCloud.Fusion/ThirdPartyServices/ThirdPartyServices.DomainService/PuTianSuYuan/SunPalaceBoardFacilityService.cs

@@ -19,7 +19,7 @@ namespace ThirdPartyServices.DomainService.PuTianSuYuan
 
         public async Task<ApiResult<List<AssetOverviewResDto>>> GetAssetDashboardEchart(SecSituationQueryDto dto)
         {
-            ApiResult<List<AssetOverviewResDto>> result = new ApiResult<List<AssetOverviewResDto>>() { Code = 200, Msg = "接口调用成功" };
+            ApiResult<List<AssetOverviewResDto>> result = new ApiResult<List<AssetOverviewResDto>>() { Code = 200, Msg = "接口调用成功", Data = [] };
 
             DateTime start = DateTime.Now;
             DateTime end = DateTime.Now;
@@ -151,7 +151,7 @@ namespace ThirdPartyServices.DomainService.PuTianSuYuan
         /// <exception cref="NotImplementedException"></exception>
         public async Task<ApiResult<List<AssetTypeResDto>>> GetAssetTypeEchart(SecSituationQueryDto dto)
         {
-            ApiResult<List<AssetTypeResDto>> result = new ApiResult<List<AssetTypeResDto>>() { Code = 200, Msg = "接口调用成功" };
+            ApiResult<List<AssetTypeResDto>> result = new ApiResult<List<AssetTypeResDto>>() { Code = 200, Msg = "接口调用成功", Data = [] };
 
             DateTime start = DateTime.Now;
             DateTime end = DateTime.Now;

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
+    }
+  }
+}