From e9373b057c1a7d9a60f8fa7412ba007cb3956314 Mon Sep 17 00:00:00 2001 From: zhangbin <460190368@qq.com> Date: Sat, 29 Mar 2025 09:25:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ServiceApp/FireManagement/FireGridApp.cs | 5 +++-- .../ServiceApp/FireManagement/FirePatrolApp.cs | 4 ++-- .../Domain/FireManagement/FmUserPointHistory.cs | 2 +- .../FireManagement/FireGridController.cs | 14 ++------------ .../FireManagement/FireManagementController.cs | 5 +---- .../FireManagement/FirePatrolController.cs | 8 ++------ 6 files changed, 11 insertions(+), 27 deletions(-) diff --git a/OpenAuth.App/ServiceApp/FireManagement/FireGridApp.cs b/OpenAuth.App/ServiceApp/FireManagement/FireGridApp.cs index 1daadf1..2eba628 100644 --- a/OpenAuth.App/ServiceApp/FireManagement/FireGridApp.cs +++ b/OpenAuth.App/ServiceApp/FireManagement/FireGridApp.cs @@ -204,8 +204,9 @@ namespace OpenAuth.App.ServiceApp.FireManagement a.Lat, b.PointName, c.Name, - UserId = SqlFunc.Subqueryable().Where(a => a.PointId == id).ToList(a => a.UserId), - AreaId = SqlFunc.Subqueryable().Where(a => a.PointId == id).ToList(a => a.AreaId), + a.UserId + //UserId = SqlFunc.Subqueryable().Where(a => a.PointId == id).ToList(a => a.UserId), + //AreaId = SqlFunc.Subqueryable().Where(a => a.PointId == id).ToList(a => a.AreaId), }).ToPageListAsync(pageIndex, pageSize, totalNumber); return new Response>> { diff --git a/OpenAuth.App/ServiceApp/FireManagement/FirePatrolApp.cs b/OpenAuth.App/ServiceApp/FireManagement/FirePatrolApp.cs index 49b5068..8084673 100644 --- a/OpenAuth.App/ServiceApp/FireManagement/FirePatrolApp.cs +++ b/OpenAuth.App/ServiceApp/FireManagement/FirePatrolApp.cs @@ -91,7 +91,7 @@ namespace OpenAuth.App.ServiceApp.FireManagement } } /// - /// 巡查坐标 + /// 巡查坐标 /// /// /// @@ -115,7 +115,7 @@ namespace OpenAuth.App.ServiceApp.FireManagement { using (SugarDbContext db = base.UnitWork.CreateContext()) { - string sql = "select Id,Hulinyuan,Lianxifang,st_astext(ST_Boundary(geom)) as geom FROM fm_hulinyuanguanhufanwei WHERE Lianxifang like '%" + phone + "%'"; + string sql = "select \"Id\",\"Hulinyuan\",\"Lianxifang\",st_astext(ST_Boundary(geom)) as geom FROM fm_hulinyuanguanhufanwei WHERE \"Lianxifang\" like '%" + phone + "%'"; var dt = await db.Db.Ado.GetDataTableAsync(sql); if (dt.Rows.Count > 0) return new Response { Result = dt, Message = "操作成功" }; diff --git a/OpenAuth.Repository/Domain/FireManagement/FmUserPointHistory.cs b/OpenAuth.Repository/Domain/FireManagement/FmUserPointHistory.cs index 23a75cd..7284343 100644 --- a/OpenAuth.Repository/Domain/FireManagement/FmUserPointHistory.cs +++ b/OpenAuth.Repository/Domain/FireManagement/FmUserPointHistory.cs @@ -8,7 +8,7 @@ using System.Threading.Tasks; namespace OpenAuth.Repository.Domain.FireManagement { [SplitTable(SplitType.Month)] - [SugarTable("userpointhistory_{year}{month}{day}")] + [SugarTable("fm_userpointhistory_{year}{month}{day}")] public class FmUserPointHistory { /// diff --git a/OpenAuth.WebApi/Controllers/ServiceControllers/FireManagement/FireGridController.cs b/OpenAuth.WebApi/Controllers/ServiceControllers/FireManagement/FireGridController.cs index 761da5d..1fa2202 100644 --- a/OpenAuth.WebApi/Controllers/ServiceControllers/FireManagement/FireGridController.cs +++ b/OpenAuth.WebApi/Controllers/ServiceControllers/FireManagement/FireGridController.cs @@ -28,7 +28,6 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement /// /// [HttpPost] - [AllowAnonymous] public async Task> AddCheckPoint(CheckPointReq info) { Response response = new Response(); @@ -51,7 +50,6 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement /// /// [HttpGet] - [AllowAnonymous] public async Task>>> GetCheckPointList(string pointName, int pageIndex, int pageSize) { Response>> response = new Response>>(); @@ -72,7 +70,6 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement /// /// [HttpPost] - [AllowAnonymous] public async Task> DeleteCheckPoint(long id) { Response response = new Response(); @@ -93,7 +90,6 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement /// /// [HttpPost] - [AllowAnonymous] public async Task> EditCheckPoint(CheckPointReq info) { Response response = new Response(); @@ -114,7 +110,6 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement /// /// [HttpGet] - [AllowAnonymous] public async Task> GetSingleCheckPoint(long id) { Response response = new Response(); @@ -137,8 +132,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement /// /// [HttpGet] - [AllowAnonymous] - public async Task>>> GetCheckPointById(long id, int pageIndex = 1, int pageSize = 10) + public async Task>>> GetCheckInfoByPointId(long id, int pageIndex = 1, int pageSize = 10) { Response>> response = new Response>>(); try @@ -160,7 +154,6 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement /// /// [HttpGet] - [AllowAnonymous] public async Task>>> GetCheckInfoByUserId(long id, int pageIndex = 1, int pageSize = 10) { Response>> response = new Response>>(); @@ -185,7 +178,6 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement /// /// [HttpGet] - [AllowAnonymous] public async Task>>> GetClockOnList(long userId, DateTime beginTime, DateTime endTime, int pageIndex, int pageSize) { Response>> response = new Response>>(); @@ -208,7 +200,6 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement /// /// [HttpGet] - [AllowAnonymous] public async Task> GetStatisticsCount(long areaid, DateTime begintime, DateTime endtime) { Response response = new Response(); @@ -233,8 +224,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement /// /// [HttpGet] - [AllowAnonymous] - public async Task>>> Getstatistics(long areaid, DateTime begintime, DateTime endtime, int pageIndex, int pageSize) + public async Task>>> GetStatistics(long areaid, DateTime begintime, DateTime endtime, int pageIndex, int pageSize) { Response>> response = new Response>>(); try diff --git a/OpenAuth.WebApi/Controllers/ServiceControllers/FireManagement/FireManagementController.cs b/OpenAuth.WebApi/Controllers/ServiceControllers/FireManagement/FireManagementController.cs index a855571..e7dd5e3 100644 --- a/OpenAuth.WebApi/Controllers/ServiceControllers/FireManagement/FireManagementController.cs +++ b/OpenAuth.WebApi/Controllers/ServiceControllers/FireManagement/FireManagementController.cs @@ -270,7 +270,6 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement /// 1-日，2-月，3-年 /// [HttpGet] - [AllowAnonymous] public async Task>> GetFireClueStatisticsByState(int type) { Response> response = new Response>(); @@ -291,7 +290,6 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement /// 1-日，2-月，3-年 /// [HttpGet] - [AllowAnonymous] public async Task>> GetFireClueStatisticsByDegreeType(int type) { Response> response = new Response>(); @@ -312,8 +310,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement /// /// /// - [HttpGet] - [AllowAnonymous] + [HttpPost] public async Task>> GetPointUserOnLine(UserOnLineReq pageReq) { Response> response = new Response>(); diff --git a/OpenAuth.WebApi/Controllers/ServiceControllers/FireManagement/FirePatrolController.cs b/OpenAuth.WebApi/Controllers/ServiceControllers/FireManagement/FirePatrolController.cs index 2924134..3e5f442 100644 --- a/OpenAuth.WebApi/Controllers/ServiceControllers/FireManagement/FirePatrolController.cs +++ b/OpenAuth.WebApi/Controllers/ServiceControllers/FireManagement/FirePatrolController.cs @@ -27,7 +27,6 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement /// /// [HttpGet] - [AllowAnonymous] public async Task>> GetPatrolInfoByUserId(long id, DateTime beginTime, DateTime endTime) { Response> response = new Response>(); @@ -43,15 +42,14 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement return response; } /// - /// 巡查坐标 + /// 根据人员id获取巡查坐标 /// /// /// /// /// [HttpGet] - [AllowAnonymous] - public async Task>> LoadPatrolPointByTime(long id, DateTime beginTime, DateTime endTime) + public async Task>> GetPatrolPointByTime(long id, DateTime beginTime, DateTime endTime) { Response> response = new Response>(); try @@ -71,7 +69,6 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement /// /// [HttpGet] - [AllowAnonymous] public async Task> GetUserRange(string phone) { Response response = new Response(); @@ -94,7 +91,6 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement /// /// [HttpGet] - [AllowAnonymous] public async Task>> LoadPatrolPointByTimeSubsection(long id, DateTime beginTime, DateTime endTime) { Response> response = new Response>();