人员类型修改

OpenAuth.App/ServiceApp/FireManagement/FireManagementApp.cs

@@ -1,11 +1,11 @@
-using System.Net.WebSockets;
-using System.Text;
-using DocumentFormat.OpenXml.EMMA;
+using DocumentFormat.OpenXml.EMMA;
 using DocumentFormat.OpenXml.Spreadsheet;
 using Hopetry.App.SugarModel.CommonModel;
 using Infrastructure;
+using Infrastructure.Extensions;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.Extensions.Configuration;
 using Newtonsoft.Json;
 using NPOI.HSSF.UserModel;
@@ -14,12 +14,16 @@ using NPOI.XSSF.UserModel;
 using OpenAuth.App.BaseApp.Base;
 using OpenAuth.App.Const;
 using OpenAuth.App.Interface;
+using OpenAuth.App.Response;
 using OpenAuth.App.ServiceApp.FireManagement.Request;
 using OpenAuth.App.ServiceApp.FireManagement.Response;
 using OpenAuth.Repository;
 using OpenAuth.Repository.Domain;
 using OpenAuth.Repository.Domain.FireManagement;
+using Org.BouncyCastle.Ocsp;
 using SqlSugar;
+using System.Net.WebSockets;
+using System.Text;
 using Yitter.IdGenerator;
 
 namespace OpenAuth.App.ServiceApp.FireManagement
@@ -804,6 +808,45 @@ namespace OpenAuth.App.ServiceApp.FireManagement
                 }
             };
         }
+        /// <summary>
+        /// 查询人员上报的线索
+        /// </summary>
+        /// <param name="userid"></param>
+        /// <returns></returns>
+        public async Task<Response<PageInfo<List<FireClueInfoResp>>>> LoadFireClueInfoByUserId(int pageIndex, int state, int pageSize, string userid)
+        {
+            using (var db = base.UnitWork.CreateContext())
+            {
+                RefAsync<int> total = 0;
+                var list = await db.FmFireclueInfo.AsQueryable().Where(a => a.CreateId.ToString() == userid).Select(a => new FireClueInfoResp
+                {
+                    Id = a.Id,
+                    CreateId = a.CreateId.ToString(),
+                    ReportPerson = a.ReportPerson,
+                    Lat = a.Lat,
+                    Lng = a.Lng,
+                    Address = a.Address,
+                    ReportTime = a.ReportTime,
+                    Describe = a.Describe,
+                    SourceType = a.SourceType,
+                    State = a.State,
+                    AreaName = a.AreaName,
+                    ClueNo = a.ClueNo,
+                }).Mapper(a => a.SourceTypeName = ((SourceType)a.SourceType).GetDescription())
+                     .Mapper(a => a.StateName = ((State)a.State).GetDescription())
+                     .OrderBy(a => a.ReportTime, SqlSugar.OrderByType.Desc).ToPageListAsync(pageIndex, pageSize, total);
+                return new Response<PageInfo<List<FireClueInfoResp>>>
+                {
+                    Code = 200,
+                    Message = "查询成功",
+                    Result = new PageInfo<List<FireClueInfoResp>>
+                    {
+                        Items = list,
+                        Total = total
+                    }
+                };
+            }
+        }
 
         #region  人员类型统计
         /// <summary>

OpenAuth.App/ServiceApp/FireManagement/FireResourcesApp.cs

@@ -29,19 +29,20 @@ namespace OpenAuth.App.ServiceApp.FireManagement
         /// </summary>
         /// <param name="sql"></param>
         /// <returns></returns>
