修改接口

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

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

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

@@ -96,13 +96,6 @@ namespace Common.Shared.Application.SafetyFirePro.RequestDto
         [JsonPropertyName("status")]
         public string? Status { get; set; }
 
-        /// <summary>
-        /// 作业单位部门id
-        /// </summary>
-        /// <example>8888</example>
-        [JsonPropertyName("branch_id")]
-        public int? BranchId { get; set; }
-
         /// <summary>
         /// 作业活动所在区域id
         /// </summary>

WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/SafetyFirePro/ResponseDto/SunPlaceBoardWorkOrderResDto.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 
@@ -231,14 +232,11 @@ namespace Common.Shared.Application.SafetyFirePro.ResponseDto
     /// <summary>
     /// 工单时间轴实体类
     /// </summary>
+    /// <summary>
+    /// 工单时间轴节点实体（data数组元素）
+    /// </summary>
     public class WorkOrderTimelineDto
     {
-        /// <summary>
-        /// 工单id
-        /// </summary>
-        [JsonPropertyName("orderId")]
-        public long? OrderId { get; set; }
-
         /// <summary>
         /// 时间轴id
         /// </summary>
@@ -246,45 +244,491 @@ namespace Common.Shared.Application.SafetyFirePro.ResponseDto
         public long? TimelineId { get; set; }
 
         /// <summary>
-        /// 节点类型
+        /// 节点类型（示例："办结工单"、"登记派发工单"）
         /// </summary>
         [JsonPropertyName("nodeType")]
         public string? NodeType { get; set; }
 
         /// <summary>
-        /// 节点描述
+        /// 节点描述（示例："办结工单，单号：2350"、"保洁"）
         /// </summary>
         [JsonPropertyName("nodeDesc")]
         public string? NodeDesc { get; set; }
 
         /// <summary>
-        /// 处理图片路径
+        /// 节点详情（示例："【管理员】办结工单，单号：2350"）
+        /// </summary>
+        [JsonPropertyName("nodeDetail")]
+        public string? NodeDetail { get; set; }
+
+        /// <summary>
+        /// 处理图片路径（可为null，无图片时返回null）
         /// </summary>
         [JsonPropertyName("nodeImg")]
         public string? NodeImg { get; set; }
 
         /// <summary>
-        /// 处理视频路径
+        /// 处理视频路径（可为null，无视频时返回null）
         /// </summary>
         [JsonPropertyName("nodeMp4")]
         public string? NodeMp4 { get; set; }
 
         /// <summary>
-        /// 工单状态
+        /// 创建人ID
+        /// </summary>
+        [JsonPropertyName("createBy")]
+        public long? CreateBy { get; set; }
+
+        /// <summary>
+        /// 创建时间（JSON格式："yyyy-MM-dd HH:mm:ss"）
+        /// </summary>
+        [JsonPropertyName("createTime")]
+        [JsonConverter(typeof(FixedPatternDateTimeConverter))]
+        public DateTime? CreateTime { get; set; }
+
+        /// <summary>
+        /// 工单状态（示例："11"表示办结，"1"表示已派发）
         /// </summary>
         [JsonPropertyName("status")]
         public string? Status { get; set; }
 
         /// <summary>
-        /// 创建人
+        /// 工单id
         /// </summary>
-        [JsonPropertyName("createBy")]
-        public long? CreateBy { get; set; }
+        [JsonPropertyName("orderId")]
+        public long? OrderId { get; set; }
 
         /// <summary>
-        /// 创建时间
+        /// 操作人员姓名（示例："管理员"）
         /// </summary>
-        [JsonPropertyName("createTime")]
-        public DateTime? CreateTime { get; set; }
+        [JsonPropertyName("operaterName")]
+        public string? OperaterName { get; set; }
+
+        /// <summary>
+        /// 节点颜色（示例："#909399"、"#E6A23C"，用于前端显示）
+        /// </summary>
+        [JsonPropertyName("nodeColor")]
+        public string? NodeColor { get; set; }
+
+        /// <summary>
+        /// 效率评分（可为null，无评分时返回null）
+        /// </summary>
+        [JsonPropertyName("assessScoreXl")]
+        public decimal? AssessScoreXl { get; set; }
+
+        /// <summary>
+        /// 服务评分（可为null，无评分时返回null）
+        /// </summary>
+        [JsonPropertyName("assessScoreFw")]
+        public decimal? AssessScoreFw { get; set; }
+
+        /// <summary>
+        /// 质量评分（可为null，无评分时返回null）
+        /// </summary>
+        [JsonPropertyName("assessScoreZl")]
+        public decimal? AssessScoreZl { get; set; }
+
+        /// <summary>
+        /// 评价内容（可为null，无评价时返回null）
+        /// </summary>
+        [JsonPropertyName("assessContent")]
+        public string? AssessContent { get; set; }
+    }
+
+    #region 危险施工作业响应体
+
+    public class LedgerDto
+    {
+        /// <summary>
+        /// 当前页码
+        /// </summary>
+        [JsonPropertyName("current_page")]
+        public int CurrentPage { get; set; }
+
+        /// <summary>
+        /// 符合查询条件的数据总数
+        /// </summary>
+        [JsonPropertyName("total")]
+        public int Total { get; set; }
+
+        /// <summary>
+        /// 作业票列表
+        /// </summary>
+        [JsonPropertyName("data")]
+        public List<WorkTicket> Data { get; set; }
+    }
+
+    public class WorkTicket
+    {
+        /// <summary>
+        /// 作业详细地点
+        /// </summary>
+        [JsonPropertyName("address")]
+        public string Address { get; set; }
+
+        /// <summary>
+        /// 作业票申请信息
+        /// </summary>
+        [JsonPropertyName("applicant_info")]
+        public ApplicantInfo ApplicantInfo { get; set; }
+
+        /// <summary>
+        /// 作业票审批过程信息
+        /// </summary>
+        [JsonPropertyName("approval_tasks")]
+        public List<ApprovalTask> ApprovalTasks { get; set; }
+
+        /// <summary>
+        /// 作业活动部门信息
+        /// </summary>
+        [JsonPropertyName("branch")]
+        public Branch Branch { get; set; }
+
+        /// <summary>
+        /// 作业活动内容
+        /// </summary>
+        [JsonPropertyName("content")]
+        public string Content { get; set; }
+
+        /// <summary>
+        /// 作业教育人信息
+        /// </summary>
+        [JsonPropertyName("education_info")]
+        public EducationInfo EducationInfo { get; set; }
+
+        /// <summary>
+        /// 计划结束时间
+        /// </summary>
+        [JsonPropertyName("end_at")]
+        public string EndAt { get; set; }
+
+        /// <summary>
+        /// 实际结束时间
+        /// </summary>
+        [JsonPropertyName("finish_time")]
+        public string FinishTime { get; set; }
+
+        /// <summary>
+        /// 作业ID
+        /// </summary>
+        [JsonPropertyName("id")]
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 作业名称
+        /// </summary>
+        [JsonPropertyName("name")]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 作业编号
+        /// </summary>
+        [JsonPropertyName("number")]
+        public string Number { get; set; }
+
+        /// <summary>
+        /// 作业人员信息
+        /// </summary>
+        [JsonPropertyName("operators")]
+        public List<Operator> Operators { get; set; }
+
+        /// <summary>
+        /// 作业负责人信息
+        /// </summary>
+        [JsonPropertyName("principal_info")]
+        public PrincipalInfo PrincipalInfo { get; set; }
+
+        /// <summary>
+        /// 实际开始作业时间
+        /// </summary>
+        [JsonPropertyName("real_start_at")]
+        public string RealStartAt { get; set; }
+
+        /// <summary>
+        /// 作业地点id
+        /// </summary>
+        [JsonPropertyName("region_id")]
+        public int RegionId { get; set; }
+
+        /// <summary>
+        /// 作业地点信息
+        /// </summary>
+        [JsonPropertyName("region")]
+        public Region Region { get; set; }
+
+        /// <summary>
+        /// 作业检查信息
+        /// </summary>
+        [JsonPropertyName("Supervises")]
+        public List<Supervise> Supervises { get; set; }
+
+        /// <summary>
+        /// 作业计划开始时间
+        /// </summary>
+        [JsonPropertyName("start_at")]
+        public string StartAt { get; set; }
+
+        /// <summary>
+        /// 作业状态
+        /// 1待审批，2待作业前检查，3作业中，4抽作业前检查，6作业结束，
+        /// 7延期结束，8超时结束，11审批不通过，12作业中止，13强行结束
+        /// </summary>
+        [JsonPropertyName("status")]
+        public int Status { get; set; }
+
+        /// <summary>
+        /// 作业类型
+        /// 1动火，2高处，3受限空间，4临时用电，5盲板抽堵，
+        /// 6断路，7动土吊装，8吊装，9爆破
+        /// </summary>
+        [JsonPropertyName("type")]
+        public int Type { get; set; }
+    }
+
+    public class ApplicantInfo
+    {
+        /// <summary>
+        /// 申请ID
+        /// </summary>
+        [JsonPropertyName("id")]
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 申请人id
+        /// </summary>
+        [JsonPropertyName("uid")]
+        public int Uid { get; set; }
+
+        /// <summary>
+        /// 申请人姓名
+        /// </summary>
+        [JsonPropertyName("name")]
+        public string Name { get; set; }
+    }
+
+    public class ApprovalTask
+    {
+        /// <summary>
+        /// 审批ID
+        /// </summary>
+        [JsonPropertyName("id")]
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 审批意见
+        /// </summary>
+        [JsonPropertyName("infos")]
+        public string Infos { get; set; }
+
+        /// <summary>
+        /// 审批状态 0待审批，1同意，2不同意
+        /// </summary>
+        [JsonPropertyName("status")]
+        public int Status { get; set; }
+
+        /// <summary>
+        /// 审批人信息
+        /// </summary>
+        [JsonPropertyName("user")]
+        public ApprovalUser User { get; set; }
+    }
+
+    public class ApprovalUser
+    {
+        /// <summary>
+        /// 审批人附加信息
+        /// </summary>
+        [JsonPropertyName("extras")]
+        public Extras Extras { get; set; }
+
+        /// <summary>
+        /// 审批人所在部门
+        /// </summary>
+        [JsonPropertyName("branch")]
+        public List<UserBranchWrapper> Branch { get; set; }
+    }
+
+    public class Extras
+    {
+        /// <summary>
+        /// 审批人姓名
+        /// </summary>
+        [JsonPropertyName("name")]
+        public string Name { get; set; }
+    }
+
+    public class UserBranchWrapper
+    {
+        [JsonPropertyName("Branch")]
+        public Branch Branch { get; set; }
+    }
+
+    public class Branch
+    {
+        /// <summary>
+        /// 部门ID
+        /// </summary>
+        [JsonPropertyName("id")]
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 部门名称
+        /// </summary>
+        [JsonPropertyName("name")]
+        public string Name { get; set; }
+    }
+
+    public class EducationInfo
+    {
+        /// <summary>
+        /// 作业教育人姓名
+        /// </summary>
+        [JsonPropertyName("name")]
+        public string Name { get; set; }
+    }
+
+    public class Operator
+    {
+        /// <summary>
+        /// 作业人信息
+        /// </summary>
+        [JsonPropertyName("user_info")]
+        public UserInfo UserInfo { get; set; }
+    }
+
+    public class PrincipalInfo
+    {
+        /// <summary>
+        /// 作业负责人姓名
+        /// </summary>
+        [JsonPropertyName("name")]
+        public string Name { get; set; }
+    }
+
+    public class Region
+    {
+        /// <summary>
+        /// 作业地点名称
+        /// </summary>
+        [JsonPropertyName("name")]
+        public string Name { get; set; }
+    }
+
+    public class Supervise
+    {
+        /// <summary>
+        /// 作业检查时间
+        /// </summary>
+        [JsonPropertyName("check_at")]
+        public string CheckAt { get; set; }
+
+        /// <summary>
+        /// 检查情况说明
+        /// </summary>
+        [JsonPropertyName("infos")]
+        public string Infos { get; set; }
+
+        /// <summary>
+        /// 安全措施及检查情况
+        /// </summary>
+        [JsonPropertyName("measure_check_content")]
+        public List<MeasureCheckContent> MeasureCheckContent { get; set; }
+
+        /// <summary>
+        /// 气温
+        /// </summary>
+        [JsonPropertyName("temperature")]
+        public string Temperature { get; set; }
+
+        /// <summary>
+        /// 检查人信息
+        /// </summary>
+        [JsonPropertyName("user_info")]
+        public UserInfo UserInfo { get; set; }
+
+        /// <summary>
+        /// 天气情况
+        /// </summary>
+        [JsonPropertyName("weather")]
+        public string Weather { get; set; }
+
+        /// <summary>
+        /// 风力等级
+        /// </summary>
+        [JsonPropertyName("wind")]
+        public string Wind { get; set; }
+    }
+
+    public class MeasureCheckContent
+    {
+        /// <summary>
+        /// 安全措施内容
+        /// </summary>
+        [JsonPropertyName("infos")]
+        public string Infos { get; set; }
+
+        /// <summary>
+        /// 检查结果，1符合，0不符合
+        /// </summary>
+        [JsonPropertyName("radio")]
+        public int Radio { get; set; }
+    }
+
+    public class UserInfo
+    {
+        /// <summary>
+        /// 姓名
+        /// </summary>
+        [JsonPropertyName("name")]
+        public string Name { get; set; }
+    }
+
+    #endregion 危险施工作业响应体
+
+    public sealed class FixedPatternDateTimeConverter : JsonConverter<DateTime?>
+    {
+        private const string Pattern = "yyyy-MM-dd HH:mm:ss";
+
+        public override DateTime? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            if (reader.TokenType == JsonTokenType.Null) return null;
+
+            if (reader.TokenType == JsonTokenType.String)
+            {
+                var s = reader.GetString();
+                if (string.IsNullOrWhiteSpace(s)) return null;
+
+                // 先按固定格式
+                if (DateTime.TryParseExact(
+                        s, Pattern, System.Globalization.CultureInfo.InvariantCulture,
+                        System.Globalization.DateTimeStyles.AssumeLocal, out var dt))
+                    return dt;
+
+                // 退化：再尝试系统通用解析（兼容 ISO8601）
+                if (DateTime.TryParse(s, out dt))
+                    return dt;
+
+                throw new JsonException($"Invalid date format: {s}");
+            }
+
+            // 可选：数字视为 Unix 时间戳（秒/毫秒）
+            if (reader.TokenType == JsonTokenType.Number && reader.TryGetInt64(out var num))
+            {
+                var dto = num > 3_000_000_000
+                    ? DateTimeOffset.FromUnixTimeMilliseconds(num)
+                    : DateTimeOffset.FromUnixTimeSeconds(num);
+                return dto.LocalDateTime;
+            }
+
+            throw new JsonException("Unexpected token for DateTime.");
+        }
+
+        public override void Write(Utf8JsonWriter writer, DateTime? value, JsonSerializerOptions options)
+        {
+            if (value.HasValue)
+                writer.WriteStringValue(value.Value.ToString(Pattern));
+            else
+                writer.WriteNullValue();
+        }
     }
 }

