合并

OpenAuth.App/BaseApp/UserManager/UserManagerApp.cs

@@ -616,17 +616,17 @@ namespace OpenAuth.App
         {
             using (var uow = base.UnitWork.CreateContext())
             {
-                foreach (var item in uow.Db.DbMaintenance.GetTableInfoList().Where(r => r.Name.ToLower().StartsWith("drone_caseinfo_sthx")))
+                foreach (var item in uow.Db.DbMaintenance.GetTableInfoList().Where(r => r.Name.ToLower().StartsWith("fm_fanghuoyizhan")|| r.Name.ToLower().StartsWith("fm_firefighterinfo") || r.Name.ToLower().StartsWith("fm_linquzhuhu")|| r.Name.ToLower().StartsWith("fm_xiangdaouser") || r.Name.ToLower().StartsWith("fm_zhufangbudui")))
                 {
-                    //string entityName = item.Name.Substring(0, 1).ToUpper() + item.Name.Substring(1, 7).ToLower() + item.Name.Substring(9, 1).ToUpper() + item.Name.Substring(10).ToLower();/*实体名大写*/
-                    string entityName = "DroneCaseInfoSTHX";
+                    string entityName = item.Name.Substring(0, 1).ToUpper() + item.Name.Substring(1, 1).ToLower() + item.Name.Substring(3, 1).ToUpper() + item.Name.Substring(4).ToLower();/*实体名大写*/
+                   // string entityName = "DroneCaseInfoSTHX";
                     uow.Db.MappingTables.Add(entityName, item.Name);
                     //foreach (var col in db.DbMaintenance.GetColumnInfosByTableName(item.Name))
                     //{
                     //    db.MappingColumns.Add(col.DbColumnName.ToUpper() /*类的属性大写*/, col.DbColumnName, entityName);
                     //}
                 }
-                uow.Db.DbFirst.Where(r => r.ToLower().StartsWith("drone_caseinfo_sthx")).IsCreateAttribute().CreateClassFile("E:\\天空地\\codeLinyi\\Project1\\OpenAuth.Repository\\Domain", "OpenAuth.Repository.Domain");
+                uow.Db.DbFirst.Where(r => r.ToLower().StartsWith("fm_fanghuoyizhan") || r.ToLower().StartsWith("fm_firefighterinfo") || r.ToLower().StartsWith("fm_linquzhuhu") || r.ToLower().StartsWith("fm_xiangdaouser") || r.ToLower().StartsWith("fm_zhufangbudui")).IsCreateAttribute().CreateClassFile("E:\\森林防火数据维护\\code\\OpenAuth.Repository\\Domain", "OpenAuth.Repository.Domain");
                 uow.Commit();
             }
             return "更新实体成功";

OpenAuth.App/ServiceApp/FireManagement/FireManagementApp.cs

@@ -966,5 +966,46 @@ namespace OpenAuth.App.ServiceApp.FireManagement
             return "fail";
         }
         #endregion
+
+        #region  人员类型统计
+        /// <summary>
+        /// 人员类型统计
+        /// </summary>
+        /// <returns></returns>
+        public async Task<Response<UserTypeStatisticsRes>> GetUserTypeStatistics()
+        {
+            using var db = Repository.AsSugarClient();
+            //护林员
+            var hulin = await db.Queryable<SysUserRole>().LeftJoin<SysRole>((s, r) => s.RoleId == r.Id)
+                .LeftJoin<SysUser>((s, r, u) => s.UserId == u.Id)
+                .Where((s, r, u) => r.Name == "护林员" && u.Id > 0)
+                .CountAsync();
+            //消防员
+            var xiaofang = await db.Queryable<FmFirefighterinfo>().CountAsync();
+            //驻防部队
+            var zhufang = await db.Queryable<FmZhufangbudui>().CountAsync();
+            //林区住户
+            var linqu=await db.Queryable<FmLinquzhuhu>().CountAsync();  
+            //向导
+            var xiangdao=await db.Queryable<FmXiangdaouser>().CountAsync();
+            //防火驿站
+            var yizhan=await db.Queryable<FmFanghuoyizhan>().CountAsync();
+
+            UserTypeStatisticsRes res=new UserTypeStatisticsRes();
+            res.hulinyuan = hulin;
+            res.xiaofangyuan=xiaofang;
+            res.zhufangduiwu=zhufang;
+            res.linquzhuhu=linqu;
+            res.xiangdao=xiangdao;
+            res.fanghuoyizhan=yizhan;
+
+            return new Response<UserTypeStatisticsRes>
+            {
+                Code = 200,
+                Message = "查询成功",
+                Result = res
+            };
+        }
+        #endregion
     }
 }

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

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OpenAuth.App.ServiceApp.FireManagement.Response
+{
+    /// <summary>
+    /// 人员类型统计
+    /// </summary>
+    public class UserTypeStatisticsRes
+    {
+        public int hulinyuan {  get; set; }
+        public int xiaofangyuan {  get; set; }
+        public int zhufangduiwu {  get; set; }
+        public int linquzhuhu {  get; set; }
+        public int xiangdao {  get; set; }
+        public int fanghuoyizhan {  get; set; }
+    }
+}

OpenAuth.Repository/Domain/FmFanghuoyizhan.cs

