Browse Source

update 架构

pull/1/head
fajiao 3 years ago
parent
commit
716b2f1181
  1. 5
      BusinessModule/EC.App.ThatBLL/Onvif/CurdBLL.cs
  2. 5
      BusinessModule/EC.App.ThatBLL/Onvif/DeviceBLL.cs
  3. 11
      BusinessModule/EC.App.ThatBLL/Onvif/ImagingBLL.cs
  4. 2
      BusinessModule/EC.App.ThatBLL/Onvif/Intf/ICurdBLL.cs
  5. 2
      BusinessModule/EC.App.ThatBLL/Onvif/Intf/IDeviceBLL.cs
  6. 2
      BusinessModule/EC.App.ThatBLL/Onvif/Intf/IImagingBLL.cs
  7. 2
      BusinessModule/EC.App.ThatBLL/Onvif/Intf/IMediaBLL.cs
  8. 2
      BusinessModule/EC.App.ThatBLL/Onvif/Intf/IPTZBLL.cs
  9. 5
      BusinessModule/EC.App.ThatBLL/Onvif/MediaBLL.cs
  10. 5
      BusinessModule/EC.App.ThatBLL/Onvif/PTZBLL.cs
  11. 4
      BusinessModule/EC.App.ThatService/EC.App.ThatService.csproj
  12. 9
      BusinessModule/EC.App.ThatService/Onvif/IOnvifClientService.cs
  13. 8
      BusinessModule/EC.App.ThatService/Onvif/OnvifClientService.cs
  14. 2
      OnvifWebServer/Controllers/Onvif/CurdController.cs
  15. 2
      OnvifWebServer/Controllers/Onvif/DeviceController.cs
  16. 2
      OnvifWebServer/Controllers/Onvif/ImagingController.cs
  17. 6
      OnvifWebServer/Controllers/Onvif/MediaController.cs
  18. 2
      OnvifWebServer/Controllers/Onvif/PTZController.cs
  19. 2
      OnvifWebServer/OnvifWebServer.csproj

5
BusinessModule/EC.App.ThatBLL/Onvif/Impl/CurdBLL.cs → BusinessModule/EC.App.ThatBLL/Onvif/CurdBLL.cs