WeiCloud.Fusion/ThirdPartyServices/ThirdPartyServices.API/Controllers/PuCe/SunPlaceBoardWorkOrderController.cs

@@ -1,4 +1,5 @@
-using Common.Shared.Application.SafetyFirePro.RequestDto;
+using Common.Shared.Application.BaseModels;
+using Common.Shared.Application.SafetyFirePro.RequestDto;
 using Common.Shared.Application.SafetyFirePro.ResponseDto;
 using Microsoft.AspNetCore.Mvc;
 using ThirdPartyServices.DomainService.PuCe;
@@ -27,7 +28,7 @@ namespace ThirdPartyServices.API.Controllers.PuCe
         /// <param name="dto"></param>
         /// <returns></returns>
         [HttpPost("orderList")]
-        public async Task<List<WorkOrderInfoDto>> GetRepairOrderList(WorkOrderParamsDto dto)
+        public async Task<ApiResult<List<WorkOrderInfoDto>>> GetRepairOrderList(WorkOrderParamsDto dto)
         {
             return await _workOrderService.GetRepairOrderList(dto);
         }
@@ -38,7 +39,7 @@ namespace ThirdPartyServices.API.Controllers.PuCe
         /// <param name="orderId"></param>
         /// <returns></returns>
         [HttpGet("orderline")]
