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

有组织列表数据不明确，明细数据源不明确

This commit is contained in:
yanghongwei 2024-06-06 00:39:32 +08:00
parent 5297e85067
commit 5575215e79
7 changed files with 80 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
langguanApi.xml
View File

@ -133,6 +133,13 @@
<param name="Id"></param>
<returns></returns>
</member>
<member name="M:langguanApi.Controllers.DeviceController.GetDeviceAndData(System.String)">
<summary>
取设备及数据
</summary>
<param name="Id"></param>
<returns></returns>
</member>
<member name="M:langguanApi.Controllers.DeviceController.GetDeviceTypes">
<summary>
取设备类型集合
@ -244,10 +251,13 @@
<param name="input"></param>
<returns></returns>
</member>
<member name="M:langguanApi.Controllers.OrganizedController.ListAndDevice(System.Int32)">
<member name="M:langguanApi.Controllers.OrganizedController.ListAndDevice(System.Int32,System.Int32,System.String)">
<summary>
获取组织工序和设备信息
</summary>
<param name="OrganizedType">1 有组织 2 无组织</param>
<param name="DeviceType">0=全部，1=voc,2=cems</param>
<param name="OrgId"> 组织id</param>
<returns></returns>
</member>
<member name="M:langguanApi.Controllers.OrganizedController.List(System.Int32)">
@ -341,13 +351,6 @@
<param name="input"></param>
<returns></returns>
</member>
<member name="M:langguanApi.Controllers.UserController.GetUserList(langguanApi.Model.Dto.SystemConfigurationDto.UserQueryDto)">
<summary>
获取用户列表
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:langguanApi.Controllers.UserController.GetUserById(System.String)">
<summary>
根据用户Id获取用户信息
@ -355,7 +358,13 @@
<param name="userId"></param>
<returns></returns>
</member>
<!-- Badly formed XML comment ignored for member "M:langguanApi.Controllers.UserController.UpdateUser(langguanApi.Model.Dto.SystemConfigurationDto.UserDto)" -->
<member name="M:langguanApi.Controllers.UserController.UpdateUser(langguanApi.Model.Dto.SystemConfigurationDto.UserDto)">
<summary>
修改用户信息
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:langguanApi.Controllers.UserController.DeleteUser(System.String)">
<summary>
删除用户
@ -1988,11 +1997,13 @@
<param name="ids"></param>
<returns></returns>
</member>
<member name="M:langguanApi.Service.OrganizedService.ListAndDevice(System.Int32)">
<member name="M:langguanApi.Service.OrganizedService.ListAndDevice(System.Int32,System.Int32,System.String)">
<summary>
ListAndDevice
</summary>
<param name="OrganizedType">1,有组织，2无组织</param>
<param name="DeviceType">1,voc，2cems</param>
<param name="OrgId">组织Id</param>
<returns></returns>
</member>
<member name="M:langguanApi.Service.OrganizedService.List(System.Int32)">

11
langguanApi/Controllers/DeviceController.cs
View File

@ -75,6 +75,17 @@ namespace langguanApi.Controllers
return Ok(new ApiResult() { code = 0, data = result });
}
/// <summary>
/// 取设备及数据
/// </summary>
/// <param name="Id"></param>
/// <returns></returns>
[HttpGet]
public async Task<IActionResult> GetDeviceAndData(string Id)
{
var result = await _deviceService.GetDeviceAndData(Id);
return Ok(result);
}
/// <summary>
/// 取设备类型集合
/// </summary>
/// <returns></returns>

7
langguanApi/Controllers/OrganizedController.cs
View File

@ -54,11 +54,14 @@ namespace langguanApi.Controllers
/// <summary>
/// 获取组织工序和设备信息
/// </summary>
/// <param name="OrganizedType">1 有组织 2 无组织</param>
/// <param name="DeviceType">0=全部，1=voc,2=cems</param>
/// <param name="OrgId"> 组织id</param>
/// <returns></returns>
[HttpGet("listanddevice")]
public async Task<IActionResult> ListAndDevice(int OrganizedType = 1)
public async Task<IActionResult> ListAndDevice(int OrganizedType = 1, int DeviceType = 0, string OrgId = "")
{
var result = await _organizedService.ListAndDevice(OrganizedType);
var result = await _organizedService.ListAndDevice(OrganizedType, DeviceType, OrgId);
return Ok(result);
}
/// <summary>