@ -1,8 +1,9 @@
using EC.App.ThatService.Onvif.Impl; using EC.App.ThatBLL.Onvif.Intf;
using EC.App.ThatService.Onvif;
using EC.Onvif; using EC.Onvif;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace EC.App.ThatBLL.Onvif.Impl namespace EC.App.ThatBLL.Onvif
{ {
public class CurdBLL : ICurdBLL public class CurdBLL : ICurdBLL
{ {

5
BusinessModule/EC.App.ThatBLL/Onvif/Impl/DeviceBLL.cs → BusinessModule/EC.App.ThatBLL/Onvif/DeviceBLL.cs

@ -1,7 +1,8 @@
using EC.App.ThatService.Onvif.Impl; using EC.App.ThatBLL.Onvif.Intf;
using EC.App.ThatService.Onvif;
using EC.Onvif; using EC.Onvif;
namespace EC.App.ThatBLL.Onvif.Impl namespace EC.App.ThatBLL.Onvif
{ {
public class DeviceBLL : IDeviceBLL public class DeviceBLL : IDeviceBLL
{ {

11
BusinessModule/EC.App.ThatBLL/Onvif/Impl/ImagingBLL.cs → BusinessModule/EC.App.ThatBLL/Onvif/ImagingBLL.cs

@ -1,8 +1,9 @@
using EC.App.ThatService.Onvif.Impl; using EC.App.ThatBLL.Onvif.Intf;
using EC.App.ThatService.Onvif;
using EC.Onvif; using EC.Onvif;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace EC.App.ThatBLL.Onvif.Impl namespace EC.App.ThatBLL.Onvif
{ {
public class ImagingBLL : IImagingBLL public class ImagingBLL : IImagingBLL
{ {
@ -24,7 +25,7 @@ namespace EC.App.ThatBLL.Onvif.Impl
{ {
bool flag = _ocService.TryGet(ip, out OnvifClient onvifClient); bool flag = _ocService.TryGet(ip, out OnvifClient onvifClient);
if (!flag) return false; if (!flag) return false;
await onvifClient.FocusStopMove(); await onvifClient.FocusAbsoluteMove(position);
return true; return true;
} }
@ -32,7 +33,7 @@ namespace EC.App.ThatBLL.Onvif.Impl
{ {
bool flag = _ocService.TryGet(ip, out OnvifClient onvifClient); bool flag = _ocService.TryGet(ip, out OnvifClient onvifClient);
if (!flag) return false; if (!flag) return false;
await onvifClient.FocusStopMove(); await onvifClient.FocusRelativeMove(distance);
return true; return true;
} }
@ -40,7 +41,7 @@ namespace EC.App.ThatBLL.Onvif.Impl
{ {
bool flag = _ocService.TryGet(ip, out OnvifClient onvifClient); bool flag = _ocService.TryGet(ip, out OnvifClient onvifClient);
if (!flag) return false; if (!flag) return false;
await onvifClient.FocusStopMove(); await onvifClient.FocusContinuousMove(speed);
return true; return true;
} }

2
BusinessModule/EC.App.ThatBLL/Onvif/ICurdBLL.cs → BusinessModule/EC.App.ThatBLL/Onvif/Intf/ICurdBLL.cs

@ -2,7 +2,7 @@
using Furion.DependencyInjection; using Furion.DependencyInjection;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace EC.App.ThatBLL.Onvif namespace EC.App.ThatBLL.Onvif.Intf
{ {
public interface ICurdBLL : IBLL, ISingleton public interface ICurdBLL : IBLL, ISingleton
{ {

2
BusinessModule/EC.App.ThatBLL/Onvif/IDeviceBLL.cs → BusinessModule/EC.App.ThatBLL/Onvif/Intf/IDeviceBLL.cs

@ -1,7 +1,7 @@
using EC.App.Core; using EC.App.Core;
using Furion.DependencyInjection; using Furion.DependencyInjection;
namespace EC.App.ThatBLL.Onvif namespace EC.App.ThatBLL.Onvif.Intf
{ {
public interface IDeviceBLL : IBLL, ISingleton public interface IDeviceBLL : IBLL, ISingleton
{ {

2
BusinessModule/EC.App.ThatBLL/Onvif/IImagingBLL.cs → BusinessModule/EC.App.ThatBLL/Onvif/Intf/IImagingBLL.cs

@ -2,7 +2,7 @@
using Furion.DependencyInjection; using Furion.DependencyInjection;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace EC.App.ThatBLL.Onvif namespace EC.App.ThatBLL.Onvif.Intf
{ {
public interface IImagingBLL : IBLL, ISingleton public interface IImagingBLL : IBLL, ISingleton
{ {

2
BusinessModule/EC.App.ThatBLL/Onvif/IMediaBLL.cs → BusinessModule/EC.App.ThatBLL/Onvif/Intf/IMediaBLL.cs

@ -2,7 +2,7 @@
using Furion.DependencyInjection; using Furion.DependencyInjection;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace EC.App.ThatBLL.Onvif namespace EC.App.ThatBLL.Onvif.Intf
{ {
public interface IMediaBLL : IBLL, ISingleton public interface IMediaBLL : IBLL, ISingleton
{ {

2
BusinessModule/EC.App.ThatBLL/Onvif/IPTZBLL.cs → BusinessModule/EC.App.ThatBLL/Onvif/Intf/IPTZBLL.cs

@ -2,7 +2,7 @@
using Furion.DependencyInjection; using Furion.DependencyInjection;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace EC.App.ThatBLL.Onvif namespace EC.App.ThatBLL.Onvif.Intf
{ {
public interface IPTZBLL : IBLL, ISingleton public interface IPTZBLL : IBLL, ISingleton
{ {

5
BusinessModule/EC.App.ThatBLL/Onvif/Impl/MediaBLL.cs → BusinessModule/EC.App.ThatBLL/Onvif/MediaBLL.cs

@ -1,11 +1,12 @@
using EC.App.ThatService.Onvif.Impl; using EC.App.ThatBLL.Onvif.Intf;
using EC.App.ThatService.Onvif;
using EC.Onvif; using EC.Onvif;
using System; using System;
using System.IO; using System.IO;
using System.Net; using System.Net;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace EC.App.ThatBLL.Onvif.Impl namespace EC.App.ThatBLL.Onvif
{ {
public class MediaBLL : IMediaBLL public class MediaBLL : IMediaBLL
{ {

5
BusinessModule/EC.App.ThatBLL/Onvif/Impl/PTZBLL.cs → BusinessModule/EC.App.ThatBLL/Onvif/PTZBLL.cs

@ -1,8 +1,9 @@
using EC.App.ThatService.Onvif.Impl; using EC.App.ThatBLL.Onvif.Intf;
using EC.App.ThatService.Onvif;
using EC.Onvif; using EC.Onvif;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace EC.App.ThatBLL.Onvif.Impl namespace EC.App.ThatBLL.Onvif
{ {
public class PTZBLL : IPTZBLL public class PTZBLL : IPTZBLL
{ {

4
BusinessModule/EC.App.ThatService/EC.App.ThatService.csproj

@ -10,4 +10,8 @@
<ProjectReference Include="..\EC.App.Entity\EC.App.Entity.csproj" /> <ProjectReference Include="..\EC.App.Entity\EC.App.Entity.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Folder Include="Onvif\Intf\" />
</ItemGroup>
</Project> </Project>

9
BusinessModule/EC.App.ThatService/Onvif/IOnvifClientService.cs

@ -1,9 +0,0 @@
using EC.App.Core;
using Furion.DependencyInjection;
namespace EC.App.ThatService.Onvif
{
public interface IOnvifClientService : IService, ISingleton
{
}
}

8
BusinessModule/EC.App.ThatService/Onvif/Impl/OnvifClientService.cs → BusinessModule/EC.App.ThatService/Onvif/OnvifClientService.cs

@ -1,9 +1,11 @@
using EC.App.Entity.Onvif; using EC.App.Core;
using EC.App.Entity.Onvif;
using EC.Onvif; using EC.Onvif;
using Furion.DependencyInjection;
namespace EC.App.ThatService.Onvif.Impl namespace EC.App.ThatService.Onvif
{ {
public class OnvifClientService : IOnvifClientService public class OnvifClientService : IService, ISingleton
{ {
private readonly OnvifClientDict _dict = new OnvifClientDict(); private readonly OnvifClientDict _dict = new OnvifClientDict();

2
OnvifWebServer/Controllers/Onvif/CurdController.cs

@ -1,5 +1,5 @@
using EC.App.Core; using EC.App.Core;
using EC.App.ThatBLL.Onvif; using EC.App.ThatBLL.Onvif.Intf;
using Furion.DataValidation; using Furion.DataValidation;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;

2
OnvifWebServer/Controllers/Onvif/DeviceController.cs

@ -1,5 +1,5 @@
using EC.App.Core; using EC.App.Core;
using EC.App.ThatBLL.Onvif; using EC.App.ThatBLL.Onvif.Intf;
using Furion.DataValidation; using Furion.DataValidation;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;

2
OnvifWebServer/Controllers/Onvif/ImagingController.cs

@ -1,5 +1,5 @@
using EC.App.Core; using EC.App.Core;
using EC.App.ThatBLL.Onvif; using EC.App.ThatBLL.Onvif.Intf;
using Furion.DataValidation; using Furion.DataValidation;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;

6
OnvifWebServer/Controllers/Onvif/MediaController.cs

@ -1,5 +1,5 @@
using EC.App.Core; using EC.App.Core;
using EC.App.ThatBLL.Onvif; using EC.App.ThatBLL.Onvif.Intf;
using Furion.DataValidation; using Furion.DataValidation;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;
@ -45,7 +45,7 @@ namespace OnvifWebServer.Controllers.Onvif
/// <param name="ip"></param> /// <param name="ip"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpGet]
public async Task<string> GetStreamUri( public async Task<string> GetStreamUrl(
[Required][DataValidation(ValidationTypes.IPv4)] string ip) [Required][DataValidation(ValidationTypes.IPv4)] string ip)
{ {
string url = await _mediaBLL.GetStreamUrl(ip); string url = await _mediaBLL.GetStreamUrl(ip);
@ -58,7 +58,7 @@ namespace OnvifWebServer.Controllers.Onvif
/// <param name="ip"></param> /// <param name="ip"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpGet]
public async Task<string> GetSnapshotUri( public async Task<string> GetSnapshotUrl(
[Required][DataValidation(ValidationTypes.IPv4)] string ip) [Required][DataValidation(ValidationTypes.IPv4)] string ip)
{ {
string url = await _mediaBLL.GetSnapshotUrl(ip); string url = await _mediaBLL.GetSnapshotUrl(ip);

2
OnvifWebServer/Controllers/Onvif/PTZController.cs

@ -1,5 +1,5 @@
using EC.App.Core; using EC.App.Core;
using EC.App.ThatBLL.Onvif; using EC.App.ThatBLL.Onvif.Intf;
using Furion.DataValidation; using Furion.DataValidation;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations;

2
OnvifWebServer/OnvifWebServer.csproj

@ -12,4 +12,6 @@
<ProjectReference Include="..\BusinessModule\EC.App.ThatBLL\EC.App.ThatBLL.csproj" /> <ProjectReference Include="..\BusinessModule\EC.App.ThatBLL\EC.App.ThatBLL.csproj" />
</ItemGroup> </ItemGroup>
<ProjectExtensions><VisualStudio><UserProperties appsettings_1json__JsonSchema="" /></VisualStudio></ProjectExtensions>
</Project> </Project>

Loading…
Cancel
Save