diff --git a/OpenAuth.App/ServiceApp/FireManagement/FireManagementApp.cs b/OpenAuth.App/ServiceApp/FireManagement/FireManagementApp.cs index fa456e2..6c958f1 100644 --- a/OpenAuth.App/ServiceApp/FireManagement/FireManagementApp.cs +++ b/OpenAuth.App/ServiceApp/FireManagement/FireManagementApp.cs @@ -84,21 +84,51 @@ namespace OpenAuth.App.ServiceApp.FireManagement } } - //查询下发人员 - public async Task>> GetIssuedUsers(string username) + /// + /// 查询下发人员 + /// + /// + /// + public async Task>> LoadFireClueUser(string username) { using (var db = base.UnitWork.CreateContext()) { var users = await db.User.AsQueryable() - .WhereIF(string.IsNullOrEmpty(username),r=>r.Name.Contains(username)) - .Where(r => r.Status==0) - .Select(r=> new SysUserResp + .WhereIF(string.IsNullOrEmpty(username), r => r.Name.Contains(username)) + .Where(r => r.Status == 0) + .Select(r => new SysUserResp { Id = r.Id, Name = r.Name - }) .ToListAsync(); + }).ToListAsync(); return new Response> { Result = users }; } } + /// + /// 查询任务列表 + /// + /// + public async Task>> GetTaskList() + { + using (var db = base.UnitWork.CreateContext()) + { + var tasks = await db.FmFireclueTask.AsQueryable() + .Where(r => r.IsDelete == false) + .ToListAsync(); + return new Response> { Result = tasks }; + } + } + /// + /// 查询人员单位信息 + /// + /// + public async Task>> GetUserUnit() + { + using (var db = base.UnitWork.CreateContext()) + { + var userunit = await db.FmUserUnit.AsQueryable().ToListAsync(); + return new Response> { Result = userunit }; + } + } } } diff --git a/OpenAuth.Repository/Domain/FireManagement/FmUserUnit.cs b/OpenAuth.Repository/Domain/FireManagement/FmUserUnit.cs new file mode 100644 index 0000000..7d6dce6 --- /dev/null +++ b/OpenAuth.Repository/Domain/FireManagement/FmUserUnit.cs @@ -0,0 +1,52 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace OpenAuth.Repository.Domain.FireManagement +{ + /// + /// 用户单位 + /// + [SugarTable("fm_userunit")] + public class FmUserUnit + { + /// + /// 主键 + /// + [SugarColumn(IsPrimaryKey = true)] + public long Id { get; set; } + + /// + /// 单位名称 + /// + public string UnitName { get; set; } + + /// + /// 单位类型 + /// + public string UnitType { get; set; } + + /// + /// 创建时间 + /// + public DateTime CreateTime { get; set; } + + /// + /// 创建人ID + /// + public string CreateUserId { get; set; } + + /// + /// 描述 + /// + public string Description { get; set; } + + /// + /// 图标 + /// + public string ImaUrl { get; set; } + } +} diff --git a/OpenAuth.Repository/SugarDbContext.cs b/OpenAuth.Repository/SugarDbContext.cs index c13e990..0a44c38 100644 --- a/OpenAuth.Repository/SugarDbContext.cs +++ b/OpenAuth.Repository/SugarDbContext.cs @@ -69,7 +69,7 @@ namespace OpenAuth.Repository #region 防火平台实体类 public SugarRepositiry FmFireclueTask { get; set; } public SugarRepositiry FmFireTaskUser { get; set; } - + public SugarRepositiry FmUserUnit { get; set; } #endregion public SugarRepositiry DmModule { get; set; } diff --git a/OpenAuth.WebApi/Controllers/ServiceControllers/FireManagement/FireManagementController.cs b/OpenAuth.WebApi/Controllers/ServiceControllers/FireManagement/FireManagementController.cs index 3a9c824..aa311a8 100644 --- a/OpenAuth.WebApi/Controllers/ServiceControllers/FireManagement/FireManagementController.cs +++ b/OpenAuth.WebApi/Controllers/ServiceControllers/FireManagement/FireManagementController.cs @@ -48,12 +48,12 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement /// /// [HttpGet] - public async Task>> GetIssuedUsers(string username) + public async Task>> LoadFireClueUser(string username) { Response> response = new Response>(); try { - return await _app.GetIssuedUsers(username); + return await _app.LoadFireClueUser(username); } catch (Exception ex) { @@ -62,5 +62,46 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement } return response; } + + /// + /// 查询任务列表 + /// + /// + /// + [HttpGet] + public async Task>> GetTaskList() + { + Response> response = new Response>(); + try + { + return await _app.GetTaskList(); + } + catch (Exception ex) + { + response.Code = 500; + response.Message = ex.InnerException?.Message ?? ex.Message; + } + return response; + } + /// + /// 查询人员单位信息 + /// + /// + [HttpGet] + public async Task>> GetUserUnit() + { + Response> response = new Response>(); + try + { + return await _app.GetUserUnit(); + } + catch (Exception ex) + { + response.Code = 500; + response.Message = ex.InnerException?.Message ?? ex.Message; + } + return response; + } + } }