1
langguanApi/Controllers/UserController.cs
View File

@ -81,6 +81,7 @@ namespace langguanApi.Controllers
var result = await _userService.GetUserById(userId);
return Ok(result);
}
/// <summary>
/// 修改用户信息
/// </summary>
/// <param name="input"></param>

15
langguanApi/Service/DeviceService.cs
View File

@ -10,8 +10,10 @@ namespace langguanApi.Service
[ServiceInjection(InjectionType.Transient)]
public class DeviceService : BaseService<Device>
{
public DeviceService(IConfiguration config) : base(config, nameof(Device))
public Hj212Service _hj212Service;
public DeviceService(IConfiguration config, Hj212Service hj212Service) : base(config, nameof(Device))
{
_hj212Service = hj212Service;
}
/// <summary>
@ -29,6 +31,17 @@ namespace langguanApi.Service
await base.CreateAsync(entity);
return new ApiResult { code = 0, msg = "" };
}
public async Task<ApiResult> GetDeviceAndData(string id)
{
var entity = await base.GetAsync(id);
if (entity == null)
{
return new ApiResult { code = 1, msg = "设备不存在" };
}
var items = await _hj212Service.GetViewByDeviceMn(entity.deviceMN);
return new ApiResult { code = 0, msg = "", data = new { device = entity, items } };
}
/// <summary>
/// 是否存在
/// </summary>

7
langguanApi/Service/Hj212Service.cs
View File

@ -21,6 +21,12 @@ namespace langguanApi.Service
/// <returns></returns>
public async Task Add(Model.HJ212 hJ212, string deviceIp)
{
////判断设备类型 tsp 会有经纬度数据
int deviceType = 1;//设备类型为1 =voc
if (hJ212.lat > 0 && hJ212.lng > 0)
{
deviceType = 1;
}
//先判断当前设备是否存在
await _deviceSerive.Add(new DeviceAddDto()
{
@ -28,6 +34,7 @@ namespace langguanApi.Service
Ip = deviceIp,
lat = hJ212.lat,
lng = hJ212.lng,
DeviceType = deviceType
});
await base.CreateAsync(hJ212);
}

22
langguanApi/Service/OrganizedService.cs
View File

@ -1,4 +1,5 @@
using langguanApi.Extensions.AutoDI;
using langguanApi.Extensions;
using langguanApi.Extensions.AutoDI;
using langguanApi.Model;
using Mapster;
using System.Linq.Expressions;
@ -62,13 +63,28 @@ namespace langguanApi.Service
/// ListAndDevice
/// </summary>
/// <param name="OrganizedType">1,有组织，2无组织</param>
/// <param name="DeviceType">1,voc，2cems</param>
/// <param name="OrgId">组织Id</param>
/// <returns></returns>
public async Task<ApiResult> ListAndDevice(int OrganizedType = 1)
public async Task<ApiResult> ListAndDevice(int OrganizedType, int DeviceType, string OrgId)
{
Expression<Func<Organized, bool>> exp = filter => filter.OrganizedType == OrganizedType && filter.IsDelete == false;
if (!string.IsNullOrEmpty(OrgId))
{
exp = exp.And(filter => filter.Id == OrgId);
}
var result = (await base.GetListWithExp(exp)).OrderByDescending(x => x.Order).ToList();
List<OrganizedByDeviceDto> list = new List<OrganizedByDeviceDto>();
var devices = await _deviceService.GetDeviceByOrgids(result.Select(s => s.Id));
Expression<Func<Device, bool>> deviceExp = filter => filter.IsDelete == false;
if (DeviceType > 0)
{
deviceExp = deviceExp.And(filter => filter.DeviceType == DeviceType);
}
if (!string.IsNullOrEmpty(OrgId))
{
deviceExp= deviceExp.And(filter => filter.OrgId == OrgId);
}
var devices = (await _deviceService.GetListWithExp(deviceExp)).ToList();
foreach (var item in result)
{
list.Add(new OrganizedByDeviceDto