From 4afd10c2965ace96ee839073b92052f4d2be0f9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B4=81=20=E4=BB=BB?= Date: Thu, 22 May 2025 16:24:46 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenAuth.App/ServiceApp/DroneSsnydManage/DroneSsnyApp.cs | 2 +- .../Controllers/ServiceControllers/DroneSsnyController.cs | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/OpenAuth.App/ServiceApp/DroneSsnydManage/DroneSsnyApp.cs b/OpenAuth.App/ServiceApp/DroneSsnydManage/DroneSsnyApp.cs index e801720..b9b1422 100644 --- a/OpenAuth.App/ServiceApp/DroneSsnydManage/DroneSsnyApp.cs +++ b/OpenAuth.App/ServiceApp/DroneSsnydManage/DroneSsnyApp.cs @@ -338,7 +338,7 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage } dataRow.Cells[13].SetCellValue(item.xiafatime.ToString()); - dataRow.Cells[13].SetCellValue(item.handle_status_name.ToString()); + dataRow.Cells[14].SetCellValue(item.handle_status_name); //if (item.handle_status_id != null) //{ diff --git a/OpenAuth.WebApi/Controllers/ServiceControllers/DroneSsnyController.cs b/OpenAuth.WebApi/Controllers/ServiceControllers/DroneSsnyController.cs index 776f32b..c5823c0 100644 --- a/OpenAuth.WebApi/Controllers/ServiceControllers/DroneSsnyController.cs +++ b/OpenAuth.WebApi/Controllers/ServiceControllers/DroneSsnyController.cs @@ -32,6 +32,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers /// /// [HttpGet] + [AllowAnonymous] public Response>> TimeoutWarning(string xiangmumc, string countyid, string streetid, int page, int limit) { @@ -59,6 +60,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers /// /// [HttpGet] + [AllowAnonymous] public Response>> TimeOutAlarmList(string xiangmumc, string countyid, string streetid, int page, int limit) { @@ -128,6 +130,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers /// /// [HttpPost] + public async Task> MaintainNumber(string id, string newXiangmuNo) { var response = new Response(); @@ -183,6 +186,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers /// /// [HttpPost] + [AllowAnonymous] public IActionResult TimeoutWarningExport([FromQuery] TimeOutReq import) { var data = new Response(); @@ -224,6 +228,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers /// /// [HttpPost] + [AllowAnonymous] public IActionResult TimeoutAlarmExport([FromQuery] TimeOutReq import) { var data = new Response(); From fcd6d26daaaf69eda057ceb2ddc41645af322fd2 Mon Sep 17 00:00:00 2001 From: zhangbin <460190368@qq.com> Date: Thu, 22 May 2025 16:25:41 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseApp/FormScheme/FormSchemeApp.cs | 2 - .../DroneSsnyStatisticsApp.cs | 98 +++++++++++++++++++ .../DroneSsnydManage/Export/OffenceResp.cs | 25 +++++ .../DroneSsnyStatisticsController.cs | 45 +++++++++ 4 files changed, 168 insertions(+), 2 deletions(-) create mode 100644 OpenAuth.App/ServiceApp/DroneSsnydManage/DroneSsnyStatisticsApp.cs create mode 100644 OpenAuth.App/ServiceApp/DroneSsnydManage/Export/OffenceResp.cs create mode 100644 OpenAuth.WebApi/Controllers/ServiceControllers/DroneSsnyStatisticsController.cs diff --git a/OpenAuth.App/BaseApp/FormScheme/FormSchemeApp.cs b/OpenAuth.App/BaseApp/FormScheme/FormSchemeApp.cs index 773e454..8bc676b 100644 --- a/OpenAuth.App/BaseApp/FormScheme/FormSchemeApp.cs +++ b/OpenAuth.App/BaseApp/FormScheme/FormSchemeApp.cs @@ -1402,7 +1402,6 @@ namespace OpenAuth.App.FormScheme { var sql = new StringBuilder(); sql.Append($" UPDATE {tableName} SET "); - bool isfirt = true; foreach (var item in dbParameters) { @@ -1427,7 +1426,6 @@ namespace OpenAuth.App.FormScheme isfirt = false; } } - sql.Append($" WHERE \"{pkey}\" = @{pkey} "); return sql.ToString(); diff --git a/OpenAuth.App/ServiceApp/DroneSsnydManage/DroneSsnyStatisticsApp.cs b/OpenAuth.App/ServiceApp/DroneSsnydManage/DroneSsnyStatisticsApp.cs new file mode 100644 index 0000000..570f2f4 --- /dev/null +++ b/OpenAuth.App/ServiceApp/DroneSsnydManage/DroneSsnyStatisticsApp.cs @@ -0,0 +1,98 @@ +using OpenAuth.App.BaseApp.Base; +using OpenAuth.Repository.Domain; +using OpenAuth.Repository; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using OpenAuth.App.Interface; +using SqlSugar; +using Infrastructure; +using OpenAuth.App.ServiceApp.DroneSsnydManage.Export; + +namespace OpenAuth.App.ServiceApp.DroneSsnydManage +{ + public class DroneSsnyStatisticsApp : SqlSugarBaseApp + { + public DroneSsnyStatisticsApp(ISugarUnitOfWork unitWork, ISimpleClient repository, IAuth auth) + : base(unitWork, repository, auth) + { + } + #region 数据统计 + public Response> CaseOffence(DateTime startTime, DateTime endTime, string tubanlaiyuan) + { + List listResp = new List(); + double SumArea(IEnumerable cases, Func selector) + { + var sum = cases + .Select(selector) + .Where(area => !string.IsNullOrEmpty(area)) + .Sum(area => double.TryParse(area, out var result) ? result : 0); + return Math.Round(sum, 2); // 保留两位小数 + } + List org = new List(); + org = UnitWork.Db.Queryable().Where(a => a.Level == 2 && a.ParentId == 371324).ToList(); + List caseList = new List(); + caseList = Repository.AsQueryable().Where((a) => a.synchronoustime >= startTime && a.synchronoustime <= endTime && a.is_closed == 0).ToList(); + //总计 + int xmcount = 0;//项目个数 + double xmzydsum = 0.0,//项目总用地面积 + scydsum = 0.0,//生产用地面积 + fuydsum = 0.0,//辅助用地面积 + nydsum = 0.0,//农业用地面积 + gdsum = 0.0,//耕地面积 + yjjbntsum = 0.0;//永久基本农田面积 + foreach (var item in org) + { + var countyIdString = item.Id.ToString(); + var casesForCounty = caseList.Where(r => r.countyid == countyIdString || r.streetid == countyIdString).ToList(); + xmcount += casesForCounty.Count; + var xmzydmj = SumArea(casesForCounty, r => r.shenqing_area.ToString()); + xmzydsum += xmzydmj; + var scydmj = SumArea(casesForCounty, r => r.shengchan_area.ToString()); + scydsum += scydmj; + var scfzydmj = SumArea(casesForCounty, r => r.fuzhu_area.ToString()); + fuydsum += scfzydmj; + var nydmj = SumArea(casesForCounty, r => r.nongyongdi_area.ToString()); + nydsum += nydmj; + var gdmj = SumArea(casesForCounty, r => r.gengdi_area.ToString()); + gdsum += gdmj; + var yjjbntmj = SumArea(casesForCounty, r => r.yongjiujibennongtian_area.ToString()); + yjjbntsum += yjjbntmj; + OffenceResp offenceResp = new OffenceResp + { + countyid = item.Id, + countyname = item.Name, + xmcount = casesForCounty.Count, + xmzydmj = Math.Round(xmzydmj, 2), + scydmj = Math.Round(scydmj, 2), + scfzydmj = Math.Round(scfzydmj, 2), + nydmj = Math.Round(nydmj, 2), + gdmj = Math.Round(gdmj, 2), + yjjbntmj = Math.Round(yjjbntmj, 2) + }; + listResp.Add(offenceResp); + } + listResp.Add(new OffenceResp + { + countyid = 0, + countyname = "合计", + xmcount = xmcount, + xmzydmj = Math.Round(xmzydsum, 2), + scydmj = Math.Round(scydsum, 2), + scfzydmj = Math.Round(fuydsum, 2), + nydmj = Math.Round(nydsum, 2), + gdmj = Math.Round(gdsum, 2), + yjjbntmj = Math.Round(yjjbntsum, 2) + + }); + return new Response> + { + Result = listResp, + Message = "获取数据成功" + }; + } + #endregion + } +} diff --git a/OpenAuth.App/ServiceApp/DroneSsnydManage/Export/OffenceResp.cs b/OpenAuth.App/ServiceApp/DroneSsnydManage/Export/OffenceResp.cs new file mode 100644 index 0000000..b35bc0e --- /dev/null +++ b/OpenAuth.App/ServiceApp/DroneSsnydManage/Export/OffenceResp.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace OpenAuth.App.ServiceApp.DroneSsnydManage.Export +{ + public class OffenceResp + { + public long countyid { get; set; } + public string countyname { get; set; } + /// + /// 项目总数 + /// + public int xmcount { get; set; } + + public double xmzydmj { get; set; } + public double scydmj { get; set; } + public double scfzydmj { get; set; } + public double nydmj { get; set; } + public double gdmj { get; set; } + public double yjjbntmj { get; set; } + } +} diff --git a/OpenAuth.WebApi/Controllers/ServiceControllers/DroneSsnyStatisticsController.cs b/OpenAuth.WebApi/Controllers/ServiceControllers/DroneSsnyStatisticsController.cs new file mode 100644 index 0000000..5c7e8d5 --- /dev/null +++ b/OpenAuth.WebApi/Controllers/ServiceControllers/DroneSsnyStatisticsController.cs @@ -0,0 +1,45 @@ +using Infrastructure; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; +using OpenAuth.App.ServiceApp.DroneSsnydManage; +using OpenAuth.App.ServiceApp.DroneSsnydManage.Export; + +namespace OpenAuth.WebApi.Controllers.ServiceControllers +{ + /// + /// 批后监管--s数据统计 + /// + [Route("api/[controller]/[action]")] + [ApiController] + public class DroneSsnyStatisticsController : ControllerBase + { + DroneSsnyStatisticsApp _app; + public DroneSsnyStatisticsController(DroneSsnyStatisticsApp app) + { + _app = app; + } + + #region 统计 + /// + /// 无人机发现违法行为情况统计明细表 + /// + /// + [HttpGet] + [AllowAnonymous] + public Response> CaseOffenceForSsny(DateTime startTime, DateTime endTime, string tubanlaiyuan) + { + Response> response = new Response>(); + try + { + response = _app.CaseOffence(startTime, endTime, tubanlaiyuan); + } + catch (Exception ex) + { + response.Code = 500; + response.Message = ex.InnerException?.Message ?? ex.Message; + } + return response; + } + #endregion + } +} From fe88e86c160ec59dfd2e76bc95696afa8330d80b Mon Sep 17 00:00:00 2001 From: zhangbin <460190368@qq.com> Date: Thu, 22 May 2025 16:29:00 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ServiceControllers/DroneSsnyStatisticsController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAuth.WebApi/Controllers/ServiceControllers/DroneSsnyStatisticsController.cs b/OpenAuth.WebApi/Controllers/ServiceControllers/DroneSsnyStatisticsController.cs index 5c7e8d5..f6e2d0a 100644 --- a/OpenAuth.WebApi/Controllers/ServiceControllers/DroneSsnyStatisticsController.cs +++ b/OpenAuth.WebApi/Controllers/ServiceControllers/DroneSsnyStatisticsController.cs @@ -21,7 +21,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers #region 统计 /// - /// 无人机发现违法行为情况统计明细表 + /// 统计分析 /// /// [HttpGet] From a4490409952777edab9763b92ddeb8e568e03571 Mon Sep 17 00:00:00 2001 From: zhangbin <460190368@qq.com> Date: Thu, 22 May 2025 16:34:34 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=9D=E7=95=99?= =?UTF-8?q?=E4=BD=8D=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DroneSsnyStatisticsApp.cs | 24 +++++++++---------- .../DroneSsnyStatisticsController.cs | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/OpenAuth.App/ServiceApp/DroneSsnydManage/DroneSsnyStatisticsApp.cs b/OpenAuth.App/ServiceApp/DroneSsnydManage/DroneSsnyStatisticsApp.cs index 570f2f4..da2513e 100644 --- a/OpenAuth.App/ServiceApp/DroneSsnydManage/DroneSsnyStatisticsApp.cs +++ b/OpenAuth.App/ServiceApp/DroneSsnydManage/DroneSsnyStatisticsApp.cs @@ -65,12 +65,12 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage countyid = item.Id, countyname = item.Name, xmcount = casesForCounty.Count, - xmzydmj = Math.Round(xmzydmj, 2), - scydmj = Math.Round(scydmj, 2), - scfzydmj = Math.Round(scfzydmj, 2), - nydmj = Math.Round(nydmj, 2), - gdmj = Math.Round(gdmj, 2), - yjjbntmj = Math.Round(yjjbntmj, 2) + xmzydmj = Math.Round(xmzydmj, 4), + scydmj = Math.Round(scydmj, 4), + scfzydmj = Math.Round(scfzydmj, 4), + nydmj = Math.Round(nydmj, 4), + gdmj = Math.Round(gdmj, 4), + yjjbntmj = Math.Round(yjjbntmj, 4) }; listResp.Add(offenceResp); } @@ -79,12 +79,12 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage countyid = 0, countyname = "合计", xmcount = xmcount, - xmzydmj = Math.Round(xmzydsum, 2), - scydmj = Math.Round(scydsum, 2), - scfzydmj = Math.Round(fuydsum, 2), - nydmj = Math.Round(nydsum, 2), - gdmj = Math.Round(gdsum, 2), - yjjbntmj = Math.Round(yjjbntsum, 2) + xmzydmj = Math.Round(xmzydsum, 4), + scydmj = Math.Round(scydsum, 4), + scfzydmj = Math.Round(fuydsum, 4), + nydmj = Math.Round(nydsum, 4), + gdmj = Math.Round(gdsum, 4), + yjjbntmj = Math.Round(yjjbntsum, 4) }); return new Response> diff --git a/OpenAuth.WebApi/Controllers/ServiceControllers/DroneSsnyStatisticsController.cs b/OpenAuth.WebApi/Controllers/ServiceControllers/DroneSsnyStatisticsController.cs index f6e2d0a..28e5fda 100644 --- a/OpenAuth.WebApi/Controllers/ServiceControllers/DroneSsnyStatisticsController.cs +++ b/OpenAuth.WebApi/Controllers/ServiceControllers/DroneSsnyStatisticsController.cs @@ -7,7 +7,7 @@ using OpenAuth.App.ServiceApp.DroneSsnydManage.Export; namespace OpenAuth.WebApi.Controllers.ServiceControllers { /// - /// 批后监管--s数据统计 + /// 批后监管--数据统计 /// [Route("api/[controller]/[action]")] [ApiController] From 9b67846b3f6ed92d56d892ae1982225180adadcc Mon Sep 17 00:00:00 2001 From: zhangbin <460190368@qq.com> Date: Thu, 22 May 2025 17:16:39 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=A9=BF=E9=80=8F?= =?UTF-8?q?=E6=A1=88=E4=BB=B6=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DroneSsnyStatisticsApp.cs | 60 ++++++++++ .../Export/QueryCaseOffenceListResp.cs | 112 ++++++++++++++++++ .../Request/QueryCaseOffencetReq.cs | 21 ++++ .../DroneSsnyStatisticsController.cs | 13 ++ 4 files changed, 206 insertions(+) create mode 100644 OpenAuth.App/ServiceApp/DroneSsnydManage/Export/QueryCaseOffenceListResp.cs create mode 100644 OpenAuth.App/ServiceApp/DroneSsnydManage/Request/QueryCaseOffencetReq.cs diff --git a/OpenAuth.App/ServiceApp/DroneSsnydManage/DroneSsnyStatisticsApp.cs b/OpenAuth.App/ServiceApp/DroneSsnydManage/DroneSsnyStatisticsApp.cs index da2513e..d823f8c 100644 --- a/OpenAuth.App/ServiceApp/DroneSsnydManage/DroneSsnyStatisticsApp.cs +++ b/OpenAuth.App/ServiceApp/DroneSsnydManage/DroneSsnyStatisticsApp.cs @@ -10,6 +10,8 @@ using OpenAuth.App.Interface; using SqlSugar; using Infrastructure; using OpenAuth.App.ServiceApp.DroneSsnydManage.Export; +using OpenAuth.App.ServiceApp.DroneSsnydManage.Request; +using Org.BouncyCastle.Ocsp; namespace OpenAuth.App.ServiceApp.DroneSsnydManage { @@ -93,6 +95,64 @@ namespace OpenAuth.App.ServiceApp.DroneSsnydManage Message = "获取数据成功" }; } + + //项目信息 + public async Task>>> GetCaseInfo(QueryCaseOffencetReq req) + { + List caseList = new List(); + List tubanlaiyuanList = string.IsNullOrEmpty(req.tubanlaiyuan) + ? new List() + : req.tubanlaiyuan.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList(); + var baseQuery = Repository.AsQueryable() + .Where((a) => a.synchronoustime >= req.StartTime && a.synchronoustime <= req.EndTime) + .Where(a => a.streetid == req.AreaId || a.countyid == req.AreaId || a.communityid == req.AreaId) + .Where((a) => a.is_closed == 0); + List baseList = new List(); + RefAsync totalcount = 0; + //switch (req.CaseType) + //{ + // case 1: + + // break; + // case 2: + // baseQuery = baseQuery.Where(a => a.handle_status_id == 5); + // break; + // case 3: + // baseQuery = baseQuery.Where(a => (a.handle_status_id == 5) || a.handle_status_id != 5); + // break; + // default: + // break; + //} + // 获取分页结果 + var result = await baseQuery.Select(r => new QueryCaseOffenceListResp + { + Id = r.Id, + xiangmu_no = r.xiangmu_no, + xiangmu_name = r.xiangmu_name, + streetname = r.streetname, + communityname = r.communityname, + quanliren = r.quanliren, + xingzhengquhua = r.xingzhengquhua, + beian_no = r.beian_no, + start_time = r.start_time, + end_time = r.end_time, + xiangmu_yt = r.xiangmu_yt, + shenqing_area = r.shenqing_area, + shengchan_area = r.shengchan_area, + fuzhu_area = r.fuzhu_area, + xiafatime = r.xiafatime, + handle_status_name = r.handle_status_name + }).ToPageListAsync(req.page, req.limit, totalcount); + return new Response>> + { + Result = new PageInfo> + { + Items = result, + Total = totalcount + }, + Message = "获取数据成功" + }; + } #endregion } } diff --git a/OpenAuth.App/ServiceApp/DroneSsnydManage/Export/QueryCaseOffenceListResp.cs b/OpenAuth.App/ServiceApp/DroneSsnydManage/Export/QueryCaseOffenceListResp.cs new file mode 100644 index 0000000..2b21aa6 --- /dev/null +++ b/OpenAuth.App/ServiceApp/DroneSsnydManage/Export/QueryCaseOffenceListResp.cs @@ -0,0 +1,112 @@ +using SqlSugar; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace OpenAuth.App.ServiceApp.DroneSsnydManage.Export +{ + public class QueryCaseOffenceListResp + { + /// + /// Desc: + /// Default: + /// Nullable:False + /// + public string Id { get; set; } + /// + /// Desc:项目编号 + /// Default: + /// Nullable:True + /// + public string xiangmu_no { get; set; } + /// + /// Desc:项目名称 + /// Default: + /// Nullable:True + /// + public string xiangmu_name { get; set; } + /// + /// Desc:镇 + /// Default: + /// Nullable:True + /// + public string streetname { get; set; } + /// + /// Desc:村 + /// Default: + /// Nullable:True + /// + public string communityname { get; set; } + /// + /// Desc:权利人 + /// Default: + /// Nullable:True + /// + public string quanliren { get; set; } + /// + /// Desc:行政区划 + /// Default: + /// Nullable:True + /// + public string xingzhengquhua { get; set; } + /// + /// Desc:备案编号 + /// Default: + /// Nullable:True + /// + public string beian_no { get; set; } + /// + /// Desc:项目开始时间1 + /// Default: + /// Nullable:True + /// + public DateTime? start_time { get; set; } + + /// + /// Desc:项目结束时间1 + /// Default: + /// Nullable:True + /// + public DateTime? end_time { get; set; } + /// + /// Desc:项目当前用途 + /// Default: + /// Nullable:True + /// + public string xiangmu_yt { get; set; } + /// + /// Desc:设施农业申请用地面积(公顷) + /// Default: + /// Nullable:True + /// + public decimal? shenqing_area { get; set; } + /// + /// Desc:生产设施用地(公顷) + /// Default: + /// Nullable:True + /// + public decimal? shengchan_area { get; set; } + + /// + /// Desc:辅助设施用地(公顷) + /// Default: + /// Nullable:True + /// + public decimal? fuzhu_area { get; set; } + /// + /// Desc:创建时间-下发时间 + /// Default:now() + /// Nullable:True + /// + public DateTime? xiafatime { get; set; } + /// + /// Desc:处理状态 1 开工核查 2 开工问题整改 3 建中核查 4 建中问题整改 5 完工核查 6 完工问题整改 7 日常监管 8 监管问题整改 9 现场复核 99 项目终止 98 项目移交 + /// Default: + /// Nullable:True + /// + public string handle_status_name { get; set; } + + } +} diff --git a/OpenAuth.App/ServiceApp/DroneSsnydManage/Request/QueryCaseOffencetReq.cs b/OpenAuth.App/ServiceApp/DroneSsnydManage/Request/QueryCaseOffencetReq.cs new file mode 100644 index 0000000..9712108 --- /dev/null +++ b/OpenAuth.App/ServiceApp/DroneSsnydManage/Request/QueryCaseOffencetReq.cs @@ -0,0 +1,21 @@ +using OpenAuth.App.Request; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace OpenAuth.App.ServiceApp.DroneSsnydManage.Request +{ + public class QueryCaseOffencetReq : PageReq + { + public string AreaId { get; set; } + /// + /// + /// + public int CaseType { get; set; } + public DateTime StartTime { get; set; } + public DateTime EndTime { get; set; } + public string tubanlaiyuan { get; set; } + } +} diff --git a/OpenAuth.WebApi/Controllers/ServiceControllers/DroneSsnyStatisticsController.cs b/OpenAuth.WebApi/Controllers/ServiceControllers/DroneSsnyStatisticsController.cs index 28e5fda..24fea84 100644 --- a/OpenAuth.WebApi/Controllers/ServiceControllers/DroneSsnyStatisticsController.cs +++ b/OpenAuth.WebApi/Controllers/ServiceControllers/DroneSsnyStatisticsController.cs @@ -3,6 +3,8 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using OpenAuth.App.ServiceApp.DroneSsnydManage; using OpenAuth.App.ServiceApp.DroneSsnydManage.Export; +using OpenAuth.App.ServiceApp.DroneSsnydManage.Request; +using OpenAuth.Repository.Domain; namespace OpenAuth.WebApi.Controllers.ServiceControllers { @@ -40,6 +42,17 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers } return response; } + /// + /// 获取穿透案件信息 + /// + /// + /// + [HttpGet] + [AllowAnonymous] + public async Task>>> GetCaseInfo([FromQuery] QueryCaseOffencetReq req) + { + return await _app.GetCaseInfo(req); + } #endregion } } From a524b05d359ebafbbc2366c184dd3b2b513ccb27 Mon Sep 17 00:00:00 2001 From: zhangbin <460190368@qq.com> Date: Thu, 22 May 2025 17:26:18 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenAuth.WebApi/appsettings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAuth.WebApi/appsettings.json b/OpenAuth.WebApi/appsettings.json index 20334c6..3adbd1d 100644 --- a/OpenAuth.WebApi/appsettings.json +++ b/OpenAuth.WebApi/appsettings.json @@ -8,7 +8,7 @@ "DataProtection": "temp-keys/", "ConnectionStrings": { //"OpenAuthDBContext": "PORT=5432;Database=hopetrycore;HOST=192.168.10.124;PASSWORD=123456;USER ID=postgres;", - "OpenAuthDBContext": "PORT=5432;Database=drone_enforcement_lanling;HOST=192.168.10.163;PASSWORD=123456;USER ID=postgres;" + "OpenAuthDBContext": "PORT=5432;Database=drone_enforcement_lanling1;HOST=192.168.10.163;PASSWORD=123456;USER ID=postgres;" //"OpenAuthDBContext": "PORT=5432;Database=;HOST=192.168.10.131;PASSWORD=123456;USER ID=postgres;" }, "AppSetting": { From 22137c014ccbef72424c43a12f230f218e8d27d7 Mon Sep 17 00:00:00 2001 From: zhangbin <460190368@qq.com> Date: Thu, 22 May 2025 17:26:43 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OpenAuth.WebApi/appsettings.Production.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenAuth.WebApi/appsettings.Production.json b/OpenAuth.WebApi/appsettings.Production.json index 4b3db85..4f7c20a 100644 --- a/OpenAuth.WebApi/appsettings.Production.json +++ b/OpenAuth.WebApi/appsettings.Production.json @@ -7,7 +7,7 @@ "AllowedHosts": "*", "DataProtection": "temp-keys/", "ConnectionStrings": { - "OpenAuthDBContext": "PORT=5432;Database=drone_enforcement_lanling;HOST=192.168.10.163;PASSWORD=123456;USER ID=postgres;" + "OpenAuthDBContext": "PORT=5432;Database=drone_enforcement_lanling1;HOST=192.168.10.163;PASSWORD=123456;USER ID=postgres;" //"OpenAuthDBContext": "PORT=5432;Database=unattended1;HOST=192.168.10.115;PASSWORD=123456;USER ID=postgres;Pooling=False" //PostgreSQL }, "AppSetting": {