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

1. 地图标绘列表 

2. 地图标绘保存
DataMaintenance
陈伟 2025-04-01 16:35:23 +08:00
parent a50301e806
commit c5179164fc
4 changed files with 175 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,6 +3,7 @@ using System.Text;
using Hopetry.App.SugarModel.CommonModel; using Hopetry.App.SugarModel.CommonModel;
using Infrastructure; using Infrastructure;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Newtonsoft.Json; using Newtonsoft.Json;
using NPOI.HSSF.UserModel; using NPOI.HSSF.UserModel;
@ -79,6 +80,7 @@ namespace OpenAuth.App.ServiceApp.FireManagement
fftuList.Add(fftu); fftuList.Add(fftu);
}); });
} }
await db.FmFireTaskUser.InsertRangeAsync(fftuList); await db.FmFireTaskUser.InsertRangeAsync(fftuList);
if (db.Commit()) if (db.Commit())
{ {
@ -112,6 +114,7 @@ namespace OpenAuth.App.ServiceApp.FireManagement
return new Response<List<SysUserResp>> { Result = users }; return new Response<List<SysUserResp>> { Result = users };
} }
} }
/// <summary> /// <summary>
/// 查询任务列表 /// 查询任务列表
/// </summary> /// </summary>
@ -126,6 +129,7 @@ namespace OpenAuth.App.ServiceApp.FireManagement
return new Response<List<FmFireclueTask>> { Result = tasks }; return new Response<List<FmFireclueTask>> { Result = tasks };
} }
} }
/// <summary> /// <summary>
/// 查询人员单位信息 /// 查询人员单位信息
/// </summary> /// </summary>
@ -138,7 +142,9 @@ namespace OpenAuth.App.ServiceApp.FireManagement
return new Response<List<FmUserUnit>> { Result = userunit }; return new Response<List<FmUserUnit>> { Result = userunit };
} }
} }
#region 单位管理 #region 单位管理
//添加人员单位 //添加人员单位
public async Task<Response<bool>> AddUserUnit(FmUserUnit info) public async Task<Response<bool>> AddUserUnit(FmUserUnit info)
{ {
@ -156,6 +162,7 @@ namespace OpenAuth.App.ServiceApp.FireManagement
} }
} }
} }
//编辑人员单位 //编辑人员单位
public async Task<Response<bool>> EditUserUnit(FmUserUnit info) public async Task<Response<bool>> EditUserUnit(FmUserUnit info)
{ {
@ -172,6 +179,7 @@ namespace OpenAuth.App.ServiceApp.FireManagement
} }
} }
} }
//获取单个人员单位 //获取单个人员单位
public async Task<Response<FmUserUnit>> LoadUserUnitById(long id) public async Task<Response<FmUserUnit>> LoadUserUnitById(long id)
{ {
@ -181,6 +189,7 @@ namespace OpenAuth.App.ServiceApp.FireManagement
return new Response<FmUserUnit> { Result = info }; return new Response<FmUserUnit> { Result = info };
} }
} }
//删除人员单位 //删除人员单位
public async Task<Response<bool>> DeleteUserUnit(long id) public async Task<Response<bool>> DeleteUserUnit(long id)
{ {
@ -217,14 +226,14 @@ namespace OpenAuth.App.ServiceApp.FireManagement
{ {
using (var stream = file.OpenReadStream()) using (var stream = file.OpenReadStream())
{ {
workbook = new XSSFWorkbook(stream);//excel的版本2007 workbook = new XSSFWorkbook(stream); //excel的版本2007
} }
} }
else if (file.FileName.IndexOf(".xls") > 0) else if (file.FileName.IndexOf(".xls") > 0)
{ {
using (var stream = file.OpenReadStream()) using (var stream = file.OpenReadStream())
{ {
workbook = new HSSFWorkbook(stream);//excel的版本2003 workbook = new HSSFWorkbook(stream); //excel的版本2003
} }
} }
@ -279,10 +288,14 @@ namespace OpenAuth.App.ServiceApp.FireManagement
response.Code = 400; response.Code = 400;
response.Message = "上传文件类型错误"; response.Message = "上传文件类型错误";
} }
return response; return response;
} }
#endregion #endregion
#region 火情线索 #region 火情线索
public async Task<Response<bool>> AddFireClueInfo(FmFireclueInfo info) public async Task<Response<bool>> AddFireClueInfo(FmFireclueInfo info)
{ {
using (var db = base.UnitWork.CreateContext()) using (var db = base.UnitWork.CreateContext())
@ -290,7 +303,8 @@ namespace OpenAuth.App.ServiceApp.FireManagement
info.Id = YitIdHelper.NextId(); info.Id = YitIdHelper.NextId();
info.State = (int)State.上报; info.State = (int)State.上报;
info.ReportTime = DateTime.Now; info.ReportTime = DateTime.Now;
var exitinfo = db.FmFireclueInfo.AsQueryable().Where(a => a.ReportTime.ToString("yyyy-MM-dd") == DateTime.Now.ToString("yyyy-MM-dd")).Count(); var exitinfo = db.FmFireclueInfo.AsQueryable().Where(a =>
a.ReportTime.ToString("yyyy-MM-dd") == DateTime.Now.ToString("yyyy-MM-dd")).Count();
info.ClueNo = "H" + DateTime.Now.ToString("yyyyMMdd") + (exitinfo == 0 ? "01" : "0" + (exitinfo + 1)); info.ClueNo = "H" + DateTime.Now.ToString("yyyyMMdd") + (exitinfo == 0 ? "01" : "0" + (exitinfo + 1));
await db.FmFireclueInfo.InsertAsync(info); await db.FmFireclueInfo.InsertAsync(info);
if (db.Commit()) if (db.Commit())
@ -303,6 +317,7 @@ namespace OpenAuth.App.ServiceApp.FireManagement
} }
} }
} }
/// <summary> /// <summary>
/// 查询火情线索 /// 查询火情线索
/// </summary> /// </summary>
@ -317,6 +332,7 @@ namespace OpenAuth.App.ServiceApp.FireManagement
return new Response<FmFireclueInfo> { Result = info }; return new Response<FmFireclueInfo> { Result = info };
} }
} }
public async Task<Response<dynamic>> LoadClueWithInfoById(long id) public async Task<Response<dynamic>> LoadClueWithInfoById(long id)
{ {
using (var db = base.UnitWork.CreateContext()) using (var db = base.UnitWork.CreateContext())
@ -336,6 +352,7 @@ namespace OpenAuth.App.ServiceApp.FireManagement
return new Response<dynamic> { Result = endInfo }; return new Response<dynamic> { Result = endInfo };
} }
} }
//查询火情线索列表 //查询火情线索列表
public async Task<Response<List<FmFireclueInfo>>> GetFireClueList() public async Task<Response<List<FmFireclueInfo>>> GetFireClueList()
{ {
@ -345,6 +362,7 @@ namespace OpenAuth.App.ServiceApp.FireManagement
return new Response<List<FmFireclueInfo>> { Result = list }; return new Response<List<FmFireclueInfo>> { Result = list };
} }
} }
//按月统计火情线索 //按月统计火情线索
public async Task<Response<List<FireInfoForChart>>> GetFireClueStatistics(int type) public async Task<Response<List<FireInfoForChart>>> GetFireClueStatistics(int type)
{ {
@ -368,14 +386,14 @@ namespace OpenAuth.App.ServiceApp.FireManagement
{ {
DateTime firstDayOfYear = new DateTime(DateTime.Now.Year, 1, 1); DateTime firstDayOfYear = new DateTime(DateTime.Now.Year, 1, 1);
var list = await db.FmFireclueInfo.AsQueryable() var list = await db.FmFireclueInfo.AsQueryable()
//.Where(r => r.State == 1) //.Where(r => r.State == 1)
.Where(r => r.ReportTime >= firstDayOfYear) .Where(r => r.ReportTime >= firstDayOfYear)
.GroupBy(r => new { r.ReportTime.Month }) .GroupBy(r => new { r.ReportTime.Month })
.Select(r => new FireInfoForChart .Select(r => new FireInfoForChart
{ {
DateTime = r.ReportTime.Month.ToString() + "月", DateTime = r.ReportTime.Month.ToString() + "月",
Count = SqlFunc.AggregateCount(r.Id) Count = SqlFunc.AggregateCount(r.Id)
}).ToListAsync(); }).ToListAsync();
return new Response<List<FireInfoForChart>> { Result = list }; return new Response<List<FireInfoForChart>> { Result = list };
} }
} }
@ -403,32 +421,33 @@ namespace OpenAuth.App.ServiceApp.FireManagement
{ {
DateTime firstDayOfYear = new DateTime(DateTime.Now.Year, 1, 1); DateTime firstDayOfYear = new DateTime(DateTime.Now.Year, 1, 1);
var list = await db.FmFireclueInfo.AsQueryable() var list = await db.FmFireclueInfo.AsQueryable()
.Where(r => r.ReportTime >= firstDayOfYear) .Where(r => r.ReportTime >= firstDayOfYear)
.GroupBy(r => new { r.ReportTime.Month }) .GroupBy(r => new { r.ReportTime.Month })
.Select(r => new FireInfoStateForChart .Select(r => new FireInfoStateForChart
{ {
DateTime = r.ReportTime.Month.ToString() + "月", DateTime = r.ReportTime.Month.ToString() + "月",
TreatedCount = SqlFunc.AggregateSum(SqlFunc.IIF(r.State >= 3, 1, 0)), TreatedCount = SqlFunc.AggregateSum(SqlFunc.IIF(r.State >= 3, 1, 0)),
UntreatedCount = SqlFunc.AggregateSum(SqlFunc.IIF(r.State < 3, 1, 0)) UntreatedCount = SqlFunc.AggregateSum(SqlFunc.IIF(r.State < 3, 1, 0))
}).ToListAsync(); }).ToListAsync();
return new Response<List<FireInfoStateForChart>> { Result = list }; return new Response<List<FireInfoStateForChart>> { Result = list };
} }
else else
{ {
DateTime firstDayOfYear = DateTime.Now.AddYears(-3); DateTime firstDayOfYear = DateTime.Now.AddYears(-3);
var list = await db.FmFireclueInfo.AsQueryable() var list = await db.FmFireclueInfo.AsQueryable()
.Where(r => r.ReportTime >= firstDayOfYear) .Where(r => r.ReportTime >= firstDayOfYear)
.GroupBy(r => new { r.ReportTime.Year }) .GroupBy(r => new { r.ReportTime.Year })
.Select(r => new FireInfoStateForChart .Select(r => new FireInfoStateForChart
{ {
DateTime = r.ReportTime.Year.ToString() + "年", DateTime = r.ReportTime.Year.ToString() + "年",
TreatedCount = SqlFunc.AggregateSum(SqlFunc.IIF(r.State >= 3, 1, 0)), TreatedCount = SqlFunc.AggregateSum(SqlFunc.IIF(r.State >= 3, 1, 0)),
UntreatedCount = SqlFunc.AggregateSum(SqlFunc.IIF(r.State < 3, 1, 0)) UntreatedCount = SqlFunc.AggregateSum(SqlFunc.IIF(r.State < 3, 1, 0))
}).ToListAsync(); }).ToListAsync();
return new Response<List<FireInfoStateForChart>> { Result = list }; return new Response<List<FireInfoStateForChart>> { Result = list };
} }
} }
} }
public async Task<Response<List<FireInfoDegreeForChart>>> GetFireClueStatisticsByDegreeType(int type) public async Task<Response<List<FireInfoDegreeForChart>>> GetFireClueStatisticsByDegreeType(int type)
{ {
using (var db = base.UnitWork.CreateContext()) using (var db = base.UnitWork.CreateContext())
@ -451,33 +470,35 @@ namespace OpenAuth.App.ServiceApp.FireManagement
{ {
DateTime firstDayOfYear = new DateTime(DateTime.Now.Year, 1, 1); DateTime firstDayOfYear = new DateTime(DateTime.Now.Year, 1, 1);
var list = await db.FmFireclueInfo.AsQueryable() var list = await db.FmFireclueInfo.AsQueryable()
.Where(r => r.ReportTime >= firstDayOfYear) .Where(r => r.ReportTime >= firstDayOfYear)
.GroupBy(r => new { r.ReportTime.Month }) .GroupBy(r => new { r.ReportTime.Month })
.Select(r => new FireInfoDegreeForChart .Select(r => new FireInfoDegreeForChart
{ {
DateTime = r.ReportTime.Month.ToString() + "月", DateTime = r.ReportTime.Month.ToString() + "月",
ExtraLargeCount = SqlFunc.AggregateSum(SqlFunc.IIF(r.DegreeType == 1, 1, 0)), ExtraLargeCount = SqlFunc.AggregateSum(SqlFunc.IIF(r.DegreeType == 1, 1, 0)),
LargeCount = SqlFunc.AggregateSum(SqlFunc.IIF(r.DegreeType == 2, 1, 0)) LargeCount = SqlFunc.AggregateSum(SqlFunc.IIF(r.DegreeType == 2, 1, 0))
}).ToListAsync(); }).ToListAsync();
return new Response<List<FireInfoDegreeForChart>> { Result = list }; return new Response<List<FireInfoDegreeForChart>> { Result = list };
} }
else else
{ {
DateTime firstDayOfYear = DateTime.Now.AddYears(-3); DateTime firstDayOfYear = DateTime.Now.AddYears(-3);
var list = await db.FmFireclueInfo.AsQueryable() var list = await db.FmFireclueInfo.AsQueryable()
.Where(r => r.ReportTime >= firstDayOfYear) .Where(r => r.ReportTime >= firstDayOfYear)
.GroupBy(r => new { r.ReportTime.Year }) .GroupBy(r => new { r.ReportTime.Year })
.Select(r => new FireInfoDegreeForChart .Select(r => new FireInfoDegreeForChart
{ {
DateTime = r.ReportTime.Year.ToString() + "年", DateTime = r.ReportTime.Year.ToString() + "年",
ExtraLargeCount = SqlFunc.AggregateSum(SqlFunc.IIF(r.DegreeType == 1, 1, 0)), ExtraLargeCount = SqlFunc.AggregateSum(SqlFunc.IIF(r.DegreeType == 1, 1, 0)),
LargeCount = SqlFunc.AggregateSum(SqlFunc.IIF(r.DegreeType == 2, 1, 0)) LargeCount = SqlFunc.AggregateSum(SqlFunc.IIF(r.DegreeType == 2, 1, 0))
}).ToListAsync(); }).ToListAsync();
return new Response<List<FireInfoDegreeForChart>> { Result = list }; return new Response<List<FireInfoDegreeForChart>> { Result = list };
} }
} }
} }
#endregion #endregion
/// <summary> /// <summary>
/// 在线情况 /// 在线情况
/// </summary> /// </summary>
@ -498,15 +519,17 @@ namespace OpenAuth.App.ServiceApp.FireManagement
{ {
foreach (var item in orgid.Where(r => r.Level < 3)) foreach (var item in orgid.Where(r => r.Level < 3))
{ {
var chileorg = (await db.SysOrg.AsQueryable().ToChildListAsync(it => it.ParentId, item)).Select(it => it.Id).ToList(); var chileorg = (await db.SysOrg.AsQueryable().ToChildListAsync(it => it.ParentId, item))
.Select(it => it.Id).ToList();
chileorglist.AddRange(chileorg); chileorglist.AddRange(chileorg);
} }
} }
var userInfoQuery = db.User.AsQueryable() var userInfoQuery = db.User.AsQueryable()
.LeftJoin<FmUserPoint>((a, b) => a.Id == b.CreateId) .LeftJoin<FmUserPoint>((a, b) => a.Id == b.CreateId)
.LeftJoin<SysUserOrg>((a, b, c) => a.Id == c.UserId) .LeftJoin<SysUserOrg>((a, b, c) => a.Id == c.UserId)
.Where((a, b, c) => a.Status == 0) .Where((a, b, c) => a.Status == 0)
.WhereIF(level != 0, (a, b, c) => chileorglist.Contains(c.UserId)); .WhereIF(level != 0, (a, b, c) => chileorglist.Contains(c.UserId));
var userinfo = await userInfoQuery var userinfo = await userInfoQuery
.Select((a, b, c) => new UserOnLineResp .Select((a, b, c) => new UserOnLineResp
{ {
@ -651,5 +674,42 @@ namespace OpenAuth.App.ServiceApp.FireManagement
} }
} }
/// <summary>
/// 保存地图标绘
/// </summary>
/// <param name="req"></param>
/// <returns></returns>
public async Task<Response<bool>> SaveMapPlotting(MapPlottingReq req)
{
var record = req.MapTo<FmMapPlotting>();
record.Id = YitIdHelper.NextId();
using var db = Repository.AsSugarClient();
await db.Insertable(record).IgnoreColumnsNull().ExecuteCommandAsync();
return new Response<bool>()
{
Result = true,
Message = "保存成功",
Code = 200
};
}
public async Task<Response<PageInfo<dynamic>>> GetMapPlotting(PageReq req)
{
using var db = Repository.AsSugarClient();
RefAsync<int> total = 0;
var page = await db.Queryable<FmMapPlotting>()
.OrderByDescending(r => r.CreateTime)
.ToPageListAsync(req.page, req.limit, total);
return new Response<PageInfo<dynamic>>
{
Code = 200,
Message = "查询成功",
Result = new PageInfo<dynamic>
{
Items = page,
Total = total
}
};
}
} }
} }

