驼峰大小写转换,首页对外接口对接
This commit is contained in:
parent
339592fd9c
commit
c7b4801d89
|
|
@ -1973,6 +1973,13 @@
|
||||||
</summary>
|
</summary>
|
||||||
<returns></returns>
|
<returns></returns>
|
||||||
</member>
|
</member>
|
||||||
|
<member name="M:langguanApi.Service.EnvGovService.ConvertDeviceType(System.Int32)">
|
||||||
|
<summary>
|
||||||
|
转换设备类型
|
||||||
|
</summary>
|
||||||
|
<param name="deviceType"></param>
|
||||||
|
<returns></returns>
|
||||||
|
</member>
|
||||||
<member name="M:langguanApi.Service.EnvGovService.DeviceStatu(System.String)">
|
<member name="M:langguanApi.Service.EnvGovService.DeviceStatu(System.String)">
|
||||||
<summary>
|
<summary>
|
||||||
获取设备状态
|
获取设备状态
|
||||||
|
|
|
||||||
|
|
@ -72,7 +72,7 @@ namespace langguanApi.Controllers
|
||||||
[HttpGet("list")]
|
[HttpGet("list")]
|
||||||
public async Task<IActionResult> List([FromQuery] reqpage input)
|
public async Task<IActionResult> List([FromQuery] reqpage input)
|
||||||
{
|
{
|
||||||
var roles = await _roleService.GetPager(input);
|
var roles = await _roleService.GetPage(input);
|
||||||
return Ok(roles);
|
return Ok(roles);
|
||||||
}
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|
|
||||||
|
|
@ -3,6 +3,7 @@ using langguanApi.Extensions;
|
||||||
using langguanApi.Extensions.AutoDI;
|
using langguanApi.Extensions.AutoDI;
|
||||||
using langguanApi.Middleware;
|
using langguanApi.Middleware;
|
||||||
using Microsoft.Extensions.Configuration;
|
using Microsoft.Extensions.Configuration;
|
||||||
|
using Microsoft.Extensions.Options;
|
||||||
using Microsoft.OpenApi.Models;
|
using Microsoft.OpenApi.Models;
|
||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
|
|
||||||
|
|
@ -16,8 +17,11 @@ builder.Services.AddControllers(options =>
|
||||||
options.Filters.Add<CustomerExceptionFilter>();
|
options.Filters.Add<CustomerExceptionFilter>();
|
||||||
}).AddNewtonsoftJson(option =>
|
}).AddNewtonsoftJson(option =>
|
||||||
{
|
{
|
||||||
|
|
||||||
option.SerializerSettings.ContractResolver = new Newtonsoft.Json.Serialization.DefaultContractResolver();
|
option.SerializerSettings.ContractResolver = new Newtonsoft.Json.Serialization.DefaultContractResolver();
|
||||||
option.SerializerSettings.DateFormatString = "yyyy-MM-dd HH:mm:ss";
|
option.SerializerSettings.DateFormatString = "yyyy-MM-dd HH:mm:ss";
|
||||||
|
//ÍÕ·å
|
||||||
|
option.SerializerSettings.ContractResolver = new Newtonsoft.Json.Serialization.CamelCasePropertyNamesContractResolver();
|
||||||
|
|
||||||
}).AddJsonOptions(option =>
|
}).AddJsonOptions(option =>
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -60,7 +60,11 @@ namespace langguanApi.Service
|
||||||
data = deviceList
|
data = deviceList
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
/// <summary>
|
||||||
|
/// 转换设备类型
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="deviceType"></param>
|
||||||
|
/// <returns></returns>
|
||||||
private string ConvertDeviceType(int deviceType)
|
private string ConvertDeviceType(int deviceType)
|
||||||
{
|
{
|
||||||
switch (deviceType)
|
switch (deviceType)
|
||||||
|
|
|
||||||
|
|
@ -69,7 +69,7 @@ namespace langguanApi.Service
|
||||||
var trend = await _cacheManager.GetConvertVale(RedisKeylist.Trend, getTrendFunc, 60 * new Random().Next(70));
|
var trend = await _cacheManager.GetConvertVale(RedisKeylist.Trend, getTrendFunc, 60 * new Random().Next(70));
|
||||||
// 获取远程接口污染物排放率
|
// 获取远程接口污染物排放率
|
||||||
var rateResp = await _httpProxy.Get<RespModel<List<Rate>>>(null, _configuration.GetValue<string>("Apis:RateUrl"));
|
var rateResp = await _httpProxy.Get<RespModel<List<Rate>>>(null, _configuration.GetValue<string>("Apis:RateUrl"));
|
||||||
var rate = rateResp.data.ToList();
|
var rate = rateResp.data.ToList().Take(6);
|
||||||
var AlermResp = await _httpProxy.Get<RespModel<alarmList>>(null, _configuration.GetValue<string>("Apis:AlertUrl"));
|
var AlermResp = await _httpProxy.Get<RespModel<alarmList>>(null, _configuration.GetValue<string>("Apis:AlertUrl"));
|
||||||
// alerts += await _httpProxy.Get<string>(null, _configuration.GetValue<string>("Apis:AlertUrl"));
|
// alerts += await _httpProxy.Get<string>(null, _configuration.GetValue<string>("Apis:AlertUrl"));
|
||||||
// alerts += await _httpProxy.Get<string>(null, _configuration.GetValue<string>("Apis:RateUrl"));
|
// alerts += await _httpProxy.Get<string>(null, _configuration.GetValue<string>("Apis:RateUrl"));
|
||||||
|
|
@ -104,7 +104,7 @@ namespace langguanApi.Service
|
||||||
ariQuality,
|
ariQuality,
|
||||||
rate,
|
rate,
|
||||||
trend,
|
trend,
|
||||||
alerts,
|
alerts= AlermResp.data.List,
|
||||||
cleanData,
|
cleanData,
|
||||||
today,
|
today,
|
||||||
getViewTop = "",
|
getViewTop = "",
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue