wenjy
/
Sln.Wcs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change - dev

Browse Source
dev
wenjy 13 hours ago
parent 6a28f14fb1
commit 71f4127c39
8 changed files with 155 additions and 35 deletions
Show Stats Download Patch File Download Diff File

6
Sln.Wcs.HikRoBotApi/Service/Impl/HikRoBotService.cs
Unescape Escape View File

@ -1,4 +1,4 @@
using Sln.Wcs.HikRoBotApi.Domain.Dto.CancelTask;
using Sln.Wcs.HikRoBotApi.Domain.Dto.CancelTask;
using Sln.Wcs.HikRoBotApi.Domain.Dto.ContinueTask;
using Sln.Wcs.HikRoBotApi.Domain.Dto.GenAgvSchedulingTask;
using Sln.Wcs.HikRoBotApi.Enum;
@ -37,10 +37,10 @@ namespace Sln.Wcs.HikRoBotApi.Service.Impl
{
public class HikRoBotService : IHikRoBotService
{
private readonly HIKRoBotSdk hikRoBotSdk;
private readonly IHIKRoBotSdk hikRoBotSdk;
private readonly ApiResultCodeUtil codeUtil;
public HikRoBotService(HIKRoBotSdk hikRoBotSdk,ApiResultCodeUtil codeUtil)
public HikRoBotService(IHIKRoBotSdk hikRoBotSdk,ApiResultCodeUtil codeUtil)
{
this.hikRoBotSdk = hikRoBotSdk;
this.codeUtil = codeUtil;

44
Sln.Wcs.HikRoBotSdk/Config/HikRoBotConfig.cs
Unescape Escape View File

@ -49,32 +49,32 @@ namespace Sln.Wcs.HikRoBotSdk.Config
{
throw new Exception("sdk_api 配置不正确,请检查Apollo配置.");
}
if (string.IsNullOrEmpty(configuration["sdk_partner_id"]))
if (string.IsNullOrEmpty(configuration["sdk_json_str"]))
{
throw new Exception("sdk_partner_id 配置不正确,请检查Apollo配置.");
}
if (string.IsNullOrEmpty(configuration["sdk_accesskey"]))
{
throw new Exception("sdk_accesskey 配置不正确,请检查Apollo配置.");
}
if (string.IsNullOrEmpty(configuration["sdk_secretkey"]))
{
throw new Exception("sdk_secretkey 配置不正确,请检查Apollo配置.");
}
if (string.IsNullOrEmpty(configuration["sdk_partner_id"]))
{
throw new Exception("sdk_partner_id 配置不正确,请检查Apollo配置.");
}
if (string.IsNullOrEmpty(configuration["sdk_version"]))
{
throw new Exception("sdk_version 配置不正确,请检查Apollo配置.");
}
//if (string.IsNullOrEmpty(configuration["sdk_accesskey"]))
//{
// throw new Exception("sdk_accesskey 配置不正确,请检查Apollo配置.");
//}
//if (string.IsNullOrEmpty(configuration["sdk_secretkey"]))
//{
// throw new Exception("sdk_secretkey 配置不正确,请检查Apollo配置.");
//}
//if (string.IsNullOrEmpty(configuration["sdk_partner_id"]))
//{
// throw new Exception("sdk_partner_id 配置不正确,请检查Apollo配置.");
//}
//if (string.IsNullOrEmpty(configuration["sdk_version"]))
//{
// throw new Exception("sdk_version 配置不正确,请检查Apollo配置.");
//}
api = configuration["sdk_api"];
accesskey = configuration["sdk_accesskey"];
secretkey = configuration["sdk_secretkey"];
version = configuration["sdk_version"];
test = configuration["sdk_test"];
api = configuration["sdk_json_str"];
//accesskey = configuration["sdk_accesskey"];
//secretkey = configuration["sdk_secretkey"];
//version = configuration["sdk_version"];
//test = configuration["sdk_test"];
// api = "http://www.fangcang.com/tmc-hub/queryProductDetail";
// partnerId = "P10000408";

4
Sln.Wcs.HikRoBotSdk/HIkRoBotSdk.cs
Unescape Escape View File

@ -1,4 +1,4 @@
using Flurl.Http;
using Flurl.Http;
using Newtonsoft.Json;
using Sln.Wcs.HikRoBotSdk.Config;
using Sln.Wcs.HikRoBotSdk.Dto.CancelTask;
@ -34,7 +34,7 @@ using System.Threading.Tasks;
#endregion << 版 本 注 释 >>
namespace Sln.Wcs.HikRoBotSdk
{
public class HIKRoBotSdk
public class HIKRoBotSdk : IHIKRoBotSdk
{
private readonly HikRoBotConfig hikRoBotConfig;

19
Sln.Wcs.HikRoBotSdk/IHIKRoBotSdk.cs
Unescape Escape View File

@ -0,0 +1,19 @@
using Sln.Wcs.HikRoBotSdk.Dto.CancelTask;
using Sln.Wcs.HikRoBotSdk.Dto.ContinueTask;
using Sln.Wcs.HikRoBotSdk.Dto.GenAgvSchedulingTask;
namespace Sln.Wcs.HikRoBotSdk
{
/// <summary>
/// 海康机器人 SDK 抽象接口，方便单元测试和替换实现。
/// </summary>
public interface IHIKRoBotSdk
{
GenAgvSchedulingTaskResultDto GenAgvSchedulingTask(GenAgvSchedulingTaskDto genAgvSchedulingTask);
ContinueTaskResultDto ContinueTask(ContinueTaskDto continueTask);
CancelTaskResultDto CancelTask(CancelTaskDto cancelTask);
}
}

5
Sln.Wcs.sln
Unescape Escape View File

@ -1,4 +1,3 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.10.35122.118
@ -7,9 +6,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sln.Wcs", "Sln.Wcs\Sln.Wcs.
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sln.Wcs.Common", "Sln.Wcs.Common\Sln.Wcs.Common.csproj", "{D94D5F31-AA0D-4F60-A3B4-667A1FFCD6ED}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sln.Wcs.HikRoBotSdk", "Sln.Wcs.HikRoBotSdk\Sln.Wcs.HikRoBotSdk.csproj", "{F2956A97-69F4-4073-B4C6-72CB7B945565}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sln.Wcs.HikRoBotSdk", "Sln.Wcs.HikRoBotSdk\Sln.Wcs.HikRoBotSdk.csproj", "{F2956A97-69F4-4073-B4C6-72CB7B945565}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sln.Wcs.HikRoBotApi", "Sln.Wcs.HikRoBotApi\Sln.Wcs.HikRoBotApi.csproj", "{9E3193CA-590C-4965-B2EF-02C2AE252095}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sln.Wcs.HikRoBotApi", "Sln.Wcs.HikRoBotApi\Sln.Wcs.HikRoBotApi.csproj", "{9E3193CA-590C-4965-B2EF-02C2AE252095}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution

70
Sln.Wcs/Program.cs
Unescape Escape View File

@ -1,10 +1,70 @@
namespace Sln.Wcs
using System.Reflection;
using Com.Ctrip.Framework.Apollo;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Sln.Wcs.HikRoBotSdk;
namespace Sln.Wcs
{
internal class Program
public class Program
{
static void Main(string[] args)
static async Task Main(string[] args)
{
Console.WriteLine("Hello, World!");
var services = new ServiceCollection();
ConfigureServices(services);
var serviceProvider = services.BuildServiceProvider();
var sdk = serviceProvider.GetService<IHIKRoBotSdk>();
//var info = sdk.GenAgvSchedulingTask(null);
Console.WriteLine("\n程序执行完成！");
}
private static void ConfigureServices(IServiceCollection services)
{
#region Apollo配置
var basePath = AppContext.BaseDirectory;
var localConfiguration = new ConfigurationBuilder()
.SetBasePath(basePath)
.AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
.Build();
var apolloConfigSection = localConfiguration.GetSection("apollo");
services.AddSingleton<IConfiguration>(localConfiguration);
var configurationBuilder = new ConfigurationBuilder()
.SetBasePath(basePath)
.AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
.AddApollo(apolloConfigSection)
.AddDefault();
var apolloConfiguration = configurationBuilder.Build();
services.Remove(new ServiceDescriptor(typeof(IConfiguration), localConfiguration));
services.AddSingleton<IConfiguration>(apolloConfiguration);
#endregion
Assembly[] assemblies = {
Assembly.LoadFrom(Path.Combine(basePath, "Sln.Wcs.Common.dll")),
Assembly.LoadFrom(Path.Combine(basePath, "Sln.Wcs.HikRoBotApi.dll")),
Assembly.LoadFrom(Path.Combine(basePath, "Sln.Wcs.HikRoBotSdk.dll")),
};
services.Scan(scan => scan.FromAssemblies(assemblies)
.AddClasses()
.AsImplementedInterfaces()
.AsSelf()
.WithTransientLifetime());
}
}
}
}

24
Sln.Wcs/Sln.Wcs.csproj
Unescape Escape View File

@ -5,6 +5,30 @@
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<SatelliteResourceLanguages>zh-Hans</SatelliteResourceLanguages>
</PropertyGroup>
<ItemGroup>
<None Remove="appsettings.json" />
</ItemGroup>
<ItemGroup>
<Content Include="appsettings.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Com.Ctrip.Framework.Apollo" Version="2.11.0" />
<PackageReference Include="Com.Ctrip.Framework.Apollo.Configuration" Version="2.11.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
<PackageReference Include="Scrutor" Version="7.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Sln.Wcs.HikRoBotApi\Sln.Wcs.HikRoBotApi.csproj" />
<ProjectReference Include="..\Sln.Wcs.HikRoBotSdk\Sln.Wcs.HikRoBotSdk.csproj" />
</ItemGroup>
</Project>

18
Sln.Wcs/appsettings.json
Unescape Escape View File

@ -0,0 +1,18 @@
{
"exclude": [
"**/bin",
"**/bower_components",
"**/jspm_packages",
"**/node_modules",
"**/obj",
"**/platforms"
],
"apollo": {
"AppId": "SampleApp",
"Env": "DEV",
"MetaServer": "http://119.45.202.115:4320",
"ConfigServer": [
"http://119.45.202.115:4320"
]
}
}
Write Preview
Loading…
Cancel
Save