7
OpenAuth.App/ServiceApp/FireManagement/Request/MapPlottingReq.cs Normal file
View File

@ -0,0 +1,7 @@
namespace OpenAuth.App.ServiceApp.FireManagement.Request;
public class MapPlottingReq
{
public string Title { get;set; }
public string Description { get;set; }
}

26
OpenAuth.Repository/Domain/FireManagement/FmMapPlotting.cs Normal file
View File

@ -0,0 +1,26 @@
using SqlSugar;
namespace OpenAuth.Repository.Domain.FireManagement;
/// <summary>
/// 地图标绘记录
/// </summary>
[SugarTable("fm_mapplotting")]
public class FmMapPlotting
{
/// <summary>
/// id 主键
/// </summary>
[SugarColumn(IsPrimaryKey = true,ColumnName = "id")]
public long Id { get; set; }
[SugarColumn(ColumnName = "title")] public string Title { get; set; }
[SugarColumn(ColumnName = "description")]
public string Description { get; set; }
[SugarColumn(ColumnName = "state")] public int? State { get; set; }
[SugarColumn(ColumnName = "create_time")]
public DateTime? CreateTime { get; set; }
}

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

@ -1,6 +1,7 @@
using Infrastructure; using Infrastructure;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using OpenAuth.App.BaseApp.Base;
using OpenAuth.App.ServiceApp.FireManagement; using OpenAuth.App.ServiceApp.FireManagement;
using OpenAuth.App.ServiceApp.FireManagement.Request; using OpenAuth.App.ServiceApp.FireManagement.Request;
using OpenAuth.App.ServiceApp.FireManagement.Response; using OpenAuth.App.ServiceApp.FireManagement.Response;
@ -382,5 +383,38 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement
{ {
return await _app.AddPointAsync(info); return await _app.AddPointAsync(info);
} }
/// <summary>
/// 地图标绘保存
/// </summary>
/// <param name="req"></param>
/// <returns></returns>
[HttpPost]
[AllowAnonymous]
public async Task<Response<bool>> SaveMapPlotting(MapPlottingReq req)
{
if (string.IsNullOrEmpty(req.Title))
{
return new Response<bool>() { Code = 500, Message = "标题不能为空" };
}
if (string.IsNullOrEmpty(req.Description))
{
return new Response<bool>() { Code = 500, Message = "描述不能为空" };
}
return await _app.SaveMapPlotting(req);
}
/// <summary>
/// 地图村绘列表
/// </summary>
/// <param name="req"></param>
/// <returns></returns>
[HttpGet]
[AllowAnonymous]
public async Task<Response<PageInfo<dynamic>>> GetMapPlotting([FromQuery] PageReq req)
{
return await _app.GetMapPlotting(req);
}
/// 地图标绘关闭
} }
} }