-        public async Task<List<WorkOrderTimelineDto>> GetTimelineListByOrderId(string orderId)
+        public async Task<ApiResult<List<WorkOrderTimelineDto>>> GetTimelineListByOrderId(string orderId)
         {
             return await _workOrderService.GetTimelineListByOrderId(orderId);
         }

WeiCloud.Fusion/ThirdPartyServices/ThirdPartyServices.API/Controllers/PuTianSuYuan/SunPalaceBoardFacilityController.cs

@@ -1,4 +1,5 @@
-using Common.Shared.Application.SafetyFirePro.RequestDto;
+using Common.Shared.Application.BaseModels;
+using Common.Shared.Application.SafetyFirePro.RequestDto;
 using Common.Shared.Application.SafetyFirePro.ResponseDto;
 using Microsoft.AspNetCore.Mvc;
 using ThirdPartyServices.DomainService.PuTianSuYuan;
@@ -28,7 +29,7 @@ namespace ThirdPartyServices.API.Controllers.PuTianSuYuan
         /// <param name="dto"></param>
         /// <returns></returns>
         [HttpPost("assetList")]
-        public async Task<List<AssetOverviewResDto>> GetAssetDashboardEchart(SecSituationQueryDto dto)
+        public async Task<ApiResult<List<AssetOverviewResDto>>> GetAssetDashboardEchart(SecSituationQueryDto dto)
         {
             return await _sunPalaceBoardFacilityService.GetAssetDashboardEchart(dto);
         }
