chenwei
/
lanlingxian_ziranziyuanheguihua
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1. 格式化代码 

2. 优化import
dev
陈伟 2025-05-22 14:38:11 +08:00
parent 37bb2f1fd5
commit 2f59c1a3b7
2 changed files with 68 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
OpenAuth.App/ServiceApp/DroneSsnydManage/DroneSsnyApp.cs
View File

@ -1,4 +1,6 @@
using Infrastructure;
using NPOI.HSSF.UserModel;
using NPOI.SS.UserModel;
using OpenAuth.App.BaseApp.Base;
using OpenAuth.App.Interface;
using OpenAuth.App.ServiceApp.DroneSsnydManage.Export;
@ -6,12 +8,6 @@ using OpenAuth.App.ServiceApp.DroneSsnydManage.Request;
using OpenAuth.Repository;
using OpenAuth.Repository.Domain;
using SqlSugar;
using Infrastructure;
using DocumentFormat.OpenXml.Spreadsheet;
using NPOI.SS.Formula.Functions;
using NPOI.HSSF.UserModel;
using NPOI.SS.UserModel;
using Newtonsoft.Json.Linq;
namespace OpenAuth.App.ServiceApp.DroneSsnydManage
{
@ -35,12 +31,12 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
var endTime = DateTime.Now.AddMonths(2);
var list = base.Repository.AsQueryable()
.WhereIF(!string.IsNullOrEmpty(xiangmumc), a => a.xiangmu_name.Contains(xiangmumc))
.WhereIF(!string.IsNullOrEmpty(countyid), a => a.countyid == countyid)
.WhereIF(!string.IsNullOrEmpty(streetid), a => a.streetid == streetid)
.Where(a => a.end_time <= endTime && a.end_time > DateTime.Now)
.OrderBy(a => a.end_time, OrderByType.Desc)
.ToPageList(pageIndex, pageSize, ref totalCount);
.WhereIF(!string.IsNullOrEmpty(xiangmumc), a => a.xiangmu_name.Contains(xiangmumc))
.WhereIF(!string.IsNullOrEmpty(countyid), a => a.countyid == countyid)
.WhereIF(!string.IsNullOrEmpty(streetid), a => a.streetid == streetid)
.Where(a => a.end_time <= endTime && a.end_time > DateTime.Now)
.OrderBy(a => a.end_time, OrderByType.Desc)
.ToPageList(pageIndex, pageSize, ref totalCount);
return new PageInfo<List<DroneSsnyd>>
{
@ -50,7 +46,6 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
}
/// <summary>
/// 超期报警
/// </summary>
@ -64,12 +59,12 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
var endTime = DateTime.Now;
var list = base.Repository.AsQueryable()
.WhereIF(!string.IsNullOrEmpty(xiangmumc), a => a.xiangmu_name.Contains(xiangmumc))
.WhereIF(!string.IsNullOrEmpty(countyid), a => a.countyid == countyid)
.WhereIF(!string.IsNullOrEmpty(streetid), a => a.streetid == streetid)
.Where(a => a.end_time < endTime)
.OrderBy(a => a.end_time, OrderByType.Desc)
.ToPageList(pageIndex, pageSize, ref totalCount);
.WhereIF(!string.IsNullOrEmpty(xiangmumc), a => a.xiangmu_name.Contains(xiangmumc))
.WhereIF(!string.IsNullOrEmpty(countyid), a => a.countyid == countyid)
.WhereIF(!string.IsNullOrEmpty(streetid), a => a.streetid == streetid)
.Where(a => a.end_time < endTime)
.OrderBy(a => a.end_time, OrderByType.Desc)
.ToPageList(pageIndex, pageSize, ref totalCount);
return new PageInfo<List<DroneSsnyd>>
{
@ -181,18 +176,19 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
#region 导出
//超期预警
public List<DroneSsnyd> TimeoutWarningExport(string xiangmumc, string countyid, string streetid)
{
var endTime = DateTime.Now.AddMonths(2);
var list = base.Repository.AsQueryable()
.WhereIF(!string.IsNullOrEmpty(xiangmumc), a => a.xiangmu_name.Contains(xiangmumc))
.WhereIF(!string.IsNullOrEmpty(countyid), a => a.countyid == countyid)
.WhereIF(!string.IsNullOrEmpty(streetid), a => a.streetid == streetid)
.Where(a => a.end_time <= endTime && a.end_time > DateTime.Now)
.OrderBy(a => a.end_time, OrderByType.Desc)
.ToList();
.WhereIF(!string.IsNullOrEmpty(xiangmumc), a => a.xiangmu_name.Contains(xiangmumc))
.WhereIF(!string.IsNullOrEmpty(countyid), a => a.countyid == countyid)
.WhereIF(!string.IsNullOrEmpty(streetid), a => a.streetid == streetid)
.Where(a => a.end_time <= endTime && a.end_time > DateTime.Now)
.OrderBy(a => a.end_time, OrderByType.Desc)
.ToList();
return list;
}
@ -208,22 +204,23 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
var endTime = DateTime.Now;
var list = base.Repository.AsQueryable()
.WhereIF(!string.IsNullOrEmpty(xiangmumc), a => a.xiangmu_name.Contains(xiangmumc))
.WhereIF(!string.IsNullOrEmpty(countyid), a => a.countyid == countyid)
.WhereIF(!string.IsNullOrEmpty(streetid), a => a.streetid == streetid)
.Where(a => a.end_time < endTime)
.OrderBy(a => a.end_time, OrderByType.Desc)
.ToList();
.WhereIF(!string.IsNullOrEmpty(xiangmumc), a => a.xiangmu_name.Contains(xiangmumc))
.WhereIF(!string.IsNullOrEmpty(countyid), a => a.countyid == countyid)
.WhereIF(!string.IsNullOrEmpty(streetid), a => a.streetid == streetid)
.Where(a => a.end_time < endTime)
.OrderBy(a => a.end_time, OrderByType.Desc)
.ToList();
return list;
}
/// <summary>
/// 导出
/// </summary>
/// <param name="list"></param>
/// <param name="headers"></param>
/// <returns></returns>
public Response<MemoryStream> ListToExcel(List<DroneSsnyd> list, List<string> headers)
public Response<MemoryStream> ListToExcel(List<DroneSsnyd> list, List<string> headers)
{
Response<MemoryStream> response = new Response<MemoryStream>();
try
@ -242,7 +239,7 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
style.BorderLeft = BorderStyle.Thin;
style.BorderRight = BorderStyle.Thin;
style.BorderTop = BorderStyle.Thin;
style.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center;
style.Alignment = HorizontalAlignment.Center;
style.VerticalAlignment = VerticalAlignment.Center;
style.SetFont(font1); //将字体样式赋给样式对象
style.WrapText = true;
@ -260,7 +257,7 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
style1.BorderLeft = BorderStyle.Thin;
style1.BorderRight = BorderStyle.Thin;
style1.BorderTop = BorderStyle.Thin;
style1.Alignment = NPOI.SS.UserModel.HorizontalAlignment.Center;
style1.Alignment = HorizontalAlignment.Center;
style1.VerticalAlignment = VerticalAlignment.Center;
style1.SetFont(font); //将字体样式赋给样式对象
@ -284,7 +281,6 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
{
sheet.SetColumnWidth(i, 20 * 350);
}
}
#endregion
@ -303,6 +299,7 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
dataRow.CreateCell(j);
dataRow.Cells[j].CellStyle = style;
}
dataRow.Cells[0].SetCellValue(item.xiangmu_no);
dataRow.Cells[1].SetCellValue(item.xiangmu_name);
dataRow.Cells[2].SetCellValue(item.streetname);
@ -321,6 +318,7 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
{
dataRow.Cells[10].SetCellValue("0.00");
}
if (item.shengchan_area != null)
{
dataRow.Cells[11].SetCellValue(item.shenqing_area.ToString());
@ -329,6 +327,7 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
{
dataRow.Cells[11].SetCellValue("0.00");
}
if (item.fuzhu_area != null)
{
dataRow.Cells[12].SetCellValue(item.fuzhu_area.ToString());
@ -370,24 +369,27 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
return response;
}
#endregion
#region 项目列表
/// <summary>
/// 到期预警
/// </summary>
/// <param name="pageIndex"></param>
/// <param name="pageSize"></param>
/// <returns></returns>
public PageInfo<List<DroneSsnyd>> GetDronssnydList(string xiangmumc, string countyid, string streetid, int pageIndex, int pageSize)
public PageInfo<List<DroneSsnyd>> GetDronssnydList(string xiangmumc, string countyid, string streetid,
int pageIndex, int pageSize)
{
int totalCount = 0;
var list = base.Repository.AsQueryable()
.WhereIF(!string.IsNullOrEmpty(xiangmumc), a => a.xiangmu_name.Contains(xiangmumc))
.WhereIF(!string.IsNullOrEmpty(countyid), a => a.countyid == countyid)
.WhereIF(!string.IsNullOrEmpty(streetid), a => a.streetid == streetid)
.OrderBy(a => a.end_time, OrderByType.Desc)
.ToPageList(pageIndex, pageSize, ref totalCount);
.WhereIF(!string.IsNullOrEmpty(xiangmumc), a => a.xiangmu_name.Contains(xiangmumc))
.WhereIF(!string.IsNullOrEmpty(countyid), a => a.countyid == countyid)
.WhereIF(!string.IsNullOrEmpty(streetid), a => a.streetid == streetid)
.OrderBy(a => a.end_time, OrderByType.Desc)
.ToPageList(pageIndex, pageSize, ref totalCount);
return new PageInfo<List<DroneSsnyd>>
{
@ -395,6 +397,7 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage
Total = totalCount
};
}
#endregion
}
}