@@ -0,0 +1,54 @@
+using System;
+using System.Linq;
+using System.Text;
+using SqlSugar;
+
+namespace OpenAuth.Repository.Domain
+{
+    ///<summary>
+    ///防火驿站
+    ///</summary>
+    [SugarTable("fm_fanghuoyizhan")]
+    public partial class FmFanghuoyizhan
+    {
+           public FmFanghuoyizhan(){
+
+
+           }
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:False
+           /// </summary>           
+           public int gid {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public decimal? lng {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public decimal? lat {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string mask {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string street {get;set;}
+
+    }
+}

OpenAuth.Repository/Domain/FmFirefighterinfo.cs

@@ -0,0 +1,48 @@
+using System;
+using System.Linq;
+using System.Text;
+using SqlSugar;
+
+namespace OpenAuth.Repository.Domain
+{
+    ///<summary>
+    ///消防员信息表
+    ///</summary>
+    [SugarTable("fm_firefighterinfo")]
+    public partial class FmFirefighterinfo
+    {
+           public FmFirefighterinfo(){
+
+
+           }
+           /// <summary>
+           /// Desc:主键
+           /// Default:
+           /// Nullable:False
+           /// </summary>           
+           [SugarColumn(IsPrimaryKey=true)]
+           public long id {get;set;}
+
+           /// <summary>
+           /// Desc:姓名
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string name {get;set;}
+
+           /// <summary>
+           /// Desc:性别
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string gender {get;set;}
+
+           /// <summary>
+           /// Desc:联系电话
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string phone {get;set;}
+
+    }
+}

OpenAuth.Repository/Domain/FmLinquzhuhu.cs

@@ -0,0 +1,167 @@
+using System;
+using System.Linq;
+using System.Text;
+using SqlSugar;
+
+namespace OpenAuth.Repository.Domain
+{
+    ///<summary>
+    ///林区住户信息表
+    ///</summary>
+    [SugarTable("fm_linquzhuhu")]
+    public partial class FmLinquzhuhu
+    {
+           public FmLinquzhuhu(){
+
+
+           }
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:False
+           /// </summary>           
+           [SugarColumn(IsPrimaryKey=true)]
+           public decimal id {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string geom {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string xuhao {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string shantou {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string weizhi {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string huzhu {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string dianhua {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string fangwushuliang {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string renkoushuliang {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string yongdianqingkuang {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string yonghuoqingkuang {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string fengxianfenlei {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string jiejuefangan {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string beizhu {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string leixing {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string xiyanqingkuang {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string xiangzhen {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string lng {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string lat {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public decimal? creater_id {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:0
+           /// Nullable:True
+           /// </summary>           
+           public decimal? is_del {get;set;}
+
+    }
+}

OpenAuth.Repository/Domain/FmXiangdaouser.cs

@@ -0,0 +1,131 @@
+using System;
+using System.Linq;
+using System.Text;
+using SqlSugar;
+
+namespace OpenAuth.Repository.Domain
+{
+    ///<summary>
+    ///向导人员信息表
+    ///</summary>
+    [SugarTable("fm_xiangdaouser")]
+    public partial class FmXiangdaouser
+    {
+           public FmXiangdaouser(){
+
+
+           }
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:False
+           /// </summary>           
+           public int gid {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public int? id {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string username {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string sex {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string card {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string phone {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string area {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public decimal? lng {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public decimal? lat {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string protectarea {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string east {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string west {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string south {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string north {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string mask {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string street {get;set;}
+
+    }
+}

OpenAuth.Repository/Domain/FmZhufangbudui.cs

@@ -0,0 +1,62 @@
+using System;
+using System.Linq;
+using System.Text;
+using SqlSugar;
+
+namespace OpenAuth.Repository.Domain
+{
+    ///<summary>
+    ///驻防部队信息表
+    ///</summary>
+    [SugarTable("fm_zhufangbudui")]
+    public partial class FmZhufangbudui
+    {
+           public FmZhufangbudui(){
+
+
+           }
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:False
+           /// </summary>           
+           [SugarColumn(IsPrimaryKey=true)]
+           public int gid {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string zftype {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string zfname {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string zfinfo {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public decimal? lng {get;set;}
+
+           /// <summary>
+           /// Desc:
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public decimal? lat {get;set;}
+
+    }
+}

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

@@ -511,5 +511,25 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement
             }
 
         }
+
+        #region 人员类型统计查询
+        [HttpGet]
+        [AllowAnonymous]
+        public async Task<Response<UserTypeStatisticsRes>> GetUserTypeStatistics()
+        {
+            Response<UserTypeStatisticsRes> response = new Response<UserTypeStatisticsRes>();
+            try
+            {
+                return await _app.GetUserTypeStatistics();
+            }
+            catch (Exception ex)
+            {
+                response.Code = 500;
+                response.Message = ex.InnerException?.Message ?? ex.Message;
+            }
+            return response;
+        }
+
+        #endregion
     }
 }

OpenAuth.WebApi/appsettings.json

@@ -22,8 +22,8 @@
     "UploadPath": "",
     //附件上传的路径，如果为空则保存在站点根目录
     "RedisConf": {
-      //"Conn": "192.168.10.163:6379,password=123456",
-      "Conn": "127.0.0.1:9205",
+      "Conn": "192.168.10.163:6379,password=123456",
+      //"Conn": "127.0.0.1:9205",
       "Database": 7
     },
     //redis配置