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

redis,model, 设备类型

This commit is contained in:
yanghongwei 2024-05-27 23:42:08 +08:00
parent 6990b921fa
commit f600155ee9
10 changed files with 149 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
langguanApi.xml
View File

@ -29,6 +29,11 @@
缓存天气信息
</summary>
</member>
<member name="F:langguanApi.Common.Redis.RedisKeylist.CleanData">
<summary>
缓存清洁数据
</summary>
</member>
<member name="P:langguanApi.Common.Redis.RedisOptions.Server">
<summary>
redis 服务地址
@ -86,7 +91,7 @@
<param name="input"></param>
<returns></returns>
</member>
<member name="M:langguanApi.Controllers.DeviceController.Addd(langguanApi.Model.Dto.DeviceDto)">
<member name="M:langguanApi.Controllers.DeviceController.Addd(langguanApi.Model.DeviceAddDto)">
<summary>
新加
</summary>
@ -100,13 +105,26 @@
<param name="ids"></param>
<returns></returns>
</member>
<member name="M:langguanApi.Controllers.DeviceController.update(langguanApi.Model.Dto.DeviceDto)">
<member name="M:langguanApi.Controllers.DeviceController.update(langguanApi.Model.DeviceUpdateDto)">
<summary>
更新
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:langguanApi.Controllers.DeviceController.FindOne(System.String)">
<summary>
取单条
</summary>
<param name="Id"></param>
<returns></returns>
</member>
<member name="M:langguanApi.Controllers.DeviceController.GetDeviceTypes">
<summary>
取设备类型集合
</summary>
<returns></returns>
</member>
<member name="M:langguanApi.Controllers.HJ212Controller.Get(System.String)">
<summary>
获取指定设备的历史数据
@ -532,6 +550,11 @@
所属组织ID
</summary>
</member>
<member name="P:langguanApi.Model.Device.DeviceType">
<summary>
设备类型,1 voc,2 cems,3,tsp,4 video
</summary>
</member>
<member name="T:langguanApi.Model.Dto.HJ212_2017">
<summary>
HJ212_2017
@ -1273,27 +1296,34 @@
<param name="exp"></param>
<returns></returns>
</member>
<member name="M:langguanApi.Service.DeviceService.Add(langguanApi.Model.Dto.DeviceDto)">
<member name="M:langguanApi.Service.DeviceService.Add(langguanApi.Model.DeviceAddDto)">
<summary>
新加
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:langguanApi.Service.DeviceService.Exist(langguanApi.Model.Dto.DeviceDto)">
<member name="M:langguanApi.Service.DeviceService.Exist(langguanApi.Model.DeviceAddDto)">
<summary>
是否存在
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:langguanApi.Service.DeviceService.update(langguanApi.Model.Dto.DeviceDto)">
<member name="M:langguanApi.Service.DeviceService.update(langguanApi.Model.DeviceUpdateDto)">
<summary>
更新
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:langguanApi.Service.DeviceService.FindeById(System.String)">
<summary>
取单个
</summary>
<param name="id"></param>
<returns></returns>
</member>
<member name="M:langguanApi.Service.DeviceService.remove(System.Collections.Generic.IEnumerable{System.String})">
<summary>
remove
@ -1308,6 +1338,12 @@
<param name="ids"></param>
<returns></returns>
</member>
<member name="M:langguanApi.Service.DeviceService.GetDeviceTypes">
<summary>
获取设备类型
</summary>
<returns></returns>
</member>
<member name="M:langguanApi.Service.DeviceService.GetPage(langguanApi.Model.reqpage)">
<summary>
分页取数据
@ -1550,6 +1586,12 @@
<param name="transport"></param>
<returns></returns>
</member>
<member name="M:langguanApi.Service.TransportService.GetIndexCount">
<summary>
首页统计
</summary>
<returns></returns>
</member>
<member name="M:langguanApi.Service.TransportService.GetPage(langguanApi.Model.reqpage)">
<summary>
分页取数据