@@ -38,7 +39,7 @@ namespace ThirdPartyServices.API.Controllers.PuTianSuYuan
         /// </summary>
         /// <returns></returns>
         [HttpPost("assetType")]
-        public async Task<List<AssetTypeResDto>> GetAssetTypeEchart(SecSituationQueryDto dto)
+        public async Task<ApiResult<List<AssetTypeResDto>>> GetAssetTypeEchart(SecSituationQueryDto dto)
         {
             return await _sunPalaceBoardFacilityService.GetAssetTypeEchart(dto);
         }

WeiCloud.Fusion/ThirdPartyServices/ThirdPartyServices.API/Controllers/ShenZhouShengAn/SunPalaceBoardSafetyController.cs

@@ -1,4 +1,5 @@
-using Common.Shared.Application.SafetyFirePro.RequestDto;
+using Common.Shared.Application.BaseModels;
+using Common.Shared.Application.SafetyFirePro.RequestDto;
 using Common.Shared.Application.SafetyFirePro.ResponseDto;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -29,7 +30,7 @@ namespace ThirdPartyServices.API.Controllers.ShenZhouShengAn
         /// </summary>
         /// <returns></returns>
         [HttpGet("productionRisk")]
-        public async Task<DangerRiskAreaResDto> GetProductionRiskEchart()
+        public async Task<ApiResult<DangerRiskAreaResDto>> GetProductionRiskEchart()
         {
             return await _secSituationService.GetProductionRiskEchart();
         }
@@ -41,7 +42,7 @@ namespace ThirdPartyServices.API.Controllers.ShenZhouShengAn
         /// <param name="pRegionId">返回本区域及下属子区域隐患</param>
         /// <returns></returns>
         [HttpGet("new/dangerInfo")]
-        public async Task<DangerInfoRootResDto> GetDangerInfoEchart(string? regionId, string? pRegionId)
+        public async Task<ApiResult<DangerInfoRootResDto>> GetDangerInfoEchart(string? regionId, string? pRegionId)
         {
             return await _secSituationService.GetDangerInfos(regionId, pRegionId);
         }
@@ -51,7 +52,7 @@ namespace ThirdPartyServices.API.Controllers.ShenZhouShengAn
         /// </summary>
         /// <returns></returns>
         [HttpGet("listFloor")]
-        public async Task<FloorResDto> GetListFloor()
+        public async Task<ApiResult<FloorResDto>> GetListFloor()
         {
             return await _secSituationService.GetListFloor();
         }
@@ -62,7 +63,7 @@ namespace ThirdPartyServices.API.Controllers.ShenZhouShengAn
         /// <param name="floorId">图层id</param>
         /// <returns></returns>
         [HttpGet("getRiskMapInfo")]
-        public async Task<RootReqDto> GetRiskMapInfo(int floorId)
+        public async Task<ApiResult<RootReqDto>> GetRiskMapInfo(int floorId)
         {
             return await _secSituationService.GetRiskMapInfo(floorId);
         }
@@ -73,7 +74,7 @@ namespace ThirdPartyServices.API.Controllers.ShenZhouShengAn
         /// <param name="dto"></param>
         /// <returns></returns>
         [HttpPost("ledger")]
-        public async Task<object> GetLedger(WorkTaskQueryParamsDto dto)
+        public async Task<ApiResult<LedgerDto>> GetLedger(WorkTaskQueryParamsDto dto)
         {
             return await _secSituationService.GetLedger(dto);
         }

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

@@ -1,12 +1,13 @@
-using Common.Shared.Application.SafetyFirePro.RequestDto;
+using Common.Shared.Application.BaseModels;
+using Common.Shared.Application.SafetyFirePro.RequestDto;
 using Common.Shared.Application.SafetyFirePro.ResponseDto;
 
 namespace ThirdPartyServices.DomainService.PuCe
 {
     public interface ISunPlaceBoardWorkOrderService
     {
-        Task<List<WorkOrderInfoDto>> GetRepairOrderList(WorkOrderParamsDto dto);
+        Task<ApiResult<List<WorkOrderInfoDto>>> GetRepairOrderList(WorkOrderParamsDto dto);
 
-        Task<List<WorkOrderTimelineDto>> GetTimelineListByOrderId(string orderId);
+        Task<ApiResult<List<WorkOrderTimelineDto>>> GetTimelineListByOrderId(string orderId);
     }
 }

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

@@ -1,6 +1,8 @@
-using Common.Shared.Application.SafetyFirePro.RequestDto;
+using Common.Shared.Application.BaseModels;
+using Common.Shared.Application.SafetyFirePro.RequestDto;
 using Common.Shared.Application.SafetyFirePro.ResponseDto;
 using Microsoft.Extensions.Logging;
