推送接口
This commit is contained in:
parent
f97fe92dac
commit
8ea426e33b
|
|
@ -1151,6 +1151,21 @@
|
|||
<param name="Text">原始数据</param>
|
||||
<returns>是否通过</returns>
|
||||
</member>
|
||||
<member name="T:langguanApi.Model.Dto.ReceiveDto">
|
||||
<summary>
|
||||
接收dto
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:langguanApi.Model.Dto.ReceiveDto.dataType">
|
||||
<summary>
|
||||
数据类型,1 门禁 2台账,3 运输 4 地磅,
|
||||
</summary>
|
||||
</member>
|
||||
<member name="P:langguanApi.Model.Dto.ReceiveDto.content">
|
||||
<summary>
|
||||
数据内容 json格式
|
||||
</summary>
|
||||
</member>
|
||||
<member name="T:langguanApi.Model.Dto.RespModel`1">
|
||||
<summary>
|
||||
RespModel
|
||||
|
|
@ -3370,6 +3385,11 @@
|
|||
<param name="ip"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="T:langguanApi.Service.ReceiveDataService">
|
||||
<summary>
|
||||
接收数据服务
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:langguanApi.Service.RoleMenuServie.GetByRoleId(System.String)">
|
||||
<summary>
|
||||
根据角色ID获取角色菜单
|
||||
|
|
@ -3528,6 +3548,11 @@
|
|||
<param name="effluent"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="T:langguanApi.Service.TruckScalesService">
|
||||
<summary>
|
||||
地磅服务
|
||||
</summary>
|
||||
</member>
|
||||
<member name="M:langguanApi.Service.TruckScalesService.AddTruckScalesList(System.Collections.Generic.List{langguanApi.Model.AddTruckScalesDto})">
|
||||
<summary>
|
||||
新加
|
||||
|
|
@ -3535,6 +3560,13 @@
|
|||
<param name="input"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:langguanApi.Service.TruckScalesService.AddTruckScales(langguanApi.Model.AddTruckScalesDto)">
|
||||
<summary>
|
||||
新加
|
||||
</summary>
|
||||
<param name="input"></param>
|
||||
<returns></returns>
|
||||
</member>
|
||||
<member name="M:langguanApi.Service.TruckScalesService.GetTruckScalesList">
|
||||
<summary>
|
||||
获取地磅集合
|
||||
|
|
|
|||
|
|
@ -0,0 +1,34 @@
|
|||
using langguanApi.Model.Dto;
|
||||
using langguanApi.Service;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
|
||||
namespace langguanApi.Controllers
|
||||
{
|
||||
/// <summary>
|
||||
/// 接收数据
|
||||
/// </summary>
|
||||
[Route("api/[controller]")]
|
||||
[ApiController]
|
||||
public class ReceiveController : ControllerBase
|
||||
{
|
||||
private readonly ReceiveDataService _receiveService;
|
||||
/// <summary>
|
||||
/// 接收数据
|
||||
public ReceiveController(ReceiveDataService receiveService)
|
||||
{
|
||||
_receiveService = receiveService;
|
||||
}
|
||||
/// <summary>
|
||||
/// 接收数据
|
||||
/// </summary>
|
||||
/// <param name="input"></param>
|
||||
/// <returns></returns>
|
||||
[HttpPost("receive")]
|
||||
public async Task<IActionResult> Post([FromBody] ReceiveDto input)
|
||||
{
|
||||
var result = await _receiveService.ReceiveData(input);
|
||||
return Ok(result);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
namespace langguanApi.Model.Dto
|
||||
{
|
||||
/// <summary>
|
||||
/// 接收dto
|
||||
/// </summary>
|
||||
public class ReceiveDto
|
||||
{
|
||||
/// <summary>
|
||||
/// 数据类型,1 门禁 2台账,3 运输 4 地磅,
|
||||
/// </summary>
|
||||
public int dataType { get; set; }
|
||||
/// <summary>
|
||||
/// 数据内容 json格式
|
||||
/// </summary>
|
||||
public string content { get; set; }
|
||||
}
|
||||
}
|
||||
|
|
@ -63,35 +63,6 @@ namespace langguanApi.Service
|
|||
});
|
||||
}
|
||||
return result;
|
||||
//var temp = result.Select(s => new
|
||||
//{
|
||||
// s.a34001,
|
||||
// s.a34002,
|
||||
// s.a34004,
|
||||
// date = s.CreateDateTime.AddHours(8).ToString("MM-dd")
|
||||
//}).ToList();
|
||||
//return temp.GroupBy(g => new
|
||||
//{
|
||||
// g.date
|
||||
//})
|
||||
// .Select(s => new
|
||||
// {
|
||||
// s.Key.date,
|
||||
// a34001 = Math.Round(s.Sum(t => t.a34001), 2),
|
||||
// a34002 = Math.Round(s.Sum(t => t.a34002), 2),
|
||||
// a34004 = Math.Round(s.Sum(t => t.a34004), 2)
|
||||
// }).ToList();
|
||||
|
||||
|
||||
//temp.GroupBy(g => new { g.date }).ToList().ForEach(s =>
|
||||
//{
|
||||
// var v1 = temp.Where(m => m.date == s.Key.date).Sum(t => t.a34001);
|
||||
// var v2 = temp.Where(m => m.date == s.Key.date).Sum(t => t.a34002);
|
||||
// var v3 = temp.Where(m => m.date == s.Key.date).Sum(t => t.a34004);
|
||||
// list.Add(new columnView() { hour = s.Key.date, type = "a34001", value = v1 });
|
||||
// list.Add(new columnView() { hour = s.Key.date, type = "a34002", value = Math.Round(v2, 2) });
|
||||
// list.Add(new columnView() { hour = s.Key.date, type = "a34004", value = Math.Round(v3, 2) });
|
||||
//});
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,61 @@
|
|||
|
||||
using langguanApi.Model;
|
||||
using langguanApi.Model.Dto;
|
||||
using langguanApi.Model.Entity;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
namespace langguanApi.Service
|
||||
{
|
||||
/// <summary>
|
||||
/// 接收数据服务
|
||||
/// </summary>
|
||||
public class ReceiveDataService
|
||||
{
|
||||
public ReceiveDataService()
|
||||
{
|
||||
|
||||
}
|
||||
/// <summary>
|
||||
/// 接收数据
|
||||
/// </summary>
|
||||
/// <param name="jsonData"></param>
|
||||
/// <returns></returns>
|
||||
public async Task<ApiResult> ReceiveData(ReceiveDto jsonData)
|
||||
{
|
||||
try
|
||||
{
|
||||
//TODO: 接收到数据后处理
|
||||
switch (jsonData.dataType)
|
||||
{
|
||||
case 1:
|
||||
//TODO: 1门禁
|
||||
//var accessData = JsonConvert.DeserializeObject<AddLedgerDto>(jsonData.content);
|
||||
//var _service = ServiceLocator.Instance.GetService<LedgerService>();
|
||||
break;
|
||||
case 2:
|
||||
//TODO: 2 台账
|
||||
var LedgerData = JsonConvert.DeserializeObject<AddLedgerDto>(jsonData.content);
|
||||
var _service = ServiceLocator.Instance.GetService<LedgerService>();
|
||||
break;
|
||||
case 3:
|
||||
//TODO: 3 运输
|
||||
var TransportData = JsonConvert.DeserializeObject<AddTransport>(jsonData.content);
|
||||
var _Transporservice = ServiceLocator.Instance.GetService<TransportService>();
|
||||
await _Transporservice.addTransport(TransportData);
|
||||
break;
|
||||
case 4:
|
||||
var truckScalesData = JsonConvert.DeserializeObject<AddTruckScalesDto>(jsonData.content);
|
||||
var _TruckScalesService = ServiceLocator.Instance.GetService<TruckScalesService>();
|
||||
await _TruckScalesService.AddTruckScales(truckScalesData);
|
||||
//TODO: 4 地磅
|
||||
break;
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return new ApiResult() { code = 1, msg = ex.Message };
|
||||
}
|
||||
return new ApiResult() { code = 0, msg = "success" };
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -5,6 +5,9 @@ using System.Linq.Expressions;
|
|||
|
||||
namespace langguanApi.Service
|
||||
{
|
||||
/// <summary>
|
||||
/// 地磅服务
|
||||
/// </summary>
|
||||
[ServiceInjection(InjectionType.Transient)]
|
||||
public class TruckScalesService : BaseService<TruckScales>
|
||||
{
|
||||
|
|
@ -19,16 +22,22 @@ namespace langguanApi.Service
|
|||
/// <returns></returns>
|
||||
public async Task AddTruckScalesList(List<AddTruckScalesDto> input)
|
||||
{
|
||||
var list = new List<TruckScales>();
|
||||
foreach (var item in input)
|
||||
{
|
||||
list.Add(item.Adapt<TruckScales>());
|
||||
}
|
||||
var list = input.Adapt<List<TruckScales>>();
|
||||
if (list.Any())
|
||||
{
|
||||
await base.CreateManyAsync(list);
|
||||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// 新加
|
||||
/// </summary>
|
||||
/// <param name="input"></param>
|
||||
/// <returns></returns>
|
||||
public async Task AddTruckScales(AddTruckScalesDto input)
|
||||
{
|
||||
var list = input.Adapt<TruckScales>();
|
||||
await base.CreateAsync(list);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取地磅集合
|
||||
|
|
|
|||
Loading…
Reference in New Issue