35
OpenAuth.WebApi/Controllers/ServiceControllers/DroneSsnyController.cs
View File

@ -1,11 +1,7 @@
using DocumentFormat.OpenXml.Math;
using DocumentFormat.OpenXml.Spreadsheet;
using Infrastructure;
using Infrastructure.Utilities.Excel;
using Infrastructure.Helpers.Excel;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using NPOI.SS.Formula.Functions;
using OpenAuth.App.ServiceApp.DroneSsnydManage;
using OpenAuth.App.ServiceApp.DroneSsnydManage.Request;
using OpenAuth.Repository.Domain;
@ -36,12 +32,13 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
/// <param name="pageSize"></param>
/// <returns></returns>
[HttpGet]
public Response<PageInfo<List<DroneSsnyd>>> TimeoutWarning(string xiangmumc, string countyid, string streetid, int page, int limit)
public Response<PageInfo<List<DroneSsnyd>>> TimeoutWarning(string xiangmumc, string countyid, string streetid,
int page, int limit)
{
var response = new Response<PageInfo<List<DroneSsnyd>>>();
try
{
response.Result = droneSsnyApp.TimeoutWarning(xiangmumc, countyid, streetid,page, limit);
response.Result = droneSsnyApp.TimeoutWarning(xiangmumc, countyid, streetid, page, limit);
}
catch (Exception ex)
{
@ -62,7 +59,8 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
/// <param name="pageSize"></param>
/// <returns></returns>
[HttpGet]
public Response<PageInfo<List<DroneSsnyd>>> TimeOutAlarmList(string xiangmumc, string countyid,string streetid,int page, int limit)
public Response<PageInfo<List<DroneSsnyd>>> TimeOutAlarmList(string xiangmumc, string countyid, string streetid,
int page, int limit)
{
var response = new Response<PageInfo<List<DroneSsnyd>>>();
try
@ -77,7 +75,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
return response;
}
/// <summary>
/// 历史项目
/// </summary>
@ -137,6 +135,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
"历史项目导出" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".xlsx");
}
/// <summary>
/// 项目变更导出
/// </summary>
@ -153,6 +152,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
}
#region 预警报警导出
/// <summary>
/// 超期预警数据导出
/// </summary>
@ -163,7 +163,11 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
{
var data = new Response();
List<string> headers = null;
headers = new List<string> { "项目编号", "项目名称", "乡镇", "村庄", "权利人", "行政区划", "备案编号", "项目开始时间", "项目结束时间", "项目当前用途", "设施农业申请用地面积", "生产设施用地", "辅助设施用地","下发时间","项目状态"};
headers = new List<string>
{
"项目编号", "项目名称", "乡镇", "村庄", "权利人", "行政区划", "备案编号", "项目开始时间", "项目结束时间", "项目当前用途", "设施农业申请用地面积", "生产设施用地",
"辅助设施用地", "下发时间", "项目状态"
};
var response = droneSsnyApp.TimeoutWarningExport(import.xiangmumc, import.countyid, import.streetid);
if (response.Count > 0)
{
@ -185,6 +189,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
data.Code = 300;
data.Message = "暂无数据";
}
return Ok(data);
}
@ -199,7 +204,11 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
{
var data = new Response();
List<string> headers = null;
headers = new List<string> { "项目编号", "项目名称", "乡镇", "村庄", "权利人", "行政区划", "备案编号", "项目开始时间", "项目结束时间", "项目当前用途", "设施农业申请用地面积", "生产设施用地", "辅助设施用地", "下发时间", "项目状态" };
headers = new List<string>
{
"项目编号", "项目名称", "乡镇", "村庄", "权利人", "行政区划", "备案编号", "项目开始时间", "项目结束时间", "项目当前用途", "设施农业申请用地面积", "生产设施用地",
"辅助设施用地", "下发时间", "项目状态"
};
var response = droneSsnyApp.TimeOutAlarmExport(import.xiangmumc, import.countyid, import.streetid);
if (response.Count > 0)
{
@ -221,12 +230,14 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
data.Code = 300;
data.Message = "暂无数据";
}
return Ok(data);
}
#endregion
#region 项目列表
/// <summary>
/// 项目列表
/// </summary>
@ -238,7 +249,8 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
/// <returns></returns>
[HttpGet]
[AllowAnonymous]
public Response<PageInfo<List<DroneSsnyd>>> GetDronssnydList(string xiangmumc, string countyid, string streetid, int page, int limit)
public Response<PageInfo<List<DroneSsnyd>>> GetDronssnydList(string xiangmumc, string countyid, string streetid,
int page, int limit)
{
var response = new Response<PageInfo<List<DroneSsnyd>>>();
try
@ -253,6 +265,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
return response;
}
#endregion
}
}