+
 using System.Net.Http.Json;
 using System.Text.Json;
 using ThirdPartyServices.Application.ShenZhouShengAn.ResponseDto;
@@ -30,9 +32,9 @@ namespace ThirdPartyServices.DomainService.PuCe
         /// <param name="dto"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public async Task<List<WorkOrderInfoDto>> GetRepairOrderList(WorkOrderParamsDto dto)
+        public async Task<ApiResult<List<WorkOrderInfoDto>>> GetRepairOrderList(WorkOrderParamsDto dto)
         {
-            List<WorkOrderInfoDto> result = new();
+            ApiResult<List<WorkOrderInfoDto>> result = new ApiResult<List<WorkOrderInfoDto>>() { Code = 200, Msg = "接口调用成功" };
 
             var url = "https://zrh.hservices.online/prod-api/yzs/order/getRepairOrderList";
 
@@ -48,21 +50,24 @@ namespace ThirdPartyServices.DomainService.PuCe
                 if (!resp.IsSuccessStatusCode)
                 {
                     _logger.LogWarning($"工单列表查询接口请求失败，{body}");
+                    return ApiResult<List<WorkOrderInfoDto>>.IsFail($"工单列表查询接口请求失败，{body}");
                 }
 
                 var httppReult = JsonSerializer.Deserialize<HttpClientResult<List<WorkOrderInfoDto>>>(body);
                 if (httppReult != null && httppReult.Code == "200")
                 {
-                    result = httppReult.Data;
+                    result.Data = httppReult.Data;
                 }
                 else
                 {
                     _logger.LogWarning($"工单列表查询接口请求失败，{body}");
+                    return ApiResult<List<WorkOrderInfoDto>>.IsFail($"工单列表查询接口请求失败，{body}");
                 }
             }
             catch (Exception ex)
             {
                 _logger.LogError(ex, "工单列表查询接口请求失败");
+                return ApiResult<List<WorkOrderInfoDto>>.IsFail($"工单列表查询接口请求失败{ex.Message}");
             }
             return result;
         }
@@ -72,9 +77,9 @@ namespace ThirdPartyServices.DomainService.PuCe
         /// </summary>
         /// <param name="orderId"></param>
         /// <returns></returns>
-        public async Task<List<WorkOrderTimelineDto>> GetTimelineListByOrderId(string orderId)
+        public async Task<ApiResult<List<WorkOrderTimelineDto>>> GetTimelineListByOrderId(string orderId)
         {
-            List<WorkOrderTimelineDto> result = new();
+            ApiResult<List<WorkOrderTimelineDto>> result = new ApiResult<List<WorkOrderTimelineDto>>() { Code = 200, Msg = "调用接口成功" };
 
             var url = $"https://zrh.hservices.online/prod-api/yzs/timeline/getTimelineListByOrderId?orderId={orderId}";
 
@@ -87,21 +92,24 @@ namespace ThirdPartyServices.DomainService.PuCe
                 if (!resp.IsSuccessStatusCode)
                 {
                     _logger.LogWarning($"工单时间轴接口请求失败，{body}");
+                    return ApiResult<List<WorkOrderTimelineDto>>.IsFail($"工单时间轴接口请求失败，{body}");
                 }
 
                 var httppReult = JsonSerializer.Deserialize<HttpClientResult<List<WorkOrderTimelineDto>>>(body);
                 if (httppReult != null && httppReult.Code == "200")
                 {
-                    result = httppReult.Data;
+                    result.Data = httppReult.Data;
                 }
                 else
                 {
                     _logger.LogWarning($"工单时间轴接口请求失败，{body}");
+                    return ApiResult<List<WorkOrderTimelineDto>>.IsFail($"工单时间轴接口请求失败，{body}");
                 }
             }
             catch (Exception ex)
             {
                 _logger.LogError(ex, "工单时间轴接口请求失败");
+                return ApiResult<List<WorkOrderTimelineDto>>.IsFail($"工单时间轴接口请求失败{ex.Message}");
             }
             return result;
         }

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

@@ -1,12 +1,13 @@
-using Common.Shared.Application.SafetyFirePro.RequestDto;
+using Common.Shared.Application.BaseModels;
+using Common.Shared.Application.SafetyFirePro.RequestDto;
 using Common.Shared.Application.SafetyFirePro.ResponseDto;
 
 namespace ThirdPartyServices.DomainService.PuTianSuYuan
 {
     public interface ISunPalaceBoardFacilityService
     {
-        Task<List<AssetOverviewResDto>> GetAssetDashboardEchart(SecSituationQueryDto dto);
+        Task<ApiResult<List<AssetOverviewResDto>>> GetAssetDashboardEchart(SecSituationQueryDto dto);
 
-        Task<List<AssetTypeResDto>> GetAssetTypeEchart(SecSituationQueryDto dto);
+        Task<ApiResult<List<AssetTypeResDto>>> GetAssetTypeEchart(SecSituationQueryDto dto);
     }
 }

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

@@ -17,9 +17,9 @@ namespace ThirdPartyServices.DomainService.PuTianSuYuan
             _assetWebService = assetWebService;
         }
 
-        public async Task<List<AssetOverviewResDto>> GetAssetDashboardEchart(SecSituationQueryDto dto)
+        public async Task<ApiResult<List<AssetOverviewResDto>>> GetAssetDashboardEchart(SecSituationQueryDto dto)
         {
-            List<AssetOverviewResDto> result = [];
+            ApiResult<List<AssetOverviewResDto>> result = new ApiResult<List<AssetOverviewResDto>>() { Code = 200, Msg = "接口调用成功" };
 
             DateTime start = DateTime.Now;
             DateTime end = DateTime.Now;
@@ -128,12 +128,12 @@ namespace ThirdPartyServices.DomainService.PuTianSuYuan
                 };
                 resDtos.Add(assetAlarmRes);
 