4
langguanApi/Common/Redis/RedisKeylist.cs
View File

@ -7,5 +7,9 @@
/// 缓存天气信息
/// </summary>
public static string Weather = "weather";
/// <summary>
/// 缓存清洁数据
/// </summary>
public static string CleanData = "cleandata";
}
}

26
langguanApi/Controllers/DeviceController.cs
View File

@ -35,7 +35,7 @@ namespace langguanApi.Controllers
/// <param name="input"></param>
/// <returns></returns>
[HttpPost]
public async Task<IActionResult> Addd([FromBody] DeviceDto input)
public async Task<IActionResult> Addd([FromBody] DeviceAddDto input)
{
var result = await _deviceService.Add(input);
return Ok(result);
@ -57,11 +57,31 @@ namespace langguanApi.Controllers
/// <param name="input"></param>
/// <returns></returns>
[HttpPut]
public async Task<IActionResult> update([FromBody] DeviceDto input)
public async Task<IActionResult> update([FromBody] DeviceUpdateDto input)
{
var result = await _deviceService.update(input);
return Ok(result);
}
/// <summary>
/// 取单条
/// </summary>
/// <param name="Id"></param>
/// <returns></returns>
[HttpGet]
public async Task<IActionResult> FindOne(string Id)
{
var result = await _deviceService.FindeById(Id);
return Ok(new ApiResult() { code = 0, data = result });
}
/// <summary>
/// 取设备类型集合
/// </summary>
/// <returns></returns>
[HttpGet]
public async Task<IActionResult> GetDeviceTypes()
{
var result=await _deviceService.GetDeviceTypes();
return Ok(new ApiResult() { code = 0, data = result });
}
}
}

20
langguanApi/Model/Device.cs
View File

@ -17,5 +17,25 @@
/// 所属组织ID
/// </summary>
public string OrgId { get; set; }
/// <summary>
/// 设备类型,1 voc,2 cems,3,tsp,4 video
/// </summary>
public int DeviceType { get; set; }
}
public class DeviceAddDto
{
public string deviceMN { get; set; }
public string Ip { get; set; }
public double lng { get; set; }
public double lat { get; set; }
public string NickName { get; set; }
}
public class DeviceUpdateDto
{
public string Id { get; set; }
public string NickName { get; set; }
public string OrgId { get; set; }
public int DeviceType { get; set; }
}
}

13
langguanApi/Model/Dto/AddDevice.cs
View File

@ -1,13 +0,0 @@
namespace langguanApi.Model.Dto
{
public class DeviceDto
{
public string deviceMN { get; set; }
public string Name { get; set; }
public string Ip { get; set; }
public double lng { get; set; }
public double lat { get; set; }
public string desricption { get; set; }
public int state { get; set; }
}
}

53
langguanApi/Service/DeviceService.cs
View File

