yanghongwei
/
lg_backend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

设备类型判断，三方接口接入数据

This commit is contained in:
yanghongwei 2024-07-15 20:44:34 +08:00
parent ec4b8e389c
commit 9a2265d4ae
8 changed files with 241 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

130
langguanApi.xml
View File

@ -430,7 +430,7 @@
</summary>
<returns></returns>
</member>
<member name="M:langguanApi.Controllers.TransportController.Add(langguanApi.Model.Transport)">
<member name="M:langguanApi.Controllers.TransportController.Add(langguanApi.Model.AddTransport)">
<summary>
新增清洁运输
</summary>
@ -804,7 +804,7 @@
</member>
<member name="P:langguanApi.Model.Device.DeviceType">
<summary>
设备类型,1 voc,2 cems,3,tsp,4 video
设备类型,1 voc,2 cems,3,tsp,4 video,5微站
</summary>
</member>
<member name="P:langguanApi.Model.Device.VideoUrl">
@ -1061,6 +1061,11 @@
进场日期
</summary>
</member>
<member name="P:langguanApi.Model.Entity.Ledger.Time">
<summary>
进出场时间
</summary>
</member>
<member name="P:langguanApi.Model.Entity.Ledger.OutTime">
<summary>
出场日期
@ -1817,11 +1822,6 @@
1进，2出
</summary>
</member>
<member name="P:langguanApi.Model.Transport.Address">
<summary>
位置
</summary>
</member>
<member name="P:langguanApi.Model.Transport.effluent">
<summary>
排放标准
@ -1847,6 +1847,111 @@
货物类型
</summary>
</member>
<member name="P:langguanApi.Model.Transport.CarColor">
<summary>
车牌颜色
</summary>
</member>
<member name="P:langguanApi.Model.Transport.CarType">
<summary>
车牌类型
</summary>
</member>
<member name="P:langguanApi.Model.Transport.EntryExitPictureUrl">
<summary>
base64图片 出入场图片 url
</summary>
</member>
<member name="P:langguanApi.Model.Transport.EngineNumber">
<summary>
发动机号
</summary>
</member>
<member name="P:langguanApi.Model.Transport.RegistrationDate">
<summary>
注册日期
</summary>
</member>
<member name="P:langguanApi.Model.Transport.DriverLicenseUrl">
<summary>
base64图片 驾驶证图片 url
</summary>
</member>
<member name="P:langguanApi.Model.Transport.DriverName">
<summary>
驾驶人姓名
</summary>
</member>
<member name="P:langguanApi.Model.Transport.ValidityPeriod">
<summary>
有效期限
</summary>
</member>
<member name="P:langguanApi.Model.AddTransport.CarNumber">
<summary>
车牌号
</summary>
</member>
<member name="P:langguanApi.Model.AddTransport.EntryDirection">
<summary>
进场方向
</summary>
</member>
<member name="P:langguanApi.Model.AddTransport.Time">
<summary>
出入场时间
</summary>
</member>
<member name="P:langguanApi.Model.AddTransport.EmissionLevel">
<summary>
排放等级
</summary>
</member>
<member name="P:langguanApi.Model.AddTransport.CarColor">
<summary>
车牌颜色
</summary>
</member>
<member name="P:langguanApi.Model.AddTransport.CarType">
<summary>
车牌类型
</summary>
</member>
<member name="P:langguanApi.Model.AddTransport.EntryExitPictureUrl">
<summary>
base64图片 出入场图片 url
</summary>
</member>
<member name="P:langguanApi.Model.AddTransport.VIN">
<summary>
vin
</summary>
</member>
<member name="P:langguanApi.Model.AddTransport.EngineNumber">
<summary>
发动机号
</summary>
</member>
<member name="P:langguanApi.Model.AddTransport.RegistrationDate">
<summary>
注册日期
</summary>
</member>
<member name="P:langguanApi.Model.AddTransport.DriverLicenseUrl">
<summary>
base64图片 驾驶证图片 url
</summary>
</member>
<member name="P:langguanApi.Model.AddTransport.DriverName">
<summary>
驾驶人姓名
</summary>
</member>
<member name="P:langguanApi.Model.AddTransport.ValidityPeriod">
<summary>
有效期限
</summary>
</member>
<member name="M:langguanApi.Service.AlertService.Add(langguanApi.Model.AddAlertDto)">
<summary>
新加
@ -2226,6 +2331,13 @@
</summary>
<returns></returns>
</member>
<member name="M:langguanApi.Service.HJ212SocketServer.SetDeviceType(System.String)">
<summary>
设置设备类型
</summary>
<param name="st"></param>
<returns></returns>
</member>
<member name="E:langguanApi.Service.HJ212.NetServer.ReceivedData">
<summary>
收到数据事件
@ -2509,11 +2621,11 @@
TransportService 运输服务
</summary>
</member>
<member name="M:langguanApi.Service.TransportService.addTransport(langguanApi.Model.Transport)">
<member name="M:langguanApi.Service.TransportService.addTransport(langguanApi.Model.AddTransport)">
<summary>
新增运输
</summary>
<param name="transport"></param>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:langguanApi.Service.TransportService.GetIndexCount">