-                result = resDtos;
-                return result;
+                result.Data = resDtos;
             }
             catch (Exception ex)
             {
                 _logger.LogWarning(ex, "GetAssetDashboardEchart接口出错");
+                return ApiResult<List<AssetOverviewResDto>>.IsFail($"GetAssetDashboardEchart接口出错{ex.Message}");
             }
             return result;
         }
@@ -143,9 +143,9 @@ namespace ThirdPartyServices.DomainService.PuTianSuYuan
         /// </summary>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public async Task<List<AssetTypeResDto>> GetAssetTypeEchart(SecSituationQueryDto dto)
+        public async Task<ApiResult<List<AssetTypeResDto>>> GetAssetTypeEchart(SecSituationQueryDto dto)
         {
-            List<AssetTypeResDto> result = [];
+            ApiResult<List<AssetTypeResDto>> result = new ApiResult<List<AssetTypeResDto>>() { Code = 200, Msg = "接口调用成功" };
 
             DateTime start = DateTime.Now;
             DateTime end = DateTime.Now;
@@ -184,11 +184,12 @@ namespace ThirdPartyServices.DomainService.PuTianSuYuan
                         });
                     }
                 }
-                result = assetTypes;
+                result.Data = assetTypes;
             }
             catch (Exception ex)
             {
                 _logger.LogWarning(ex, "GetAssetTypeEchart接口出错");
+                return ApiResult<List<AssetTypeResDto>>.IsFail($"GetAssetTypeEchart接口出错{ex.Message}");
             }
             return result;
         }

WeiCloud.Fusion/ThirdPartyServices/ThirdPartyServices.DomainService/ShenZhouShengAn/ISunPalaceBoardSafetyService.cs

@@ -1,4 +1,5 @@
-using Common.Shared.Application.SafetyFirePro.RequestDto;
+using Common.Shared.Application.BaseModels;
+using Common.Shared.Application.SafetyFirePro.RequestDto;
 using Common.Shared.Application.SafetyFirePro.ResponseDto;
 using System.Text.Json;
 
@@ -6,24 +7,24 @@ namespace ThirdPartyServices.DomainService.ShenZhouShengAn
 {
     public interface ISunPalaceBoardSafetyService
     {
-        Task<DangerRiskAreaResDto> GetProductionRiskEchart();
+        Task<ApiResult<DangerRiskAreaResDto>> GetProductionRiskEchart();
 
         /// <summary>
         /// 获得四色图图层列表
         /// </summary>
         /// <param name="ubpid">用户单位标记码</param>
         /// <returns></returns>
-        Task<FloorResDto> GetListFloor();
+        Task<ApiResult<FloorResDto>> GetListFloor();
 
         /// <summary>
         /// 获得四色图区域列表
         /// </summary>
         /// <param name="floorId">图层id</param>
         /// <returns></returns>
-        Task<RootReqDto> GetRiskMapInfo(int floorId);
+        Task<ApiResult<RootReqDto>> GetRiskMapInfo(int floorId);
 
-        Task<DangerInfoRootResDto> GetDangerInfos(string? regionId, string? pRegionId);
+        Task<ApiResult<DangerInfoRootResDto>> GetDangerInfos(string? regionId, string? pRegionId);
 
-        Task<object> GetLedger(WorkTaskQueryParamsDto dto);
+        Task<ApiResult<LedgerDto>> GetLedger(WorkTaskQueryParamsDto dto);
     }
 }

WeiCloud.Fusion/ThirdPartyServices/ThirdPartyServices.DomainService/ShenZhouShengAn/SunPalaceBoardSafetyService.cs

@@ -1,4 +1,5 @@
-using Common.Shared.Application.SafetyFirePro.RequestDto;
+using Common.Shared.Application.BaseModels;
+using Common.Shared.Application.SafetyFirePro.RequestDto;
 using Common.Shared.Application.SafetyFirePro.ResponseDto;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
@@ -28,9 +29,9 @@ namespace ThirdPartyServices.DomainService.ShenZhouShengAn
         /// <param name="ubpid">用户单位标记码</param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public async Task<FloorResDto> GetListFloor()
+        public async Task<ApiResult<FloorResDto>> GetListFloor()
         {
-            var result = new FloorResDto();
+            ApiResult<FloorResDto> result = new ApiResult<FloorResDto>() { Code = 200, Msg = "接口调用成功", Data = null };
 
             try
             {
@@ -39,7 +40,7 @@ namespace ThirdPartyServices.DomainService.ShenZhouShengAn
                 if (string.IsNullOrWhiteSpace(token))
                 {
                     _logger.LogWarning("GetListFloor接口获取token失败");
-                    return result;
+                    return ApiResult<FloorResDto>.IsFail("GetListFloor接口获取token失败");
                 }
 
                 //获取用户配置
@@ -47,7 +48,7 @@ namespace ThirdPartyServices.DomainService.ShenZhouShengAn
                 if (loginUsers.Code == "Error")
                 {
                     _logger.LogWarning("GetListFloor接口获取用户配置失败");
-                    return result;
+                    return ApiResult<FloorResDto>.IsFail("GetListFloor接口获取用户配置失败");
                 }
 
                 //生产风险识别
@@ -56,11 +57,15 @@ namespace ThirdPartyServices.DomainService.ShenZhouShengAn
          "https://zrh.szdunan.cn/v1/api/riskFourcoloringMap/getlistFloor",
          token, loginUsers.Data.Ubpid, HttpMethod.Post);
 
-                result = new FloorResDto { Data = riskResult.Data };
+                if (riskResult.Data != null)
+                {
+                    result.Data = new FloorResDto { Data = riskResult.Data };
+                }
             }
             catch (Exception ex)
             {
                 _logger.LogWarning(ex, "GetListFloor接口出错");
+                return ApiResult<FloorResDto>.IsFail($"GetListFloor接口出错{ex.Message}");
             }
 
             return result;
