From a9367913d18d06325d0d856e754eb60a3afeb045 Mon Sep 17 00:00:00 2001 From: LiuXin Date: Wed, 17 Sep 2025 11:43:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Common.Shared.Application.csproj | 2 +- .../SunPlaceBoardWorkOrderReqDto.cs | 5 - .../SunPlaceBoardWorkOrderResDto.cs | 184 ++++++++---------- .../SunPalaceBoardSafetyService.cs | 80 ++++---- 4 files changed, 120 insertions(+), 151 deletions(-) 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 16882fb..a35dcaa 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 - 2.9.0 + 3.0.0 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 c429653..e9a1787 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,11 +110,6 @@ namespace Common.Shared.Application.SafetyFirePro.RequestDto /// 必填项 [JsonPropertyName("ubpid")] public string? Ubpid { get; set; } - - /// - /// 当为1的时候是统计，其他的时候查询列表 - /// - public int? Type { get; set; } } /// diff --git a/WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/SafetyFirePro/ResponseDto/SunPlaceBoardWorkOrderResDto.cs b/WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/SafetyFirePro/ResponseDto/SunPlaceBoardWorkOrderResDto.cs index 14e11c0..078b8fa 100644 --- a/WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/SafetyFirePro/ResponseDto/SunPlaceBoardWorkOrderResDto.cs +++ b/WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/SafetyFirePro/ResponseDto/SunPlaceBoardWorkOrderResDto.cs @@ -688,7 +688,7 @@ namespace Common.Shared.Application.SafetyFirePro.ResponseDto #region 隐患详情数据 /// - /// 隐患数据主对象 + /// 隐患详情根实体（仅包含指定的顶级字段） /// public class HazardDataDto { @@ -696,7 +696,7 @@ namespace Common.Shared.Application.SafetyFirePro.ResponseDto /// 隐患核查结果信息列表 /// [JsonPropertyName("check")] - public List? CheckResults { get; set; } + public List? CheckResults { get; set; } /// /// 隐患描述 @@ -708,37 +708,37 @@ namespace Common.Shared.Application.SafetyFirePro.ResponseDto /// 隐患相关风险点信息（如果有） /// [JsonPropertyName("equipment")] - public HazardEquipment? Equipment { get; set; } + public HazardEquipmentItem? Equipment { get; set; } /// /// 风险等级信息 /// [JsonPropertyName("risk")] - public RiskLevelInfo? Risk { get; set; } + public RiskLevelItem? Risk { get; set; } /// /// 风险点责任人信息列表 /// [JsonPropertyName("users")] - public List? ResponsiblePersons { get; set; } + public List? ResponsiblePersons { get; set; } /// /// 隐患整改及验收信息列表 /// [JsonPropertyName("rectifications")] - public List? Rectifications { get; set; } + public List? Rectifications { get; set; } /// /// 隐患发生区域 /// [JsonPropertyName("region")] - public RegionInfo? Region { get; set; } + public RegionSimpleItem? Region { get; set; } /// /// 隐患上报情况 /// [JsonPropertyName("register")] - public HazardRegister? Register { get; set; } + public HazardRegisterItem? Register { get; set; } /// /// 隐患状态，0待核查，1待整改，2待验收，3治理完毕，4不是隐患 @@ -748,21 +748,21 @@ namespace Common.Shared.Application.SafetyFirePro.ResponseDto } /// - /// 隐患核查结果信息 + /// 隐患核查结果单项信息 /// - public class HazardCheckResult + public class HazardCheckItem { /// - /// 隐患一级分类信息 + /// 隐患一级分类信息（仅含名称） /// [JsonPropertyName("cate")] - public CategoryInfo? Category { get; set; } + public CategorySimpleItem? Category { get; set; } /// - /// 隐患二级分类信息 + /// 隐患二级分类信息（仅含名称） /// [JsonPropertyName("cate_sub")] - public CategoryInfo? SubCategory { get; set; } + public CategorySimpleItem? SubCategory { get; set; } /// /// 核查情况说明 @@ -774,7 +774,7 @@ namespace Common.Shared.Application.SafetyFirePro.ResponseDto /// 核查时间 /// [JsonPropertyName("report_time")] - public DateTime ReportTime { get; set; } + public string ReportTime { get; set; } = string.Empty; // 用string避免日期格式问题，需转换可改为DateTime? /// /// 核查结果，0待核查，1是隐患，2不是隐患，3提交上级部门核查 @@ -786,43 +786,43 @@ namespace Common.Shared.Application.SafetyFirePro.ResponseDto /// 核查人信息 /// [JsonPropertyName("user")] - public CheckUserInfo? User { get; set; } + public CheckUserItem? User { get; set; } } /// - /// 核查人信息 + /// 核查人信息（仅含部门和姓名） /// - public class CheckUserInfo + public class CheckUserItem { /// - /// 核查人部门信息列表 + /// 核查人部门信息列表（仅含部门名称） /// [JsonPropertyName("branch")] - public List? Departments { get; set; } + public List? Departments { get; set; } /// - /// 核查人额外信息 + /// 核查人额外信息（仅含姓名） /// [JsonPropertyName("extras")] - public UserExtras? Extras { get; set; } + public UserNameItem? Extras { get; set; } } /// - /// 部门信息 + /// 部门信息包装（仅含部门详情） /// - public class DepartmentInfo + public class DepartmentWrapperItem { /// - /// 部门详情 + /// 部门详情（仅含名称） /// [JsonPropertyName("branch")] - public DepartmentDetail? Branch { get; set; } + public DepartmentSimpleItem? Branch { get; set; } } /// - /// 部门详情 + /// 部门简化信息（仅含名称） /// - public class DepartmentDetail + public class DepartmentSimpleItem { /// /// 部门名称 @@ -832,9 +832,9 @@ namespace Common.Shared.Application.SafetyFirePro.ResponseDto } /// - /// 用户额外信息 + /// 用户姓名信息（仅含姓名） /// - public class UserExtras + public class UserNameItem { /// /// 姓名 @@ -844,15 +844,15 @@ namespace Common.Shared.Application.SafetyFirePro.ResponseDto } /// - /// 隐患相关风险点信息 + /// 隐患相关风险点信息（仅含指定字段） /// - public class HazardEquipment + public class HazardEquipmentItem { /// - /// 责任部门 + /// 责任部门（仅含名称） /// [JsonPropertyName("branch")] - public DepartmentDetail? Branch { get; set; } + public DepartmentSimpleItem? Branch { get; set; } /// /// 风险点名称 @@ -861,16 +861,16 @@ namespace Common.Shared.Application.SafetyFirePro.ResponseDto public string Name { get; set; } = string.Empty; /// - /// 所在区域 + /// 所在区域（仅含名称） /// [JsonPropertyName("region")] - public RegionInfo? Region { get; set; } + public RegionSimpleItem? Region { get; set; } } /// - /// 区域信息 + /// 区域简化信息（仅含名称） /// - public class RegionInfo + public class RegionSimpleItem { /// /// 区域名称 @@ -880,15 +880,15 @@ namespace Common.Shared.Application.SafetyFirePro.ResponseDto } /// - /// 风险等级信息 + /// 风险等级信息（仅含指定字段） /// - public class RiskLevelInfo + public class RiskLevelItem { /// - /// 责任部门信息 + /// 责任部门信息（仅含管控层级） /// [JsonPropertyName("branch")] - public RiskBranchInfo? Branch { get; set; } + public RiskBranchItem? Branch { get; set; } /// /// 风险等级ID @@ -904,21 +904,21 @@ namespace Common.Shared.Application.SafetyFirePro.ResponseDto } /// - /// 风险点责任部门信息 + /// 风险点责任部门信息（仅含管控层级） /// - public class RiskBranchInfo + public class RiskBranchItem { /// - /// 风险点管控层级 + /// 风险点管控层级（仅含名称） /// [JsonPropertyName("branch_level")] - public LevelInfo? BranchLevel { get; set; } + public LevelSimpleItem? BranchLevel { get; set; } } /// - /// 层级信息 + /// 层级简化信息（仅含名称） /// - public class LevelInfo + public class LevelSimpleItem { /// /// 层级名称（如岗位级） @@ -928,45 +928,33 @@ namespace Common.Shared.Application.SafetyFirePro.ResponseDto } /// - /// 风险点责任人信息 + /// 风险点责任人信息（仅含姓名） /// - public class ResponsiblePerson + public class ResponsiblePersonItem { /// - /// 责任人详情 + /// 责任人详情（仅含姓名） /// [JsonPropertyName("users")] - public PersonDetail? Users { get; set; } + public UserNameItem? Users { get; set; } } /// - /// 人员详情 + /// 隐患整改及验收信息（仅含指定字段） /// - public class PersonDetail + public class RectificationItem { /// - /// 姓名 - /// - [JsonPropertyName("name")] - public string Name { get; set; } = string.Empty; - } - - /// - /// 隐患整改及验收信息 - /// - public class RectificationInfo - { - /// - /// 整改责任部门 + /// 整改责任部门（仅含名称） /// [JsonPropertyName("branch")] - public DepartmentDetail? Branch { get; set; } + public DepartmentSimpleItem? Branch { get; set; } /// /// 本次整改验收信息 /// [JsonPropertyName("check")] - public RectificationCheck? Check { get; set; } + public RectificationCheckItem? Check { get; set; } /// /// 整改人所选验收人姓名 @@ -975,16 +963,16 @@ namespace Common.Shared.Application.SafetyFirePro.ResponseDto public string CheckUser { get; set; } = string.Empty; /// - /// 隐患整改图片列表 + /// 隐患整改图片列表（仅含名称和路径） /// [JsonPropertyName("file")] - public List? Files { get; set; } + public List? Files { get; set; } /// /// 整改完成时间 /// [JsonPropertyName("finish_time")] - public DateTime FinishTime { get; set; } + public string FinishTime { get; set; } = string.Empty; // 用string避免日期格式问题 /// /// 整改投入资金（元） @@ -1006,21 +994,21 @@ namespace Common.Shared.Application.SafetyFirePro.ResponseDto } /// - /// 整改验收信息 + /// 整改验收信息（仅含指定字段） /// - public class RectificationCheck + public class RectificationCheckItem { /// /// 整改验收时间 /// [JsonPropertyName("cend_time")] - public DateTime CheckEndTime { get; set; } + public string CheckEndTime { get; set; } = string.Empty; // 用string避免日期格式问题 /// - /// 验收图片或文件列表 + /// 验收图片或文件列表（仅含名称和路径） /// [JsonPropertyName("file")] - public List? Files { get; set; } + public List? Files { get; set; } /// /// 验收意见 @@ -1032,7 +1020,7 @@ namespace Common.Shared.Application.SafetyFirePro.ResponseDto /// 验收结果，1通过，2不通过 /// [JsonPropertyName("status")] - public string Status { get; set; } = string.Empty; + public string Status { get; set; } = string.Empty; // 按你标注的"验收结果"设为string，可根据实际JSON改为int? /// /// 验收人姓名 @@ -1042,9 +1030,9 @@ namespace Common.Shared.Application.SafetyFirePro.ResponseDto } /// - /// 文件信息 + /// 文件简化信息（仅含名称和路径） /// - public class FileInfo + public class FileSimpleItem { /// /// 文件名称 @@ -1060,21 +1048,21 @@ namespace Common.Shared.Application.SafetyFirePro.ResponseDto } /// - /// 隐患上报情况 + /// 隐患上报情况（仅含指定字段） /// - public class HazardRegister + public class HazardRegisterItem { /// - /// 隐患一级分类信息 + /// 隐患一级分类信息（仅含名称） /// [JsonPropertyName("cate")] - public CategoryInfo? Category { get; set; } + public CategorySimpleItem? Category { get; set; } /// - /// 隐患二级分类信息 + /// 隐患二级分类信息（仅含名称） /// [JsonPropertyName("cate_sub")] - public CategoryInfo? SubCategory { get; set; } + public CategorySimpleItem? SubCategory { get; set; } /// /// 所选核查人姓名 @@ -1083,10 +1071,10 @@ namespace Common.Shared.Application.SafetyFirePro.ResponseDto public string CheckUser { get; set; } = string.Empty; /// - /// 隐患图片列表 + /// 隐患图片列表（仅含名称和路径） /// [JsonPropertyName("file")] - public List? Files { get; set; } + public List? Files { get; set; } /// /// 隐患情况描述 @@ -1095,16 +1083,16 @@ namespace Common.Shared.Application.SafetyFirePro.ResponseDto public string Infos { get; set; } = string.Empty; /// - /// 隐患上报人信息 + /// 隐患上报人信息（仅含姓名） /// [JsonPropertyName("user")] - public ReporterInfo? User { get; set; } + public UserNameItem? User { get; set; } } /// - /// 分类信息 + /// 分类简化信息（仅含名称） /// - public class CategoryInfo + public class CategorySimpleItem { /// /// 分类名称 @@ -1113,18 +1101,6 @@ namespace Common.Shared.Application.SafetyFirePro.ResponseDto public string Name { get; set; } = string.Empty; } - /// - /// 上报人信息 - /// - public class ReporterInfo - { - /// - /// 姓名 - /// - [JsonPropertyName("name")] - public string Name { get; set; } = string.Empty; - } - #endregion 隐患详情数据 #region 危害辨识度数据 diff --git a/WeiCloud.Fusion/ThirdPartyServices/ThirdPartyServices.DomainService/ShenZhouShengAn/SunPalaceBoardSafetyService.cs b/WeiCloud.Fusion/ThirdPartyServices/ThirdPartyServices.DomainService/ShenZhouShengAn/SunPalaceBoardSafetyService.cs index 18893a7..cf43c97 100644 --- a/WeiCloud.Fusion/ThirdPartyServices/ThirdPartyServices.DomainService/ShenZhouShengAn/SunPalaceBoardSafetyService.cs +++ b/WeiCloud.Fusion/ThirdPartyServices/ThirdPartyServices.DomainService/ShenZhouShengAn/SunPalaceBoardSafetyService.cs @@ -540,65 +540,63 @@ namespace ThirdPartyServices.DomainService.ShenZhouShengAn dto.Ubpid = loginUsers.Data.Ubpid.ToString(); List data = []; - if (dto.Type == 1) + + //查询未开始，status=1、2 + int[] statusNot = [1, 2, 3, 4, 6, 7, 8, 11, 12, 13]; + + for (int i = 0; i < statusNot.Length; i++) { - //查询未开始，status=1、2 - int[] statusNot = [1, 2, 3, 4, 6, 7, 8, 11, 12, 13]; + dto.Status = statusNot[i].ToString(); + dto.Page = 1; + dto.PageSize = 1; + HttpClientResult riskResult = await _tokenProviderService + .SendAndParseAsync>( + "https://zrh.szdunan.cn/v1/api/ticket/safe/ledger", + token, dto, HttpMethod.Post); - for (int i = 0; i < statusNot.Length; i++) + if (riskResult != null && riskResult.Data != null && riskResult.Data.ToString()!.Length > 10) { - dto.Status = statusNot[i].ToString(); - dto.Page = 1; - dto.PageSize = 1; - HttpClientResult riskResult = await _tokenProviderService - .SendAndParseAsync>( - "https://zrh.szdunan.cn/v1/api/ticket/safe/ledger", - token, dto, HttpMethod.Post); - - if (riskResult != null && riskResult.Data != null && riskResult.Data.ToString()!.Length > 10) + LedgerDto httpClientResult = JsonSerializer.Deserialize(riskResult.Data.ToString()!)!; + if (httpClientResult != null) { - LedgerDto httpClientResult = JsonSerializer.Deserialize(riskResult.Data.ToString()!)!; - if (httpClientResult != null) + if (statusNot[i] == 3) { - if (statusNot[i] == 3) + int c = 0; + //统计状态为3但是实际结束时间大于计划结束时间的 + if (httpClientResult.Data != null && httpClientResult.Data.Count > 0) { - int c = 0; - //统计状态为3但是实际结束时间大于计划结束时间的 - if (httpClientResult.Data != null && httpClientResult.Data.Count > 0) + for (int j = 0; j < httpClientResult.Data.Count; j++) { - for (int j = 0; j < httpClientResult.Data.Count; j++) + if (httpClientResult.Data[j].EndAt != "" && httpClientResult.Data[j].FinishTime != "") { - if (httpClientResult.Data[j].EndAt != "" && httpClientResult.Data[j].FinishTime != "") + if (Convert.ToDateTime(httpClientResult.Data[j].EndAt) < Convert.ToDateTime(httpClientResult.Data[j].FinishTime)) { - if (Convert.ToDateTime(httpClientResult.Data[j].EndAt) < Convert.ToDateTime(httpClientResult.Data[j].FinishTime)) - { - c++; - } + c++; } } } - StatisticsInfoDto statisticsInfoDto = new() - { - Name = statusNot[i].ToString() + "已超时", - Total = httpClientResult.Total, - }; - data.Add(statisticsInfoDto); } - else + StatisticsInfoDto statisticsInfoDto = new() { - StatisticsInfoDto statisticsInfoDto = new() - { - Name = statusNot[i].ToString(), - Total = httpClientResult.Total, - }; - data.Add(statisticsInfoDto); - } + Name = statusNot[i].ToString() + "已超时", + Total = httpClientResult.Total, + }; + data.Add(statisticsInfoDto); + } + else + { + StatisticsInfoDto statisticsInfoDto = new() + { + Name = statusNot[i].ToString(), + Total = httpClientResult.Total, + }; + data.Add(statisticsInfoDto); } } } - - result.Data = MergeStatistics(data); } + + result.Data = MergeStatistics(data); } catch (Exception ex) {