4
langguanApi/Controllers/TransportController.cs
View File

@ -43,8 +43,8 @@ namespace langguanApi.Controllers
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpPatch("add")]
public async Task<IActionResult> Add(Transport input)
[HttpPost("add")]
public async Task<IActionResult> Add(AddTransport input)
{
await _transportService.addTransport(input);
return Ok(new ApiResult() { code = 0 });

2
langguanApi/Model/Device.cs
View File

@ -18,7 +18,7 @@
/// </summary>
public string OrgId { get; set; }
/// <summary>
/// 设备类型,1 voc,2 cems,3,tsp,4 video
/// 设备类型,1 voc,2 cems,3,tsp,4 video,5微站
/// </summary>
public int DeviceType { get; set; }
/// <summary>

4
langguanApi/Model/Entity/Ledger.cs
View File

@ -11,6 +11,10 @@
/// </summary>
public DateTime InTime { get; set; }
/// <summary>
/// 进出场时间
/// </summary>
public DateTime Time { get; set; }
/// <summary>
/// 出场日期
/// </summary>
public DateTime OutTime { get; set; }

93
langguanApi/Model/Transport.cs
View File

@ -11,10 +11,6 @@
/// </summary>
public int TransportType { get; set; }
/// <summary>
/// 位置
/// </summary>
public string Address { get; set; }
/// <summary>
/// 排放标准
/// </summary>
public string effluent { get; set; }
@ -34,5 +30,94 @@
/// 货物类型
/// </summary>
public string Goods { get; set; }
/// <summary>
/// 车牌颜色
/// </summary>
public int CarColor { get; set; }
/// <summary>
/// 车牌类型
/// </summary>
public string CarType { get; set; }
/// <summary>
/// base64图片 出入场图片 url
/// </summary>
public string EntryExitPictureUrl { get; set; }
/// <summary>
/// 发动机号
/// </summary>
public string EngineNumber { get; set; }
/// <summary>
/// 注册日期
/// </summary>
public string RegistrationDate { get; set; }
/// <summary>
/// base64图片 驾驶证图片 url
/// </summary>
public string DriverLicenseUrl { get; set; }
/// <summary>
/// 驾驶人姓名
/// </summary>
public string DriverName { get; set; }
/// <summary>
/// 有效期限
/// </summary>
public string ValidityPeriod { get; set; }
}
public class AddTransport
{
/// <summary>
/// 车牌号
/// </summary>
public string CarNumber { get; set; }
/// <summary>
/// 进场方向
/// </summary>
public int EntryDirection { get; set; }
/// <summary>
/// 出入场时间
/// </summary>
public DateTime Time { get; set; }
/// <summary>
/// 排放等级
/// </summary>
public string EmissionLevel { get; set; }
/// <summary>
/// 车牌颜色
/// </summary>
public int CarColor { get; set; }
/// <summary>
/// 车牌类型
/// </summary>
public string CarType { get; set; }
/// <summary>
/// base64图片 出入场图片 url
/// </summary>
public string EntryExitPictureUrl { get; set; }
/// <summary>
/// vin
/// </summary>
public string VIN { get; set; }
/// <summary>
/// 发动机号
/// </summary>
public string EngineNumber { get; set; }
/// <summary>
/// 注册日期
/// </summary>
public string RegistrationDate { get; set; }
/// <summary>
/// base64图片 驾驶证图片 url
/// </summary>
public string DriverLicenseUrl { get; set; }
/// <summary>
/// 驾驶人姓名
/// </summary>
public string DriverName { get; set; }
/// <summary>
/// 有效期限
/// </summary>
public string ValidityPeriod { get; set; }
}
}