@ -18,11 +18,11 @@ namespace langguanApi.Service
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
public async Task<ApiResult> Add(DeviceDto input)
public async Task<ApiResult> Add(DeviceAddDto input)
{
if (await Exist(input))
{
return new ApiResult { code = 1, msg = $"已经存在名称为：{input.Name}" };
return new ApiResult { code = 1, msg = $"已经存在名称为：{input.NickName}" };
}
var entity = input.Adapt<Device>();
if (entity != null)
@ -37,7 +37,7 @@ namespace langguanApi.Service
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
public async Task<bool> Exist(DeviceDto input)
public async Task<bool> Exist(DeviceAddDto input)
{
var entity = input.Adapt<Device>();
Expression<Func<Device, bool>> exp = filter => filter.deviceMN == entity.deviceMN;
@ -48,13 +48,22 @@ namespace langguanApi.Service
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
public async Task<ApiResult> update(DeviceDto input)
public async Task<ApiResult> update(DeviceUpdateDto input)
{
var entity = input.Adapt<Device>();
await base.UpdateAsync(entity.Id, entity);
return new ApiResult { code = 0, msg = "" };
}
/// <summary>
/// 取单个
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
public async Task<Device> FindeById(string id)
{
return await GetAsync(id);
}
/// <summary>
/// remove
/// </summary>
/// <param name="ids"></param>
@ -79,7 +88,6 @@ namespace langguanApi.Service
Expression<Func<Device, bool>> exp = filter => filter.deviceMN == deviceMN && filter.IsDelete == false;
return (await base.GetListWithExp(exp)).FirstOrDefault();
}
/// <summary>
/// 通过orgid获取设备信息
/// </summary>
@ -91,22 +99,35 @@ namespace langguanApi.Service
var list = (await base.GetListWithExp(exp)).ToList();
return list;
}
/// <summary>
/// 分页取数据
/// 获取设备类型
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
public async Task<object> GetPage(reqpage input)
public Task<Dictionary<int, string>> GetDeviceTypes()
{
Expression<Func<Device, bool>> exp = filter => filter.Name.Contains(input.key) && filter.IsDelete == false;
return await base.GetPager(new ReqPaing()
//1 voc,2 cems,3,tsp,4 video
Dictionary<int, string> dic = new Dictionary<int, string>
{
pageSize = input.pageSize,
current = input.current
}, exp);
{ 1, "voc" },
{ 2, "cems" },
{ 3, "tsp" },
{ 4, "video" }
};
return Task.FromResult(dic);
}
/// <summary>
/// 分页取数据
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
public async Task<object> GetPage(reqpage input)
{
Expression<Func<Device, bool>> exp = filter => filter.NickName.Contains(input.key) && filter.IsDelete == false;
return await base.GetPager(new ReqPaing()
{
pageSize = input.pageSize,
current = input.current
}, exp);
}
}
}

3
langguanApi/Service/Hj212Service.cs
View File

@ -22,13 +22,12 @@ namespace langguanApi.Service
public async Task Add(Model.HJ212 hJ212, string deviceIp)
{
//先判断当前设备是否存在
await _deviceSerive.Add(new DeviceDto()
await _deviceSerive.Add(new DeviceAddDto()
{
deviceMN = hJ212.deviceMN,
Ip = deviceIp,
lat = hJ212.lat,
lng = hJ212.lng,
state = 1
});
await base.CreateAsync(hJ212);
}

8
langguanApi/Service/HomeService.cs
View File

@ -24,7 +24,7 @@ namespace langguanApi.Service
/// <param name="device"></param>
/// <param name="hj212Service"></param>
public HomeService(DeviceService device, Hj212Service hj212Service,
IConfiguration configuration, CacheManager cacheManager,
IConfiguration configuration, CacheManager cacheManager,
WeatherService weatherService, AlertService alertService)
{
_deviceService = device;
@ -42,6 +42,12 @@ namespace langguanApi.Service
{
var devices = await _deviceService.GetAsync();
var ariQuality = "";
var cleanData = new
{
Yesterday = 0.8,
LastWeek = 0.6,
};
Expression<Func<Model.HJ212, bool>> filter = exp => true;
var Realtime = await _hj212Service.Realtime();
var getViewTop = await _hj212Service.GetViewTop();

2
langguanApi/Service/OrganizedService.cs
View File

@ -77,7 +77,7 @@ namespace langguanApi.Service
Order = item.Order,
Name = item.Name,
OrganizedType = item.OrganizedType,
Id = item.Id
Id = item.Id,
});
}
return new ApiResult() { code = 0, data = list };

9
langguanApi/Service/TransportService.cs
View File

@ -22,6 +22,15 @@ namespace langguanApi.Service
{
return await base.CreateAsync(transport);
}
/// <summary>
/// 首页统计
/// </summary>
/// <returns></returns>
public async Task<object> GetIndexCount()
{
return null;
}
/// <summary>
/// 分页取数据
/// </summary>