数据验证
parent
f09b837af8
commit
e9373b057c
|
|
@ -204,8 +204,9 @@ namespace OpenAuth.App.ServiceApp.FireManagement
|
|||
a.Lat,
|
||||
b.PointName,
|
||||
c.Name,
|
||||
UserId = SqlFunc.Subqueryable<FmCheckPointUser>().Where(a => a.PointId == id).ToList(a => a.UserId),
|
||||
AreaId = SqlFunc.Subqueryable<FmCheckArea>().Where(a => a.PointId == id).ToList(a => a.AreaId),
|
||||
a.UserId
|
||||
//UserId = SqlFunc.Subqueryable<FmCheckPointUser>().Where(a => a.PointId == id).ToList(a => a.UserId),
|
||||
//AreaId = SqlFunc.Subqueryable<FmCheckArea>().Where(a => a.PointId == id).ToList(a => a.AreaId),
|
||||
}).ToPageListAsync(pageIndex, pageSize, totalNumber);
|
||||
return new Response<PageInfo<List<dynamic>>>
|
||||
{
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ namespace OpenAuth.App.ServiceApp.FireManagement
|
|||
}
|
||||
}
|
||||
/// <summary>
|
||||
/// 巡查坐标
|
||||
/// 巡查坐标
|
||||
/// </summary>
|
||||
/// <param name="userId"></param>
|
||||
/// <param name="beginTime"></param>
|
||||
|
|
@ -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<DataTable> { Result = dt, Message = "操作成功" };
|
||||
|
|
|
|||
|
|
@ -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
|
||||
{
|
||||
/// <summary>
|
||||
|
|
|
|||
|
|
@ -28,7 +28,6 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement
|
|||
/// <param name="info"></param>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
[AllowAnonymous]
|
||||
public async Task<Response<bool>> AddCheckPoint(CheckPointReq info)
|
||||
{
|
||||
Response<bool> response = new Response<bool>();
|
||||
|
|
@ -51,7 +50,6 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement
|
|||
/// <param name="pageSize"></param>
|
||||
/// <returns></returns>
|
||||
[HttpGet]
|
||||
[AllowAnonymous]
|
||||
public async Task<Response<PageInfo<List<dynamic>>>> GetCheckPointList(string pointName, int pageIndex, int pageSize)
|
||||
{
|
||||
Response<PageInfo<List<dynamic>>> response = new Response<PageInfo<List<dynamic>>>();
|
||||
|
|
@ -72,7 +70,6 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement
|
|||
/// <param name="id"></param>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
[AllowAnonymous]
|
||||
public async Task<Response<bool>> DeleteCheckPoint(long id)
|
||||
{
|
||||
Response<bool> response = new Response<bool>();
|
||||
|
|
@ -93,7 +90,6 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement
|
|||
/// <param name="info"></param>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
[AllowAnonymous]
|
||||
public async Task<Response<bool>> EditCheckPoint(CheckPointReq info)
|
||||
{
|
||||
Response<bool> response = new Response<bool>();
|
||||
|
|
@ -114,7 +110,6 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement
|
|||
/// <param name="id"></param>
|
||||
/// <returns></returns>
|
||||
[HttpGet]
|
||||
[AllowAnonymous]
|
||||
public async Task<Response<CheckPointReq>> GetSingleCheckPoint(long id)
|
||||
{
|
||||
Response<CheckPointReq> response = new Response<CheckPointReq>();
|
||||
|
|
@ -137,8 +132,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement
|
|||
/// <param name="pageSize"></param>
|
||||
/// <returns></returns>
|
||||
[HttpGet]
|
||||
[AllowAnonymous]
|
||||
public async Task<Response<PageInfo<List<dynamic>>>> GetCheckPointById(long id, int pageIndex = 1, int pageSize = 10)
|
||||
public async Task<Response<PageInfo<List<dynamic>>>> GetCheckInfoByPointId(long id, int pageIndex = 1, int pageSize = 10)
|
||||
{
|
||||
Response<PageInfo<List<dynamic>>> response = new Response<PageInfo<List<dynamic>>>();
|
||||
try
|
||||
|
|
@ -160,7 +154,6 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement
|
|||
/// <param name="pageSize"></param>
|
||||
/// <returns></returns>
|
||||
[HttpGet]
|
||||
[AllowAnonymous]
|
||||
public async Task<Response<PageInfo<List<dynamic>>>> GetCheckInfoByUserId(long id, int pageIndex = 1, int pageSize = 10)
|
||||
{
|
||||
Response<PageInfo<List<dynamic>>> response = new Response<PageInfo<List<dynamic>>>();
|
||||
|
|
@ -185,7 +178,6 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement
|
|||
/// <param name="pageSize"></param>
|
||||
/// <returns></returns>
|
||||
[HttpGet]
|
||||
[AllowAnonymous]
|
||||
public async Task<Response<PageInfo<List<dynamic>>>> GetClockOnList(long userId, DateTime beginTime, DateTime endTime, int pageIndex, int pageSize)
|
||||
{
|
||||
Response<PageInfo<List<dynamic>>> response = new Response<PageInfo<List<dynamic>>>();
|
||||
|
|
@ -208,7 +200,6 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement
|
|||
/// <param name="endtime"></param>
|
||||
/// <returns></returns>
|
||||
[HttpGet]
|
||||
[AllowAnonymous]
|
||||
public async Task<Response<JObject>> GetStatisticsCount(long areaid, DateTime begintime, DateTime endtime)
|
||||
{
|
||||
Response<JObject> response = new Response<JObject>();
|
||||
|
|
@ -233,8 +224,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement
|
|||
/// <param name="pageSize"></param>
|
||||
/// <returns></returns>
|
||||
[HttpGet]
|
||||
[AllowAnonymous]
|
||||
public async Task<Response<PageInfo<List<PointstatisticsResp>>>> Getstatistics(long areaid, DateTime begintime, DateTime endtime, int pageIndex, int pageSize)
|
||||
public async Task<Response<PageInfo<List<PointstatisticsResp>>>> GetStatistics(long areaid, DateTime begintime, DateTime endtime, int pageIndex, int pageSize)
|
||||
{
|
||||
Response<PageInfo<List<PointstatisticsResp>>> response = new Response<PageInfo<List<PointstatisticsResp>>>();
|
||||
try
|
||||
|
|
|
|||
|
|
@ -270,7 +270,6 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement
|
|||
/// <param name="type">1-日,2-月,3-年</param>
|
||||
/// <returns></returns>
|
||||
[HttpGet]
|
||||
[AllowAnonymous]
|
||||
public async Task<Response<List<FireInfoStateForChart>>> GetFireClueStatisticsByState(int type)
|
||||
{
|
||||
Response<List<FireInfoStateForChart>> response = new Response<List<FireInfoStateForChart>>();
|
||||
|
|
@ -291,7 +290,6 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement
|
|||
/// <param name="type">1-日,2-月,3-年</param>
|
||||
/// <returns></returns>
|
||||
[HttpGet]
|
||||
[AllowAnonymous]
|
||||
public async Task<Response<List<FireInfoDegreeForChart>>> GetFireClueStatisticsByDegreeType(int type)
|
||||
{
|
||||
Response<List<FireInfoDegreeForChart>> response = new Response<List<FireInfoDegreeForChart>>();
|
||||
|
|
@ -312,8 +310,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement
|
|||
/// </summary>
|
||||
/// <param name="pageReq"></param>
|
||||
/// <returns></returns>
|
||||
[HttpGet]
|
||||
[AllowAnonymous]
|
||||
[HttpPost]
|
||||
public async Task<Response<PageInfo<dynamic>>> GetPointUserOnLine(UserOnLineReq pageReq)
|
||||
{
|
||||
Response<PageInfo<dynamic>> response = new Response<PageInfo<dynamic>>();
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement
|
|||
/// <param name="endTime"></param>
|
||||
/// <returns></returns>
|
||||
[HttpGet]
|
||||
[AllowAnonymous]
|
||||
public async Task<Response<List<UserPatrolInfoResp>>> GetPatrolInfoByUserId(long id, DateTime beginTime, DateTime endTime)
|
||||
{
|
||||
Response<List<UserPatrolInfoResp>> response = new Response<List<UserPatrolInfoResp>>();
|
||||
|
|
@ -43,15 +42,14 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement
|
|||
return response;
|
||||
}
|
||||
/// <summary>
|
||||
/// 巡查坐标
|
||||
/// 根据人员id获取巡查坐标
|
||||
/// </summary>
|
||||
/// <param name="id"></param>
|
||||
/// <param name="beginTime"></param>
|
||||
/// <param name="endTime"></param>
|
||||
/// <returns></returns>
|
||||
[HttpGet]
|
||||
[AllowAnonymous]
|
||||
public async Task<Response<List<FmUserPointHistory>>> LoadPatrolPointByTime(long id, DateTime beginTime, DateTime endTime)
|
||||
public async Task<Response<List<FmUserPointHistory>>> GetPatrolPointByTime(long id, DateTime beginTime, DateTime endTime)
|
||||
{
|
||||
Response<List<FmUserPointHistory>> response = new Response<List<FmUserPointHistory>>();
|
||||
try
|
||||
|
|
@ -71,7 +69,6 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement
|
|||
/// <param name="phone"></param>
|
||||
/// <returns></returns>
|
||||
[HttpGet]
|
||||
[AllowAnonymous]
|
||||
public async Task<Response<DataTable>> GetUserRange(string phone)
|
||||
{
|
||||
Response<DataTable> response = new Response<DataTable>();
|
||||
|
|
@ -94,7 +91,6 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement
|
|||
/// <param name="endTime"></param>
|
||||
/// <returns></returns>
|
||||
[HttpGet]
|
||||
[AllowAnonymous]
|
||||
public async Task<Response<List<FmUserPointHistory>>> LoadPatrolPointByTimeSubsection(long id, DateTime beginTime, DateTime endTime)
|
||||
{
|
||||
Response<List<FmUserPointHistory>> response = new Response<List<FmUserPointHistory>>();
|
||||
|
|
|
|||
Loading…
Reference in New Issue