20
langguanApi/Service/HJ212SocketServer.cs
View File

@ -92,33 +92,43 @@ namespace langguanApi.Service
{
Console.WriteLine("收到自: " + session.RemoteIPEndPoint + ": " + rawText);
HJ212_2017 hj = new HJ212_2017();
// st 27 =voc,st=31 cems, st=32,tsp
// st 27 =voc,st=31 cems, st=32,tsp, st=22 微站
if (hj.DecodeData(rawText))
{
var body = JsonConvert.SerializeObject(hj.CP);
Console.WriteLine("解析成功: " + body);
var entity = JsonConvert.DeserializeObject<Model.HJ212>(body);
entity.deviceMN = hj.DATA_HEAD["MN"];
int deviceType = SetDeviceType(hj.DATA_HEAD["ST"]);
if (entity.a34001 > 0 && deviceType == 3)
{
deviceType = 5;
}
await _deviceService.Add(new DeviceAddDto
{
deviceMN = hj.DATA_HEAD["MN"],
DeviceType = SetDeviceType(hj.DATA_HEAD["ST"]),
DeviceType = deviceType,
Ip = session.RemoteIPEndPoint.ToString(),
});
//校验通过，开始入库
await _hj212Service.Add(entity, session.RemoteIPEndPoint.ToString());
}
}
/// <summary>
/// 设置设备类型
/// </summary>
/// <param name="st"></param>
/// <returns></returns>
private int SetDeviceType(string st)
{
//st 27 =voc,st=31 cems, st=32,tsp
//st 27 =voc,st=31 cems, st=22,微站，( st=22&&a34001>0 tsp)
//1 voc,2 cems,3,tsp,4 video
switch (st)
{
case "27": return 1;
case "31": return 2;
case "32": return 3;
case "33": return 4;
case "22": return 3;
// case "33": return 4;
}
return 0;
}

10
langguanApi/Service/LedgerService.cs
View File

@ -28,14 +28,6 @@ namespace langguanApi.Service
{
var enity = input.Adapt<Ledger>();
enity.CarNum = input.CarNumber;
if (input.EntryDirection == 1)
{
enity.InTime = input.Time;
}
else
{
enity.OutTime = input.Time;
}
enity.Emissions = input.EmissionLevel;
await base.CreateAsync(enity);
}
@ -57,7 +49,7 @@ namespace langguanApi.Service
filter.CreateDateTime >= start.Value && filter.CreateDateTime <= end.Value && filter.IsDelete == false;
var list = (await base.GetListWithExp(exp)).ToList();
var mapper = new Mapper();
mapper.Map<Ledger>("进场时间", s => s.InTime)
mapper.Map<Ledger>("进出场时间", s => s.Time)
.Map<Ledger>("车牌号", s => s.CarNum)
.Map<Ledger>("车型", s => s.CarModel)
.Map<Ledger>("是否新能源", s => s.NewCar)

11
langguanApi/Service/TransportService.cs
View File

@ -1,5 +1,6 @@
using langguanApi.Extensions.AutoDI;
using langguanApi.Model;
using Mapster;
using System.Linq.Expressions;
namespace langguanApi.Service
@ -16,11 +17,15 @@ namespace langguanApi.Service
/// <summary>
/// 新增运输
/// </summary>
/// <param name="transport"></param>
/// <param name="input"></param>
/// <returns></returns>
public async Task<Transport> addTransport(Transport transport)
public async Task<Transport> addTransport(AddTransport input)
{
return await base.CreateAsync(transport);
var entity = input.Adapt<Transport>();
entity.effluent = input.EmissionLevel;
entity.imgUrl=input.EntryExitPictureUrl;
entity.TransportType = input.EntryDirection;
return await base.CreateAsync(entity);
}
/// <summary>
/// 首页统计