-        public async Task<Response<DataTable>> GetDataBySql(SqlReq sql)
+        public async Task<Response<DataTable>> GetDataBySql1(SqlReq sql)
         {
             // 检查 SQL 是否为查询操作
             if (string.IsNullOrWhiteSpace(sql.sql) || !sql.sql.Trim().StartsWith("SELECT", StringComparison.OrdinalIgnoreCase))
             {
                 throw new Exception("只允许查询操作");
-            } 
+            }
             try
             {
                 using (SugarDbContext db = base.UnitWork.CreateContext())
                 {
                     // 执行查询操作，返回 DataTable
                     DataTable dt = await db.Db.SqlQueryable<object>(sql.sql).ToDataTableAsync();
+                    DataTable dt1 = await db.Db.Ado.GetDataTableAsync(sql.sql).ConfigureAwait(false);
                     return new Response<DataTable>
                     {
                         Result = dt
@@ -53,5 +54,20 @@ namespace OpenAuth.App.ServiceApp.FireManagement
                 throw new Exception("sql格式不正确");
             }
         }
+        public async Task<Response<DataTable>> GetDataBySql(SqlReq sql)
+        {
+            if (string.IsNullOrWhiteSpace(sql.sql) ||
+                !sql.sql.Trim().StartsWith("SELECT", StringComparison.OrdinalIgnoreCase))
+            {
+                throw new Exception("只允许查询操作");
+            }
+            using (var db = base.UnitWork.CreateContext())
+            {
+                db.Db.Ado.CommandTimeOut = 60;
+                var dt = await db.Db.Ado.GetDataTableAsync(sql.sql).ConfigureAwait(false);
+                return new Response<DataTable> { Result = dt };
+            }
+
+        }
     }
 }

OpenAuth.App/ServiceApp/FireManagement/Response/FireClueInfoResp.cs

@@ -0,0 +1,48 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OpenAuth.App.ServiceApp.FireManagement.Response
+{
+    public class FireClueInfoResp
+    {
+        [SugarColumn(IsPrimaryKey = true)]
+        public long Id { get; set; }
+        public string ReportPerson { get; set; }
+        public DateTime? ReportTime { get; set; }
+        public string Describe { get; set; }
+        public string Lng { get; set; }
+        public string Lat { get; set; }
+        public string Address { get; set; }
+        public int SourceType { get; set; }
+        public int State { get; set; }
+        public string CreateId { get; set; }
+        public string AreaName { get; set; }
+        public string SourceTypeName { get; set; }
+        public string StateName { get; set; }
+        /// <summary>
+        /// 摄像机上报事件id
+        /// </summary>
+        public string EventId { get; set; }
+        /// <summary>
+        /// 线索编号
+        /// </summary>
+        public string ClueNo { get; set; }
+        /// <summary>
+        /// 合并后的火情主键
+        /// </summary>
+        public long FireId { get; set; }
+        /// <summary>
+        /// 图片地址
+        /// </summary>
+        public string Image { get; set; }
+        /// <summary>
+        /// 视频地址
+        /// </summary>
+        public string Audio { get; set; }
+        public int FireType { get; set; }
+    }
+}

OpenAuth.WebApi/Controllers/ServiceControllers/FireManagement/FireManagementController.cs

@@ -478,6 +478,20 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement
         {
             return await _app.GetMapPlotting(req);
         }
+        /// <summary>
+        /// 查询人员上报的线索
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="state"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="userid"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [AllowAnonymous]
+        public async Task<Response<PageInfo<List<FireClueInfoResp>>>> LoadFireClueInfoByUserId(int pageIndex, int state, int pageSize, string userid)
+        {
+            return await _app.LoadFireClueInfoByUserId(pageIndex, state, pageSize, userid);
+        }
 
         #region 人员类型统计查询
         [HttpGet]

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=DataMaintenance;HOST=192.168.10.163;PASSWORD=123456;USER ID=postgres;"
+    "OpenAuthDBContext": "PORT=5432;Database=DataMaintenance;HOST=192.168.10.163;PASSWORD=123456;USER ID=postgres;Max Pool Size=200"
     //"OpenAuthDBContext": "PORT=5432;Database=;HOST=192.168.10.131;PASSWORD=123456;USER ID=postgres;"
   },
   "AppSetting": {