From 111091664f548138a648042a12826eeb29b19b2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B4=81=20=E4=BB=BB?= Date: Wed, 7 Jan 2026 15:57:17 +0800 Subject: [PATCH] =?UTF-8?q?=E7=81=AB=E6=83=85=E7=BA=BF=E7=B4=A2=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FireManagement/FireManagementApp.cs | 23 +++++++++++++ .../FireManagement/Request/FireClueInfoReq.cs | 34 +++++++++++++++++++ .../FireManagementController.cs | 22 +++++++++++- 3 files changed, 78 insertions(+), 1 deletion(-) create mode 100644 OpenAuth.App/ServiceApp/FireManagement/Request/FireClueInfoReq.cs diff --git a/OpenAuth.App/ServiceApp/FireManagement/FireManagementApp.cs b/OpenAuth.App/ServiceApp/FireManagement/FireManagementApp.cs index b8f16af..50d355c 100644 --- a/OpenAuth.App/ServiceApp/FireManagement/FireManagementApp.cs +++ b/OpenAuth.App/ServiceApp/FireManagement/FireManagementApp.cs @@ -587,6 +587,29 @@ namespace OpenAuth.App.ServiceApp.FireManagement } } + /// + /// 查询火情线索列表--后台使用 + /// + /// + public async Task>>> GetFireCluePageList(FireClueInfoReq req) + { + using (var db = base.UnitWork.CreateContext()) + { + RefAsync totalNumber = 0; + var infos = await db.FmFireclueInfo.AsQueryable() + .WhereIF(req.state != null, r => r.State == req.state) + .WhereIF(req.sourcetype != null, r => r.SourceType == req.sourcetype) + .WhereIF(req.reporttimebegin != null && req.reporttimeend != null, r => r.ReportTime >= req.reporttimebegin && r.ReportTime <= req.reporttimeend) + .WhereIF(!string.IsNullOrEmpty(req.name), r=> r.Describe.Contains(req.name)) + .WhereIF(!string.IsNullOrEmpty(req.adress), r=> r.Address.Contains(req.adress)) + .ToPageListAsync(req.page, req.limit, totalNumber); + return new Response>> + { + Result = new PageInfo> { Items = infos, Total = totalNumber } + }; + } + } + /// /// 修改火情线索状态 /// diff --git a/OpenAuth.App/ServiceApp/FireManagement/Request/FireClueInfoReq.cs b/OpenAuth.App/ServiceApp/FireManagement/Request/FireClueInfoReq.cs new file mode 100644 index 0000000..1485d8d --- /dev/null +++ b/OpenAuth.App/ServiceApp/FireManagement/Request/FireClueInfoReq.cs @@ -0,0 +1,34 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace OpenAuth.App.ServiceApp.FireManagement.Request +{ + public class FireClueInfoReq + { + //当前页 + public int page { get; set; } + //每页条数 + public int limit { get; set; } + //火情线索描述 + public string name { get; set; } + //火情线索地址 + public string adress { get; set; } + //状态,上报 = 1处理中 = 2,处理完成 = 3误报 = 4已合并 = 5 + public int? state { get; set; } + //来源类型APP = 1 高空瞭望 = 2无人机 = 3人工合并 = 4,卫星遥感=6,摄像头=7 + public int? sourcetype { get; set; } + //上报事件开始时间 + public DateTime? reporttimebegin { get; set; } + //上报事件结束时间 + public DateTime? reporttimeend { get; set; } + + public FireClueInfoReq() + { + page = 1; + limit = 10; + } + } +} diff --git a/OpenAuth.WebApi/Controllers/ServiceControllers/FireManagement/FireManagementController.cs b/OpenAuth.WebApi/Controllers/ServiceControllers/FireManagement/FireManagementController.cs index b86d771..e8cbc36 100644 --- a/OpenAuth.WebApi/Controllers/ServiceControllers/FireManagement/FireManagementController.cs +++ b/OpenAuth.WebApi/Controllers/ServiceControllers/FireManagement/FireManagementController.cs @@ -178,7 +178,6 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement #endregion - #region 人员单位管理 /// /// 查询人员单位信息 @@ -305,6 +304,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement #endregion + #region 火情线索 /// /// 添加火情线索 @@ -426,6 +426,26 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement } return response; } + + /// + /// 查询火情线索列表--后台用 + /// + /// + [HttpGet] + public async Task>>> GetFireCluePageList([FromQuery]FireClueInfoReq req) + { + Response>> response = new Response>>(); + try + { + return await _app.GetFireCluePageList(req); + } + catch (Exception ex) + { + response.Code = 500; + response.Message = ex.InnerException?.Message ?? ex.Message; + } + return response; + } /// /// 修改火情线索状态 ///