diff --git a/langguanApi.xml b/langguanApi.xml
index 15bc4bf..1a5125a 100644
--- a/langguanApi.xml
+++ b/langguanApi.xml
@@ -430,7 +430,7 @@
-
+
新增清洁运输
@@ -804,7 +804,7 @@
- 设备类型,1 voc,2 cems,3,tsp,4 video
+ 设备类型,1 voc,2 cems,3,tsp,4 video,5微站
@@ -1061,6 +1061,11 @@
进场日期
+
+
+ 进出场时间
+
+
出场日期
@@ -1817,11 +1822,6 @@
1进，2出
-
-
- 位置
-
-
排放标准
@@ -1847,6 +1847,111 @@
货物类型
+
+
+ 车牌颜色
+
+
+
+
+ 车牌类型
+
+
+
+
+ base64图片 出入场图片 url
+
+
+
+
+ 发动机号
+
+
+
+
+ 注册日期
+
+
+
+
+ base64图片 驾驶证图片 url
+
+
+
+
+ 驾驶人姓名
+
+
+
+
+ 有效期限
+
+
+
+
+ 车牌号
+
+
+
+
+ 进场方向
+
+
+
+
+ 出入场时间
+
+
+
+
+ 排放等级
+
+
+
+
+ 车牌颜色
+
+
+
+
+ 车牌类型
+
+
+
+
+ base64图片 出入场图片 url
+
+
+
+
+ vin
+
+
+
+
+ 发动机号
+
+
+
+
+ 注册日期
+
+
+
+
+ base64图片 驾驶证图片 url
+
+
+
+
+ 驾驶人姓名
+
+
+
+
+ 有效期限
+
+
新加
@@ -2226,6 +2331,13 @@
+
+
+ 设置设备类型
+
+
+
+
收到数据事件
@@ -2509,11 +2621,11 @@
TransportService 运输服务
-
+
新增运输
-
+
diff --git a/langguanApi/Controllers/TransportController.cs b/langguanApi/Controllers/TransportController.cs
index c89e233..0c7ba34 100644
--- a/langguanApi/Controllers/TransportController.cs
+++ b/langguanApi/Controllers/TransportController.cs
@@ -44,7 +44,7 @@ namespace langguanApi.Controllers
///
///
[HttpPost("add")]
- public async Task Add(Transport input)
+ public async Task Add(AddTransport input)
{
await _transportService.addTransport(input);
return Ok(new ApiResult() { code = 0 });
diff --git a/langguanApi/Model/Device.cs b/langguanApi/Model/Device.cs
index 1c1e3c8..bc6d211 100644
--- a/langguanApi/Model/Device.cs
+++ b/langguanApi/Model/Device.cs
@@ -18,7 +18,7 @@
///
public string OrgId { get; set; }
///
- /// 设备类型,1 voc,2 cems,3,tsp,4 video
+ /// 设备类型,1 voc,2 cems,3,tsp,4 video,5微站
///
public int DeviceType { get; set; }
///
diff --git a/langguanApi/Model/Entity/Ledger.cs b/langguanApi/Model/Entity/Ledger.cs
index 2d6373a..1f74010 100644
--- a/langguanApi/Model/Entity/Ledger.cs
+++ b/langguanApi/Model/Entity/Ledger.cs
@@ -11,6 +11,10 @@
///
public DateTime InTime { get; set; }
///
+ /// 进出场时间
+ ///
+ public DateTime Time { get; set; }
+ ///
/// 出场日期
///
public DateTime OutTime { get; set; }
diff --git a/langguanApi/Model/Transport.cs b/langguanApi/Model/Transport.cs
index 4883169..ad72987 100644
--- a/langguanApi/Model/Transport.cs
+++ b/langguanApi/Model/Transport.cs
@@ -11,10 +11,6 @@
///
public int TransportType { get; set; }
///
- /// 位置
- ///
- public string Address { get; set; }
- ///
/// 排放标准
///
public string effluent { get; set; }
@@ -34,5 +30,94 @@
/// 货物类型
///
public string Goods { get; set; }
+ ///
+ /// 车牌颜色
+ ///
+ public int CarColor { get; set; }
+ ///
+ /// 车牌类型
+ ///
+ public string CarType { get; set; }
+ ///
+ /// base64图片 出入场图片 url
+ ///
+ public string EntryExitPictureUrl { get; set; }
+
+ ///
+ /// 发动机号
+ ///
+ public string EngineNumber { get; set; }
+ ///
+ /// 注册日期
+ ///
+ public string RegistrationDate { get; set; }
+ ///
+ /// base64图片 驾驶证图片 url
+ ///
+ public string DriverLicenseUrl { get; set; }
+ ///
+ /// 驾驶人姓名
+ ///
+ public string DriverName { get; set; }
+ ///
+ /// 有效期限
+ ///
+ public string ValidityPeriod { get; set; }
+
+ }
+ public class AddTransport
+ {
+ ///
+ /// 车牌号
+ ///
+ public string CarNumber { get; set; }
+ ///
+ /// 进场方向
+ ///
+ public int EntryDirection { get; set; }
+ ///
+ /// 出入场时间
+ ///
+ public DateTime Time { get; set; }
+ ///
+ /// 排放等级
+ ///
+ public string EmissionLevel { get; set; }
+ ///
+ /// 车牌颜色
+ ///
+ public int CarColor { get; set; }
+ ///
+ /// 车牌类型
+ ///
+ public string CarType { get; set; }
+ ///
+ /// base64图片 出入场图片 url
+ ///
+ public string EntryExitPictureUrl { get; set; }
+ ///
+ /// vin
+ ///
+ public string VIN { get; set; }
+ ///
+ /// 发动机号
+ ///
+ public string EngineNumber { get; set; }
+ ///
+ /// 注册日期
+ ///
+ public string RegistrationDate { get; set; }
+ ///
+ /// base64图片 驾驶证图片 url
+ ///
+ public string DriverLicenseUrl { get; set; }
+ ///
+ /// 驾驶人姓名
+ ///
+ public string DriverName { get; set; }
+ ///
+ /// 有效期限
+ ///
+ public string ValidityPeriod { get; set; }
}
}
diff --git a/langguanApi/Service/HJ212SocketServer.cs b/langguanApi/Service/HJ212SocketServer.cs
index 60cbd55..44760b8 100644
--- a/langguanApi/Service/HJ212SocketServer.cs
+++ b/langguanApi/Service/HJ212SocketServer.cs
@@ -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(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());
}
}
+ ///
+ /// 设置设备类型
+ ///
+ ///
+ ///
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;
}
diff --git a/langguanApi/Service/LedgerService.cs b/langguanApi/Service/LedgerService.cs
index fe0b4be..aeaf788 100644
--- a/langguanApi/Service/LedgerService.cs
+++ b/langguanApi/Service/LedgerService.cs
@@ -28,14 +28,6 @@ namespace langguanApi.Service
{
var enity = input.Adapt();
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("进场时间", s => s.InTime)
+ mapper.Map("进出场时间", s => s.Time)
.Map("车牌号", s => s.CarNum)
.Map("车型", s => s.CarModel)
.Map("是否新能源", s => s.NewCar)
diff --git a/langguanApi/Service/TransportService.cs b/langguanApi/Service/TransportService.cs
index 3718ee7..b8349b8 100644
--- a/langguanApi/Service/TransportService.cs
+++ b/langguanApi/Service/TransportService.cs
@@ -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
///
/// 新增运输
///
- ///
+ ///
///
- public async Task addTransport(Transport transport)
+ public async Task addTransport(AddTransport input)
{
- return await base.CreateAsync(transport);
+ var entity = input.Adapt();
+ entity.effluent = input.EmissionLevel;
+ entity.imgUrl=input.EntryExitPictureUrl;
+ entity.TransportType = input.EntryDirection;
+ return await base.CreateAsync(entity);
}
///
/// 首页统计