@@ -71,13 +76,9 @@ namespace ThirdPartyServices.DomainService.ShenZhouShengAn
         /// </summary>
         /// <param name="dto"></param>
         /// <returns></returns>
-        public async Task<DangerRiskAreaResDto> GetProductionRiskEchart()
+        public async Task<ApiResult<DangerRiskAreaResDto>> GetProductionRiskEchart()
         {
-            var result = new DangerRiskAreaResDto()
-            {
-                DangerInfos = new List<DangerInfo>(),
-                ProductionRiskStats = new List<ProductionRiskStatsResDto>()
-            };
+            ApiResult<DangerRiskAreaResDto> result = new() { Code = 200, Msg = "接口调用成功", Data = new DangerRiskAreaResDto() { DangerInfos = [], ProductionRiskStats = [] } };
             try
             {
                 //获取token
@@ -85,7 +86,7 @@ namespace ThirdPartyServices.DomainService.ShenZhouShengAn
                 if (string.IsNullOrWhiteSpace(token))
                 {
                     _logger.LogWarning("GetProductionRiskEchart接口获取token失败");
-                    return result;
+                    return ApiResult<DangerRiskAreaResDto>.IsFail("GetProductionRiskEchart接口获取token失败");
                 }
 
                 //获取用户配置
@@ -93,7 +94,7 @@ namespace ThirdPartyServices.DomainService.ShenZhouShengAn
                 if (loginUsers.Code == "Error")
                 {
                     _logger.LogWarning("GetProductionRiskEchart接口获取用户配置失败");
-                    return result;
+                    return ApiResult<DangerRiskAreaResDto>.IsFail("GetProductionRiskEchart接口获取用户配置失败");
                 }
 
                 //获取单位信息
@@ -101,8 +102,7 @@ namespace ThirdPartyServices.DomainService.ShenZhouShengAn
                 if (branchs.Code == "Error")
                 {
                     _logger.LogWarning("GetProductionRiskEchart接口获取单位信息失败");
-
-                    return result;
+                    return ApiResult<DangerRiskAreaResDto>.IsFail("GetProductionRiskEchart接口获取单位信息失败");
                 }
 
                 //生产风险识别
@@ -116,7 +116,8 @@ namespace ThirdPartyServices.DomainService.ShenZhouShengAn
                            Uid = loginUsers.Data.Uid
                        }, HttpMethod.Post);
 
-                result.ProductionRiskStats = riskResult.Data.ProductionRiskStats;
+                if (riskResult.Code != "Error" || riskResult.Data != null)
+                    result.Data.ProductionRiskStats = riskResult.Data.ProductionRiskStats;
 
                 //获取隐患信息
                 string[] dangerStatus = ["0", "1", "2",]; //0-待核查，1-待整改，2-待验收
@@ -174,11 +175,12 @@ namespace ThirdPartyServices.DomainService.ShenZhouShengAn
                 dangerInfo.Status = "3"; //待排查
                 dangerInfoList.Add(dangerInfo);
 
-                result.DangerInfos = dangerInfoList;
+                result.Data.DangerInfos = dangerInfoList;
             }
             catch (Exception ex)
             {
                 _logger.LogWarning(ex, "GetProductionRiskEchart接口出错");
+                return ApiResult<DangerRiskAreaResDto>.IsFail($"GetProductionRiskEchart接口出错{ex.Message}");
             }
             return result;
         }
@@ -189,9 +191,9 @@ namespace ThirdPartyServices.DomainService.ShenZhouShengAn
         /// <param name="regionId">返回本区域隐患（不包含下属子区域隐患）</param>
         /// <param name="pRegionId">返回本区域及下属子区域隐患</param>
         /// <returns></returns>
-        public async Task<DangerInfoRootResDto> GetDangerInfos(string? regionId, string? pRegionId)
+        public async Task<ApiResult<DangerInfoRootResDto>> GetDangerInfos(string? regionId, string? pRegionId)
         {
-            DangerInfoRootResDto result = new();
+            ApiResult<DangerInfoRootResDto> result = new() { Code = 200, Msg = "接口调用成功", Data = new() };
             try
             {
                 //获取token
@@ -199,7 +201,7 @@ namespace ThirdPartyServices.DomainService.ShenZhouShengAn
                 if (string.IsNullOrWhiteSpace(token))
                 {
                     _logger.LogWarning("GetDangerInfos接口获取token失败");
-                    return result;
+                    return ApiResult<DangerInfoRootResDto>.IsFail("GetDangerInfos接口获取token失败");
                 }
 
                 //获取用户配置
@@ -207,7 +209,7 @@ namespace ThirdPartyServices.DomainService.ShenZhouShengAn
                 if (loginUsers.Code == "Error")
                 {
                     _logger.LogWarning("GetDangerInfos接口获取用户配置失败");
-                    return result;
+                    return ApiResult<DangerInfoRootResDto>.IsFail("GetDangerInfos接口获取用户配置失败");
                 }
 
                 //获取单位信息
@@ -215,8 +217,7 @@ namespace ThirdPartyServices.DomainService.ShenZhouShengAn
                 if (branchs.Code == "Error")
                 {
                     _logger.LogWarning("GetDangerInfos接口获取单位信息失败");
-
-                    return result;
+                    return ApiResult<DangerInfoRootResDto>.IsFail("GetDangerInfos接口获取单位信息失败");
                 }
                 var query = new DangerInfoQueryDto { Ubpid = loginUsers.Data.Ubpid, Status = "0" };
 
@@ -235,12 +236,13 @@ namespace ThirdPartyServices.DomainService.ShenZhouShengAn
                 var root = JsonSerializer.Deserialize<HttpClientResult<DangerInfoRootResDto>>(jsonResult);
                 if (root != null)
                 {
-                    result = root.Data;
+                    result.Data = root.Data;
                 }
             }
             catch (Exception ex)
             {
                 _logger.LogWarning(ex, "GetDangerInfos接口出错");
+                return ApiResult<DangerInfoRootResDto>.IsFail($"GetDangerInfos接口出错{ex.Message}");
             }
             return result;
         }
