From 07447b2115efef12dbfdf1e07290ee640182ce14 Mon Sep 17 00:00:00 2001 From: LiuXin Date: Sun, 17 Aug 2025 16:12:13 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E4=B8=80=E4=B8=8B=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Alarm.Application/Alarm.Application.csproj | 5 +++++ .../DahAlarm/DahuaGeneralCtlService.cs | 7 +------ .../DahAlarm/IDahuaGeneralCtlService.cs | 4 +--- .../AlarmService.API/Controllers/AlarmController.cs | 7 ++++--- .../Common.Shared.Application.csproj | 10 +++++++++- .../DaHua}/RequestDto/DahuaVideoQueryDto.cs | 2 +- .../DaHua}/RequestDto/SubscribeEventReqDto.cs | 2 +- .../DaHua}/ResponeDto/DahuaVideoResDto.cs | 2 +- .../DaHua}/ResponeDto/EventEnvelopeDto.cs | 2 +- .../Controllers/DaHua/VideoManageController.cs | 1 - .../Video.Application/Video.Application.csproj | 5 +++++ .../Dahvision/DahuaGeneralCtlService.cs | 1 - .../Dahvision/IDahuaGeneralCtlService.cs | 1 - .../Dahvision/IRootVideoPlaybackService.cs | 1 - .../Dahvision/RootVideoPlaybackService.cs | 1 - 15 files changed, 29 insertions(+), 22 deletions(-) rename WeiCloud.Fusion/{VideoService/Video.Application => Common.SharedService/Common.Shared.Application/DaHua}/RequestDto/DahuaVideoQueryDto.cs (99%) rename WeiCloud.Fusion/{AlarmService/Alarm.Application => Common.SharedService/Common.Shared.Application/DaHua}/RequestDto/SubscribeEventReqDto.cs (97%) rename WeiCloud.Fusion/{VideoService/Video.Application => Common.SharedService/Common.Shared.Application/DaHua}/ResponeDto/DahuaVideoResDto.cs (99%) rename WeiCloud.Fusion/{AlarmService/Alarm.Application => Common.SharedService/Common.Shared.Application/DaHua}/ResponeDto/EventEnvelopeDto.cs (99%) diff --git a/WeiCloud.Fusion/AlarmService/Alarm.Application/Alarm.Application.csproj b/WeiCloud.Fusion/AlarmService/Alarm.Application/Alarm.Application.csproj index fa71b7a..b234dd2 100644 --- a/WeiCloud.Fusion/AlarmService/Alarm.Application/Alarm.Application.csproj +++ b/WeiCloud.Fusion/AlarmService/Alarm.Application/Alarm.Application.csproj @@ -6,4 +6,9 @@ enable + + + + + diff --git a/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/DahuaGeneralCtlService.cs b/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/DahuaGeneralCtlService.cs index 9ca05cc..91a6a1f 100644 --- a/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/DahuaGeneralCtlService.cs +++ b/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/DahuaGeneralCtlService.cs @@ -1,12 +1,7 @@ -using Alarm.Application.RequestDto; -using Alarm.Application.ResponeDto; -using Common.Shared.Application.DaHua; +using Common.Shared.Application.DaHua; using Common.Shared.DomainService; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; -using NewLife.Remoting; -using OfficeOpenXml.FormulaParsing.LexicalAnalysis; -using Org.BouncyCastle.Ocsp; using System.Net.Http.Headers; using System.Net.Http.Json; using System.Text.Json; diff --git a/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/IDahuaGeneralCtlService.cs b/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/IDahuaGeneralCtlService.cs index b4a7032..2f9c716 100644 --- a/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/IDahuaGeneralCtlService.cs +++ b/WeiCloud.Fusion/AlarmService/Alarm.DomainService/DahAlarm/IDahuaGeneralCtlService.cs @@ -1,6 +1,4 @@ -using Alarm.Application.ResponeDto; -using Common.Shared.Application.DaHua; -using WeiCloud.Core.BaseModels; +using Common.Shared.Application.DaHua; namespace Alarm.DomainService.DahAlarm { diff --git a/WeiCloud.Fusion/AlarmService/AlarmService.API/Controllers/AlarmController.cs b/WeiCloud.Fusion/AlarmService/AlarmService.API/Controllers/AlarmController.cs index 4572081..6a795e8 100644 --- a/WeiCloud.Fusion/AlarmService/AlarmService.API/Controllers/AlarmController.cs +++ b/WeiCloud.Fusion/AlarmService/AlarmService.API/Controllers/AlarmController.cs @@ -1,11 +1,12 @@ -using Alarm.Application.ResponeDto; -using Alarm.DomainService.DahAlarm; +using Alarm.DomainService.DahAlarm; using Common.Shared.Application.DaHua; using Microsoft.AspNetCore.Mvc; -using WeiCloud.Core.BaseModels; namespace AlarmService.API.Controllers { + /// + /// 大华设备报警 + /// [Route("api/[controller]/[action]")] [ApiController] public class AlarmController : ControllerBase 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 fa71b7a..4e30956 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 @@ -5,5 +5,13 @@ enable enable - + + Common.Shared.Application + 1.0.1 + zrh-lx + zrh-lx + 包含所有公共使用的 DTO、契约、接口模型等，供微服务之间共享使用 + shared;dto;contracts;microservices + https://v4.weienergy.cn/(可选) + diff --git a/WeiCloud.Fusion/VideoService/Video.Application/RequestDto/DahuaVideoQueryDto.cs b/WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/DaHua/RequestDto/DahuaVideoQueryDto.cs similarity index 99% rename from WeiCloud.Fusion/VideoService/Video.Application/RequestDto/DahuaVideoQueryDto.cs rename to WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/DaHua/RequestDto/DahuaVideoQueryDto.cs index be73ef0..d042e23 100644 --- a/WeiCloud.Fusion/VideoService/Video.Application/RequestDto/DahuaVideoQueryDto.cs +++ b/WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/DaHua/RequestDto/DahuaVideoQueryDto.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using System.Text.Json.Serialization; -namespace Video.Application +namespace Common.Shared.Application.DaHua { /// /// hls、rtmp回放请求的数据部分 diff --git a/WeiCloud.Fusion/AlarmService/Alarm.Application/RequestDto/SubscribeEventReqDto.cs b/WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/DaHua/RequestDto/SubscribeEventReqDto.cs similarity index 97% rename from WeiCloud.Fusion/AlarmService/Alarm.Application/RequestDto/SubscribeEventReqDto.cs rename to WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/DaHua/RequestDto/SubscribeEventReqDto.cs index 05aeaa7..73cdc0c 100644 --- a/WeiCloud.Fusion/AlarmService/Alarm.Application/RequestDto/SubscribeEventReqDto.cs +++ b/WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/DaHua/RequestDto/SubscribeEventReqDto.cs @@ -1,6 +1,6 @@ using System.Text.Json.Serialization; -namespace Alarm.Application.RequestDto +namespace Common.Shared.Application.DaHua { public sealed class SubscribeReqDto { diff --git a/WeiCloud.Fusion/VideoService/Video.Application/ResponeDto/DahuaVideoResDto.cs b/WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/DaHua/ResponeDto/DahuaVideoResDto.cs similarity index 99% rename from WeiCloud.Fusion/VideoService/Video.Application/ResponeDto/DahuaVideoResDto.cs rename to WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/DaHua/ResponeDto/DahuaVideoResDto.cs index 76f9bc5..5f90e49 100644 --- a/WeiCloud.Fusion/VideoService/Video.Application/ResponeDto/DahuaVideoResDto.cs +++ b/WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/DaHua/ResponeDto/DahuaVideoResDto.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; using System.Text.Json.Serialization; -namespace Video.Application +namespace Common.Shared.Application.DaHua { /// /// 录像段信息响应实体类 diff --git a/WeiCloud.Fusion/AlarmService/Alarm.Application/ResponeDto/EventEnvelopeDto.cs b/WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/DaHua/ResponeDto/EventEnvelopeDto.cs similarity index 99% rename from WeiCloud.Fusion/AlarmService/Alarm.Application/ResponeDto/EventEnvelopeDto.cs rename to WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/DaHua/ResponeDto/EventEnvelopeDto.cs index 16b8c57..299ec22 100644 --- a/WeiCloud.Fusion/AlarmService/Alarm.Application/ResponeDto/EventEnvelopeDto.cs +++ b/WeiCloud.Fusion/Common.SharedService/Common.Shared.Application/DaHua/ResponeDto/EventEnvelopeDto.cs @@ -6,7 +6,7 @@ using System.Text.Json; using System.Text.Json.Serialization; using System.Threading.Tasks; -namespace Alarm.Application.ResponeDto +namespace Common.Shared.Application.DaHua { /// /// ICC 回调的通用消息封包 diff --git a/WeiCloud.Fusion/VideoService/Video.API/Controllers/DaHua/VideoManageController.cs b/WeiCloud.Fusion/VideoService/Video.API/Controllers/DaHua/VideoManageController.cs index 8c2b9cb..502f31c 100644 --- a/WeiCloud.Fusion/VideoService/Video.API/Controllers/DaHua/VideoManageController.cs +++ b/WeiCloud.Fusion/VideoService/Video.API/Controllers/DaHua/VideoManageController.cs @@ -1,6 +1,5 @@ using Common.Shared.Application.DaHua; using Microsoft.AspNetCore.Mvc; -using Video.Application; using Video.DomainService; using WeiCloud.Core.BaseModels; diff --git a/WeiCloud.Fusion/VideoService/Video.Application/Video.Application.csproj b/WeiCloud.Fusion/VideoService/Video.Application/Video.Application.csproj index fa71b7a..b234dd2 100644 --- a/WeiCloud.Fusion/VideoService/Video.Application/Video.Application.csproj +++ b/WeiCloud.Fusion/VideoService/Video.Application/Video.Application.csproj @@ -6,4 +6,9 @@ enable + + + + + diff --git a/WeiCloud.Fusion/VideoService/Video.DomainService/Dahvision/DahuaGeneralCtlService.cs b/WeiCloud.Fusion/VideoService/Video.DomainService/Dahvision/DahuaGeneralCtlService.cs index c272069..0e2864a 100644 --- a/WeiCloud.Fusion/VideoService/Video.DomainService/Dahvision/DahuaGeneralCtlService.cs +++ b/WeiCloud.Fusion/VideoService/Video.DomainService/Dahvision/DahuaGeneralCtlService.cs @@ -4,7 +4,6 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; using System.Net.Http.Json; using System.Text.Json; -using Video.Application; namespace Video.DomainService { diff --git a/WeiCloud.Fusion/VideoService/Video.DomainService/Dahvision/IDahuaGeneralCtlService.cs b/WeiCloud.Fusion/VideoService/Video.DomainService/Dahvision/IDahuaGeneralCtlService.cs index ce04c2d..1a7f02e 100644 --- a/WeiCloud.Fusion/VideoService/Video.DomainService/Dahvision/IDahuaGeneralCtlService.cs +++ b/WeiCloud.Fusion/VideoService/Video.DomainService/Dahvision/IDahuaGeneralCtlService.cs @@ -1,5 +1,4 @@ using Common.Shared.Application.DaHua; -using Video.Application; namespace Video.DomainService { diff --git a/WeiCloud.Fusion/VideoService/Video.DomainService/Dahvision/IRootVideoPlaybackService.cs b/WeiCloud.Fusion/VideoService/Video.DomainService/Dahvision/IRootVideoPlaybackService.cs index ff8cfaa..6c6948a 100644 --- a/WeiCloud.Fusion/VideoService/Video.DomainService/Dahvision/IRootVideoPlaybackService.cs +++ b/WeiCloud.Fusion/VideoService/Video.DomainService/Dahvision/IRootVideoPlaybackService.cs @@ -1,5 +1,4 @@ using Common.Shared.Application.DaHua; -using Video.Application; using WeiCloud.Core.BaseModels; namespace Video.DomainService diff --git a/WeiCloud.Fusion/VideoService/Video.DomainService/Dahvision/RootVideoPlaybackService.cs b/WeiCloud.Fusion/VideoService/Video.DomainService/Dahvision/RootVideoPlaybackService.cs index d453f6c..ea68a37 100644 --- a/WeiCloud.Fusion/VideoService/Video.DomainService/Dahvision/RootVideoPlaybackService.cs +++ b/WeiCloud.Fusion/VideoService/Video.DomainService/Dahvision/RootVideoPlaybackService.cs @@ -1,7 +1,6 @@ using Common.Shared.Application.DaHua; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; -using Video.Application; using WeiCloud.Core.BaseModels; namespace Video.DomainService