diff --git a/langguanApi.xml b/langguanApi.xml index a154069..891a57d 100644 --- a/langguanApi.xml +++ b/langguanApi.xml @@ -133,6 +133,13 @@ + + + 取设备及数据 + + + + 取设备类型集合 @@ -244,10 +251,13 @@ - + 获取组织工序和设备信息 + 1 有组织 2 无组织 + 0=全部，1=voc,2=cems + 组织id @@ -341,13 +351,6 @@ - - - 获取用户列表 - - - - 根据用户Id获取用户信息 @@ -355,7 +358,13 @@ - + + + 修改用户信息 + + + + 删除用户 @@ -1988,11 +1997,13 @@ - + ListAndDevice 1,有组织，2无组织 + 1,voc，2cems + 组织Id diff --git a/langguanApi/Controllers/DeviceController.cs b/langguanApi/Controllers/DeviceController.cs index 166c2c9..be4a354 100644 --- a/langguanApi/Controllers/DeviceController.cs +++ b/langguanApi/Controllers/DeviceController.cs @@ -75,6 +75,17 @@ namespace langguanApi.Controllers return Ok(new ApiResult() { code = 0, data = result }); } /// + /// 取设备及数据 + /// + /// + /// + [HttpGet] + public async Task GetDeviceAndData(string Id) + { + var result = await _deviceService.GetDeviceAndData(Id); + return Ok(result); + } + /// /// 取设备类型集合 /// /// @@ -93,7 +104,7 @@ namespace langguanApi.Controllers /// /// [HttpGet] - public async Task GetListByDeviceType(string key="", int pageSize = 10, int current = 1, int deviceType = 1) + public async Task GetListByDeviceType(string key = "", int pageSize = 10, int current = 1, int deviceType = 1) { var result = await _deviceService.GetDeviceListByTypes(key, pageSize, current, deviceType); return Ok(result); diff --git a/langguanApi/Controllers/OrganizedController.cs b/langguanApi/Controllers/OrganizedController.cs index af4e64e..78d6b1c 100644 --- a/langguanApi/Controllers/OrganizedController.cs +++ b/langguanApi/Controllers/OrganizedController.cs @@ -54,11 +54,14 @@ namespace langguanApi.Controllers /// /// 获取组织工序和设备信息 /// + /// 1 有组织 2 无组织 + /// 0=全部，1=voc,2=cems + /// 组织id /// [HttpGet("listanddevice")] - public async Task ListAndDevice(int OrganizedType = 1) + public async Task 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); } /// diff --git a/langguanApi/Controllers/UserController.cs b/langguanApi/Controllers/UserController.cs index ca4622f..ad69e3a 100644 --- a/langguanApi/Controllers/UserController.cs +++ b/langguanApi/Controllers/UserController.cs @@ -81,6 +81,7 @@ namespace langguanApi.Controllers var result = await _userService.GetUserById(userId); return Ok(result); } + /// /// 修改用户信息 /// /// diff --git a/langguanApi/Service/DeviceService.cs b/langguanApi/Service/DeviceService.cs index fa61936..eeee61c 100644 --- a/langguanApi/Service/DeviceService.cs +++ b/langguanApi/Service/DeviceService.cs @@ -10,8 +10,10 @@ namespace langguanApi.Service [ServiceInjection(InjectionType.Transient)] public class DeviceService : BaseService { - public DeviceService(IConfiguration config) : base(config, nameof(Device)) + public Hj212Service _hj212Service; + public DeviceService(IConfiguration config, Hj212Service hj212Service) : base(config, nameof(Device)) { + _hj212Service = hj212Service; } /// @@ -29,6 +31,17 @@ namespace langguanApi.Service await base.CreateAsync(entity); return new ApiResult { code = 0, msg = "" }; } + public async Task 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 } }; + } + /// /// 是否存在 /// diff --git a/langguanApi/Service/Hj212Service.cs b/langguanApi/Service/Hj212Service.cs index e3a8524..ef2906b 100644 --- a/langguanApi/Service/Hj212Service.cs +++ b/langguanApi/Service/Hj212Service.cs @@ -21,6 +21,12 @@ namespace langguanApi.Service /// 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); } @@ -49,7 +56,7 @@ namespace langguanApi.Service /// /// /// - public async TaskGetViewByDeviceMn(string deviceMn) + public async Task GetViewByDeviceMn(string deviceMn) { Expression> exp = filter => filter.deviceMN == deviceMn; var result = (await base.GetListWithExp(exp)).OrderByDescending(s => s.CreateDateTime).Take(60).ToList(); diff --git a/langguanApi/Service/OrganizedService.cs b/langguanApi/Service/OrganizedService.cs index 782c277..e5cadd1 100644 --- a/langguanApi/Service/OrganizedService.cs +++ b/langguanApi/Service/OrganizedService.cs @@ -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 /// /// 1,有组织，2无组织 + /// 1,voc，2cems + /// 组织Id /// - public async Task ListAndDevice(int OrganizedType = 1) + public async Task ListAndDevice(int OrganizedType, int DeviceType, string OrgId) { Expression> 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 list = new List(); - var devices = await _deviceService.GetDeviceByOrgids(result.Select(s => s.Id)); + Expression> 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