@@ -250,9 +252,9 @@ namespace ThirdPartyServices.DomainService.ShenZhouShengAn
         /// </summary>
         /// <param name="floorId"></param>
         /// <returns></returns>
-        public async Task<RootReqDto> GetRiskMapInfo(int floorId)
+        public async Task<ApiResult<RootReqDto>> GetRiskMapInfo(int floorId)
         {
-            var result = new RootReqDto();
+            ApiResult<RootReqDto> result = new ApiResult<RootReqDto>() { Code = 200, Msg = "接口调用成功", Data = null };
 
             try
             {
@@ -261,7 +263,7 @@ namespace ThirdPartyServices.DomainService.ShenZhouShengAn
                 if (string.IsNullOrWhiteSpace(token))
                 {
                     _logger.LogWarning("GetRiskMapInfo接口获取token失败");
-                    return result;
+                    return ApiResult<RootReqDto>.IsFail("GetRiskMapInfo接口获取token失败");
                 }
 
                 //获取用户配置
@@ -269,7 +271,7 @@ namespace ThirdPartyServices.DomainService.ShenZhouShengAn
                 if (loginUsers.Code == "Error")
                 {
                     _logger.LogWarning("GetRiskMapInfo接口获取用户配置失败");
-                    return result;
+                    return ApiResult<RootReqDto>.IsFail("GetRiskMapInfo接口获取用户配置失败");
                 }
 
                 //生产风险识别
@@ -287,13 +289,14 @@ namespace ThirdPartyServices.DomainService.ShenZhouShengAn
                     RootReqDto httpClientResult = JsonSerializer.Deserialize<RootReqDto>(riskResult.Data.ToString()!)!;
                     if (httpClientResult != null)
                     {
-                        result = httpClientResult;
+                        result.Data = httpClientResult;
                     }
                 }
             }
             catch (Exception ex)
             {
                 _logger.LogWarning(ex, $"GetRiskMapInfo接口出错");
+                return ApiResult<RootReqDto>.IsFail($"GetRiskMapInfo接口出错{ex.Message}");
             }
 
             return result;
@@ -305,9 +308,9 @@ namespace ThirdPartyServices.DomainService.ShenZhouShengAn
         /// <param name="dto"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public async Task<object> GetLedger(WorkTaskQueryParamsDto dto)
+        public async Task<ApiResult<LedgerDto>> GetLedger(WorkTaskQueryParamsDto dto)
         {
-            var result = new RootReqDto();
+            ApiResult<LedgerDto> result = new ApiResult<LedgerDto>() { Code = 200, Msg = "接口调用成功", Data = null };
 
             try
             {
@@ -316,7 +319,7 @@ namespace ThirdPartyServices.DomainService.ShenZhouShengAn
                 if (string.IsNullOrWhiteSpace(token))
                 {
                     _logger.LogWarning("GetProductionRiskEchart接口获取token失败");
-                    return result;
+                    return ApiResult<LedgerDto>.IsFail("GetProductionRiskEchart接口获取token失败");
                 }
 
                 //获取用户配置
@@ -324,7 +327,7 @@ namespace ThirdPartyServices.DomainService.ShenZhouShengAn
                 if (loginUsers.Code == "Error")
                 {
                     _logger.LogWarning("GetProductionRiskEchart接口获取用户配置失败");
-                    return result;
+                    return ApiResult<LedgerDto>.IsFail("GetProductionRiskEchart接口获取用户配置失败");
                 }
 
                 //获取单位信息
@@ -332,12 +335,10 @@ namespace ThirdPartyServices.DomainService.ShenZhouShengAn
                 if (branchs.Code == "Error")
                 {
                     _logger.LogWarning("GetProductionRiskEchart接口获取单位信息失败");
-
-                    return result;
+                    return ApiResult<LedgerDto>.IsFail("GetProductionRiskEchart接口获取单位信息失败");
                 }
 
                 dto.Ubpid = loginUsers.Data.Ubpid.ToString();
-                dto.BranchId = branchs.Data.BranchPermissionIds[0];
 
                 HttpClientResult<object> riskResult = await _tokenProviderService
                   .SendAndParseAsync<WorkTaskQueryParamsDto, HttpClientResult<object>>(
@@ -346,16 +347,17 @@ namespace ThirdPartyServices.DomainService.ShenZhouShengAn
 
                 if (riskResult != null && riskResult.Data != null && riskResult.Data.ToString()!.Length > 10)
                 {
-                    RootReqDto httpClientResult = JsonSerializer.Deserialize<RootReqDto>(riskResult.Data.ToString()!)!;
+                    LedgerDto httpClientResult = JsonSerializer.Deserialize<LedgerDto>(riskResult.Data.ToString()!)!;
                     if (httpClientResult != null)
                     {
-                        result = httpClientResult;
+                        result.Data = httpClientResult;
                     }
                 }
             }
             catch (Exception ex)
             {
-                _logger.LogWarning(ex, $"GetRiskMapInfo接口出错");
+                _logger.LogWarning(ex, "GetRiskMapInfo接口出错");
+                return ApiResult<LedgerDto>.IsFail($"GetRiskMapInfo接口出错{ex.Message}");
             }
 
             return result;