Merge branch 'main' of http://123.132.248.154:10000/HC_YFZX/LASAPlatform

OpenAuth.App/BaseApp/UserManager/UserManagerApp.cs

@@ -512,17 +512,17 @@ namespace OpenAuth.App
         {
             using (var uow = base.UnitWork.CreateContext())
             {
-                foreach (var item in uow.Db.DbMaintenance.GetTableInfoList().Where(r => r.Name.ToLower().StartsWith("lasa_spacelockfly")))
+                foreach (var item in uow.Db.DbMaintenance.GetTableInfoList().Where(r => r.Name.ToLower().StartsWith("lasa_shpdata")))
                 {
                     //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 = "LasaSpaceLockFly";
+                    string entityName = "LasaShpData";
                     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("lasa_spacelockfly")).IsCreateAttribute().CreateClassFile("E:\\低空态势感知\\code\\OpenAuth.Repository\\Domain", "OpenAuth.Repository.Domain");
+                uow.Db.DbFirst.Where(r => r.ToLower().StartsWith("lasa_shpdata")).IsCreateAttribute().CreateClassFile("E:\\低空态势感知\\code\\OpenAuth.Repository\\Domain", "OpenAuth.Repository.Domain");
                 uow.Commit();
             }
             return "更新实体成功";

OpenAuth.App/ServiceApp/ManageApp.cs

@@ -1,4 +1,5 @@
-using DocumentFormat.OpenXml.Wordprocessing;
+using DocumentFormat.OpenXml.Office2010.Excel;
+using DocumentFormat.OpenXml.Wordprocessing;
 using Infrastructure;
 using Infrastructure.CloudSdk.minio;
 using Infrastructure.CloudSdk.wayline;
@@ -6,6 +7,7 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Configuration;
 using Newtonsoft.Json;
 using OpenAuth.App.BaseApp.Base;
+using OpenAuth.App.BasicQueryService;
 using OpenAuth.App.Interface;
 using OpenAuth.App.ServiceApp.Request;
 using OpenAuth.App.ServiceApp.Response;
@@ -14,6 +16,7 @@ using OpenAuth.Repository.Domain;
 using OpenAuth.WebApi;
 using OpenAuth.WebApi.CloudSdk;
 using SqlSugar;
+using System.Text;
 
 namespace OpenAuth.App.ServiceApp
 {
@@ -21,13 +24,15 @@ namespace OpenAuth.App.ServiceApp
     {
         private readonly MqttClientManager _mqttClientManager;
         private readonly MinioService _minioService;
+        CommonDataManager _commonDataManager;
 
         public ManageApp(ISugarUnitOfWork<SugarDbContext> unitWork, ISimpleClient<LasaDronePort> repository, IAuth auth,
-            MqttClientManager mqttClientManager, MinioService minioService)
+            MqttClientManager mqttClientManager, CommonDataManager commonDataManager, MinioService minioService)
             : base(unitWork, repository, auth)
         {
             _mqttClientManager = mqttClientManager;
             _minioService = minioService;
+            _commonDataManager = commonDataManager;
         }
 
         #region 机场管理
@@ -315,6 +320,7 @@ namespace OpenAuth.App.ServiceApp
 
                 var list = await db.LasaWorkspace.AsQueryable()
                     .WhereIF(!string.IsNullOrEmpty(key), a => a.WorkspaceName.Contains(key))
+                    .Where(a => a.IsDelete == false)
                     .WhereIF(state != 0, a => a.Sate == state)
                     .WhereIF(isjoin == 1, a => ids.Contains(a.Id))
                     .WhereIF(isjoin == 2, a => !ids.Contains(a.Id))
@@ -464,21 +470,23 @@ namespace OpenAuth.App.ServiceApp
             using (var db = UnitWork.CreateContext())
             {
                 WorkSpaceRes res = new WorkSpaceRes();
-                var workspace = await db.LasaWorkspace.AsQueryable().Where(r => r.Id == id).FirstAsync();
-                var sysuser = db.User.AsQueryable()
-                    .LeftJoin<LasaSpaceUser>((r, a) => r.Id == a.UserId)
-                    .Where((r, a) => a.WorkSpaceId == id)
-                    .Select((r, a) => r).ToList();
-                var uav = db.LasaDronePort.AsQueryable()
-                    .LeftJoin<LasaSpaceDevice>((r, a) => r.Id == a.DeviceId)
-                    .Where((r, a) => a.WorkSpaceId == id)
-                    .Select((r, a) => r).ToList();
-                var lockfly = db.LasaSpaceLockFly.AsQueryable().Where(r => r.WorkSpaceId == id).ToList();
-                res.users = sysuser;
-                res.LasaDronePort = uav;
-                res.lasaSpaceLockFlies = lockfly;
-                res.workspace = workspace;
-
+                var workspace = await db.LasaWorkspace.AsQueryable().Where(r => r.Id == id && r.IsDelete == false).FirstAsync();
+                if (workspace != null)
+                {
+                    var sysuser = db.User.AsQueryable()
+                        .LeftJoin<LasaSpaceUser>((r, a) => r.Id == a.UserId)
+                        .Where((r, a) => a.WorkSpaceId == id)
+                        .Select((r, a) => r).ToList();
+                    var uav = db.LasaDronePort.AsQueryable()
+                        .LeftJoin<LasaSpaceDevice>((r, a) => r.Id == a.DeviceId)
+                        .Where((r, a) => a.WorkSpaceId == id)
+                        .Select((r, a) => r).ToList();
+                    var lockfly = db.LasaSpaceLockFly.AsQueryable().Where(r => r.WorkSpaceId == id).ToList();
+                    res.users = sysuser;
+                    res.LasaDronePort = uav;
+                    res.lasaSpaceLockFlies = lockfly;
+                    res.workspace = workspace;
+                }
                 return new Response<WorkSpaceRes>
                 {
                     Result = res
@@ -658,5 +666,165 @@ namespace OpenAuth.App.ServiceApp
         {
             return _minioService.UploadFile(xmlFile, "");
         }
+
+        #region 添加地图作业区域
+        /// <summary>
+        /// 添加地图作业区域
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public async Task<Response<string>> AddWorkArea(LasaShpData model)
+        {
+            var _user = _auth.GetCurrentUser().User;
+            model.CreateTime = DateTime.Now;
+            model.CreateUser = _user.Id.ToString();
+            model.CreateUserName = _user.Name.ToString();
+            using (var db = base.UnitWork.CreateContext().Db.CopyNew())
+            {
+                //获取主键
+                string id = Guid.NewGuid().ToString();
+                model.Id = id;
+
+                //格式化数据
+                string _wktModel = _commonDataManager.WktDataConvert(model.Geom, "MULTIPOLYGON ZM", 4);
+
+                model.Geom = null;
+
+                StringBuilder geomSql = new StringBuilder();
+                geomSql.AppendFormat($" update lasa_shpdata set \"Geom\" = st_geomfromtext('{_wktModel}',4326) where \"Id\" = '{id}'");
+
+                //更新面积
+                StringBuilder sql = new StringBuilder();
+                sql.AppendFormat($" update lasa_shpdata set \"Area\" = st_area(st_transform(\"Geom\",4527)) where \"Geom\" is not null and  \"Id\" = '{id}'");
+
+                //更新周长
+                StringBuilder sqlle = new StringBuilder();
+                sqlle.AppendFormat($" update lasa_shpdata set \"Length\" = ST_Perimeter(st_transform(\"Geom\",4527)) where \"Geom\" is not null and  \"Id\" = '{id}'");
+
+                //使用事务提交数据
+                var transFlag = await db.UseTranAsync(async () =>
+                {
+                    //插入图斑数据
+                    var flag = await db.Insertable(model).ExecuteCommandAsync();
+
+                    //修改图斑数据
+                    var flagGeom = await db.Ado.ExecuteCommandAsync(geomSql.ToString());
+
+                    //修改图斑面积
+                    var flagUpdate = await db.Ado.ExecuteCommandAsync(sql.ToString());
+
+                    //修改图斑周长
+                    var lengthUpdate = await db.Ado.ExecuteCommandAsync(sqlle.ToString());
+                });
+                if (transFlag.IsSuccess)
+                    return new Response<string>
+                    {
+                        Result = id,
+                        Message = "新增成功"
+                    };
+                else
+                    return new Response<string>
+                    {
+                        Message = "新增失败"
+                    };
+            }
+        }
+
+        /// <summary>
+        /// 更新地图作业区域
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public async Task<Response<string>> UpdateWorkArea(LasaShpData model)
+        {
+            using (var db = base.UnitWork.CreateContext().Db.CopyNew())
+            {
+                //格式化数据
+                string _wktModel = _commonDataManager.WktDataConvert(model.Geom, "MULTIPOLYGON ZM", 4);
+
+                model.Geom = null;
+
+                StringBuilder geomSql = new StringBuilder();
+                geomSql.AppendFormat($" update lasa_shpdata set \"Geom\" = st_geomfromtext('{_wktModel}',4326) where \"Id\" = '{model.Id}'");
+
+                //更新面积
+                StringBuilder sql = new StringBuilder();
+                sql.AppendFormat($" update lasa_shpdata set \"Area\" = st_area(st_transform(\"Geom\",4527)) where \"Geom\" is not null and  \"Id\" = '{model.Id}'");
+
+                //更新周长
+                StringBuilder sqlle = new StringBuilder();
+                sqlle.AppendFormat($" update lasa_shpdata set \"Length\" = ST_Perimeter(st_transform(\"Geom\",4527)) where \"Geom\" is not null and  \"Id\" = '{model.Id}'");
+
+                //使用事务提交数据
+                var transFlag = await db.UseTranAsync(async () =>
+                {
+                    //插入图斑数据
+                    var flag = await db.Updateable(model).ExecuteCommandAsync();
+
+                    //修改图斑数据
+                    var flagGeom = await db.Ado.ExecuteCommandAsync(geomSql.ToString());
+
+                    //修改图斑面积
+                    var flagUpdate = await db.Ado.ExecuteCommandAsync(sql.ToString());
+
+                    //修改图斑周长
+                    var lengthUpdate = await db.Ado.ExecuteCommandAsync(sqlle.ToString());
+                });
+                if (transFlag.IsSuccess)
+                    return new Response<string>
+                    {
+                        Result = model.Id,
+                        Message = "更新成功"
+                    };
+                else
+                    return new Response<string>
+                    {
+                        Message = "更新失败"
+                    };
+            }
+
+        }
+
+        //删除地图作业区域
+        public async Task<Response<bool>> DeleteWorkArea(string id)
+        {
+            using (var db = UnitWork.CreateContext())
+            {
+                await db.LasaShpData.DeleteByIdAsync(id); 
+                if (db.Commit())
+                    return new Response<bool> { Result = true, Message = "删除成功" };
+                else
+                    return new Response<bool> { Result = false, Message = "删除失败" };
+            }
+        }
+
+        /// <summary>
+        /// 获取地图作业区域列表
+        /// </summary>
+        /// <param name="workspaceid">项目id</param>
+        /// <returns></returns>
+        public async Task<Response<List<LasaShpData>>> GetWorkAreaList(string workspaceid,int? state, string type)
+        {
+            using (var db = UnitWork.CreateContext())
+            {
+
+                StringBuilder sql = new StringBuilder();
+                sql.AppendFormat($" Select * from   lasa_shpdata where  \"WorkSpaceId\" = '{workspaceid}'");
+                var list = db.Db.SqlQueryable<LasaShpData>(sql.ToString()).ToList();
+                if (!string.IsNullOrEmpty(type)&&list.Count>0)
+                {
+                    list=list.Where(r=>r.Type == type).ToList();
+                }
+                if(state!=null)
+                {
+                    list=list.Where(r=>r.State==state).ToList();
+                }
+                return new Response<List<LasaShpData>>
+                {
+                    Result = list
+                };
+            }
+        }
+        #endregion
     }
 }

OpenAuth.Repository/Domain/LasaShpData.cs

@@ -0,0 +1,80 @@
+using System;
+using System.Linq;
+using System.Text;
+using SqlSugar;
+
+namespace OpenAuth.Repository.Domain
+{
+    ///<summary>
+    ///
+    ///</summary>
+    [SugarTable("lasa_shpdata")]
+    public partial class LasaShpData
+    {
+           public LasaShpData(){
+
+
+           }
+           /// <summary>
+           /// Desc:主键
+           /// Default:
+           /// Nullable:False
+           /// </summary>           
+           [SugarColumn(IsPrimaryKey=true)]
+           public string Id {get;set;}
+
+           /// <summary>
+           /// Desc:名称
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string Name {get;set;}
+
+           /// <summary>
+           /// Desc:类型（区分限飞区域，作业区域等）
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string Type {get;set;}
+
+           /// <summary>
+           /// Desc:属性（边框属性，颜色，宽度等，json格式）
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string Properties {get;set;}
+
+           /// <summary>
+           /// Desc:创建时间
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public DateTime? CreateTime {get;set;}
+
+           /// <summary>
+           /// Desc:创建人
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string CreateUser {get;set;}
+
+           /// <summary>
+           /// Desc:区域
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string Geom {get;set;}
+
+           /// <summary>
+           /// Desc:项目id
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string WorkSpaceId {get;set;}
+
+        public int State { get;set;}
+        public string CreateUserName { get; set;}
+        public decimal Area { get; set; }
+        public decimal Length { get; set; }
+    }
+}

OpenAuth.Repository/SugarDbContext.cs

@@ -65,6 +65,7 @@ namespace OpenAuth.Repository
         public SugarRepositiry<LasaTask> LasaTask { get; set; }
         public SugarRepositiry<LasaAirLine> LasaAirLine { get; set; }
         public SugarRepositiry<LasaWorkspace> LasaWorkspace { get; set; }
+        public SugarRepositiry<LasaShpData> LasaShpData { get; set; }
         public SugarRepositiry<LasaSpaceUser> LasaSpaceUser { get; set; }
         public SugarRepositiry<LasaSpaceDevice> LasaSpaceDevice { get; set; }
         public SugarRepositiry<LasaSpaceLockFly> LasaSpaceLockFly { get; set; }

OpenAuth.WebApi/Controllers/ServiceControllers/ManageController.cs

@@ -470,5 +470,84 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
             var dir = configuration["WpmlDir"];
             return dir;
         }
+
+        #region 添加地图作业区域
+        /// <summary>
+        /// 添加地图作业区域
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<Response<string>> AddWorkArea([FromBody] LasaShpData model)
+        {
+            var res = new Response<string>();
+            try
+            {
+                return await _app.AddWorkArea(model);
+            }
+            catch (Exception ex)
+            {
+                res.Code = 500;
+                res.Message = ex.InnerException?.Message ?? ex.Message;
+            }
+            return res;
+        }
+
+        /// <summary>
+        /// 更新地图作业区域
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<Response<string>> UpdateWorkArea([FromBody] LasaShpData model)
+        {
+            var res = new Response<string>();
+            try
+            {
+                return await _app.UpdateWorkArea(model);
+            }
+            catch (Exception ex)
+            {
+                res.Code = 500;
+                res.Message = ex.InnerException?.Message ?? ex.Message;
+            }
+            return res;
+        }
+
+        /// <summary>
+        /// 删除地图作业区域
+        /// </summary>
+        /// <param name="id">地图作业区域id</param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<Response<bool>> DeleteWorkArea(string id)
+        {
+            return await _app.DeleteWorkArea(id);
+        }
+
+        /// <summary>
+        /// 获取地图作业区域列表
+        /// </summary>
+        /// <param name="workspaceid">项目id</param>
+        /// <param name="state">项目状态（0已启用，1已禁用，null全部）</param>
+        /// <param name="type">区域类型（作业区，限飞区等）</param>
+        /// <returns></returns>
+        [HttpGet]
+        public async Task<Response<List<LasaShpData>>> GetWorkAreaList(string workspaceid,int? state,string type)
+        {
+            var result = new Response<List<LasaShpData>>();
+            try
+            {
+                result = await _app.GetWorkAreaList(workspaceid,state,type);
+            }
+            catch (Exception ex)
+            {
+                result.Code = 500;
+                result.Message = ex.Message;
+            }
+
+            return result;
+        }
+        #endregion
     }
 }