HC_YFZX
/
Infrastructure
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

打卡点排序，火情线索查询修改

DataMaintenance
洁 任 2026-01-21 14:51:51 +08:00
parent f09891b466
commit c983df681d
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenAuth.App/ServiceApp/FireManagement/FireManagementApp.cs
View File

@ -824,7 +824,7 @@ namespace OpenAuth.App.ServiceApp.FireManagement
} }
} }
public async Task<Response<List<FireInfoStateForChart>>> GetFireClueStatisticsByState(int type) public async Task<Response<List<FireInfoStateForChart>>> GetFireClueStatisticsByState(int type,List<int> sourcetype)
{ {
using (var db = base.UnitWork.CreateContext()) using (var db = base.UnitWork.CreateContext())
{ {
@ -889,6 +889,7 @@ namespace OpenAuth.App.ServiceApp.FireManagement
// 查询实际数据 // 查询实际数据
var dataQuery = await db.FmFireclueInfo.AsQueryable() var dataQuery = await db.FmFireclueInfo.AsQueryable()
.WhereIF(sourcetype.Count>0,r=>sourcetype.Contains(r.SourceType))
.Where(r => r.ReportTime >= startDate && r.ReportTime <= endDate) .Where(r => r.ReportTime >= startDate && r.ReportTime <= endDate)
.GroupBy(r => new { r.ReportTime.Date }) .GroupBy(r => new { r.ReportTime.Date })
.Select(r => new FireInfoState .Select(r => new FireInfoState
@ -932,6 +933,7 @@ namespace OpenAuth.App.ServiceApp.FireManagement
// 查询数据 // 查询数据
var data = await db.FmFireclueInfo.AsQueryable() var data = await db.FmFireclueInfo.AsQueryable()
.WhereIF(sourcetype.Count > 0, r => sourcetype.Contains(r.SourceType))
.Where(r => r.ReportTime >= startDate && r.ReportTime <= endDate) .Where(r => r.ReportTime >= startDate && r.ReportTime <= endDate)
.GroupBy(r => new { r.ReportTime.Year, r.ReportTime.Month }) .GroupBy(r => new { r.ReportTime.Year, r.ReportTime.Month })
.Select(r => new .Select(r => new
@ -970,6 +972,7 @@ namespace OpenAuth.App.ServiceApp.FireManagement
// 查询数据 // 查询数据
var queryData = await db.FmFireclueInfo.AsQueryable() var queryData = await db.FmFireclueInfo.AsQueryable()
.WhereIF(sourcetype.Count > 0, r => sourcetype.Contains(r.SourceType))
.Where(r => r.ReportTime.Year >= startYear && r.ReportTime.Year <= currentYear) .Where(r => r.ReportTime.Year >= startYear && r.ReportTime.Year <= currentYear)
.GroupBy(r => r.ReportTime.Year) .GroupBy(r => r.ReportTime.Year)
.Select(r => new .Select(r => new

5
OpenAuth.WebApi/Controllers/ServiceControllers/FireManagement/FireManagementController.cs
View File

@ -514,14 +514,15 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement
/// 按状态统计火情线索 /// 按状态统计火情线索
/// </summary> /// </summary>
/// <param name="type">1-日，2-月，3-年</param> /// <param name="type">1-日，2-月，3-年</param>
/// <param name="sourcetype">来源类型APP = 1 高空瞭望 = 2无人机 = 3人工合并 = 4，公众反馈=5 卫星遥感=6，摄像头=7</param>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpGet]
public async Task<Response<List<FireInfoStateForChart>>> GetFireClueStatisticsByState(int type) public async Task<Response<List<FireInfoStateForChart>>> GetFireClueStatisticsByState(int type,List<int> sourcetype)
{ {
Response<List<FireInfoStateForChart>> response = new Response<List<FireInfoStateForChart>>(); Response<List<FireInfoStateForChart>> response = new Response<List<FireInfoStateForChart>>();
try try
{ {
return await _app.GetFireClueStatisticsByState(type); return await _app.GetFireClueStatisticsByState(type,sourcetype);
} }
catch (Exception ex) catch (Exception ex)
{ {