项目添加，编辑

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("drone_caseinfo_sthx")))
+                foreach (var item in uow.Db.DbMaintenance.GetTableInfoList().Where(r => r.Name.ToLower().StartsWith("lasa_workspace")))
                 {
                     //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 = "LasaWorkspace1";
                     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("lasa_workspace")).IsCreateAttribute().CreateClassFile("E:\\低空态势感知\\code\\OpenAuth.Repository\\Domain", "OpenAuth.Repository.Domain");
                 uow.Commit();
             }
             return "更新实体成功";

OpenAuth.App/ServiceApp/ManageApp.cs

@@ -1,6 +1,7 @@
 using Infrastructure;
 using OpenAuth.App.BaseApp.Base;
 using OpenAuth.App.Interface;
+using OpenAuth.App.ServiceApp.Request;
 using OpenAuth.Repository;
 using OpenAuth.Repository.Domain;
 using SqlSugar;
@@ -201,14 +202,35 @@ namespace OpenAuth.App.ServiceApp
             }
         }
         //添加项目 
-        public async Task<Response<bool>> AddWorkspace(LasaWorkspace lasaWorkspace)
+        public async Task<Response<bool>> AddWorkspace(WorkSpace info)
         {
             using (var db = UnitWork.CreateContext())
             {
+                LasaWorkspace lasaWorkspace= info.LasaWorkspace;
                 lasaWorkspace.Id = Guid.NewGuid().ToString();
                 lasaWorkspace.CreateId = _auth.GetCurrentUser().User.Id;
                 lasaWorkspace.CreateTime = DateTime.Now;
-                var flag = await db.LasaWorkspace.InsertAsync(lasaWorkspace);
+
+                List<LasaSpaceDevice> devices= new List<LasaSpaceDevice>();
+                foreach(var item in info.DeviceIds)
+                {
+                    LasaSpaceDevice sd = new LasaSpaceDevice();
+                    sd.WorkSpaceId=lasaWorkspace.Id;
+                    sd.DeviceId = item;
+                    devices.Add(sd);
+                }
+
+                List<LasaSpaceUser> users = new List<LasaSpaceUser>();
+                foreach (var item in info.UserIds)
+                {
+                    LasaSpaceUser sd = new LasaSpaceUser();
+                    sd.WorkSpaceId = lasaWorkspace.Id;
+                    sd.UserId = item;
+                    users.Add(sd);
+                }
+                await db.LasaWorkspace.InsertAsync(lasaWorkspace);
+                await db.LasaSpaceDevice.InsertRangeAsync(devices);
+                await db.LasaSpaceUser.InsertRangeAsync(users);
                 if (db.Commit())
                     return new Response<bool> { Result = true, Message = "添加成功" };
                 else
@@ -216,11 +238,33 @@ namespace OpenAuth.App.ServiceApp
             }
         }
         //编辑项目 
-        public async Task<Response<bool>> EditWorkspace(LasaWorkspace lasaWorkspace)
+        public async Task<Response<bool>> EditWorkspace(WorkSpace info)
         {
             using (var db = UnitWork.CreateContext())
             {
+                LasaWorkspace lasaWorkspace = info.LasaWorkspace;
                 var flag = await db.LasaWorkspace.UpdateAsync(lasaWorkspace);
+                List<LasaSpaceDevice> devices = new List<LasaSpaceDevice>();
+                foreach (var item in info.DeviceIds)
+                {
+                    LasaSpaceDevice sd = new LasaSpaceDevice();
+                    sd.WorkSpaceId = lasaWorkspace.Id;
+                    sd.DeviceId = item;
+                    devices.Add(sd);
+                }
+
+                List<LasaSpaceUser> users = new List<LasaSpaceUser>();
+                foreach (var item in info.UserIds)
+                {
+                    LasaSpaceUser sd = new LasaSpaceUser();
+                    sd.WorkSpaceId = lasaWorkspace.Id;
+                    sd.UserId = item;
+                    users.Add(sd);
+                }
+                await db.LasaSpaceDevice.DeleteAsync(r=>r.WorkSpaceId == lasaWorkspace.Id);
+                await db.LasaSpaceDevice.InsertRangeAsync(devices);
+                await db.LasaSpaceUser.DeleteAsync(r=>r.WorkSpaceId==lasaWorkspace.Id);
+                await db.LasaSpaceUser.InsertRangeAsync(users);
                 if (db.Commit())
                     return new Response<bool> { Result = true, Message = "编辑成功" };
                 else
@@ -232,7 +276,10 @@ namespace OpenAuth.App.ServiceApp
         {
             using (var db = UnitWork.CreateContext())
             {
-                var flag = await db.LasaWorkspace.DeleteAsync(it => it.Id == id);
+                await db.LasaWorkspace.UpdateAsync(u => new LasaWorkspace
+                {
+                    IsDelete = true
+                }, u => u.Id == id);
                 if (db.Commit())
                     return new Response<bool> { Result = true, Message = "删除成功" };
                 else

OpenAuth.App/ServiceApp/Request/WorkSpace.cs

@@ -0,0 +1,16 @@
+using OpenAuth.Repository.Domain;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OpenAuth.App.ServiceApp.Request
+{
+    public class WorkSpace
+    {
+        public LasaWorkspace LasaWorkspace {  get; set; }
+        public List<long> UserIds { get; set; }
+        public List<string> DeviceIds { get; set; }
+    }
+}

OpenAuth.Repository/Domain/LasaSpaceUser.cs

@@ -0,0 +1,28 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OpenAuth.Repository.Domain
+{
+    [SugarTable("lasa_spaceusesr")]
+    public class LasaSpaceUser
+    {
+        /// <summary>
+        /// Desc:项目id
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        [SugarColumn(IsPrimaryKey = true)]
+        public string WorkSpaceId { get; set; }
+        /// <summary>
+        /// Desc:用户id
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        [SugarColumn(IsPrimaryKey = true)]
+        public long UserId { get; set; }
+    }
+}

OpenAuth.Repository/Domain/LasaWorkspace.cs

@@ -1,30 +1,181 @@
-using SqlSugar;
-using System;
-using System.Collections.Generic;
+using System;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
+using SqlSugar;
 
 namespace OpenAuth.Repository.Domain
 {
-    /// <summary>
-    /// 项目
-    /// </summary>
+    ///<summary>
+    ///
+    ///</summary>
     [SugarTable("lasa_workspace")]
-    public class LasaWorkspace
+    public partial class LasaWorkspace
     {
-        public string Id { get; set; }
+           public LasaWorkspace(){
 
-        public string WorkspaceName { get; set; }
 
-        public string WorkspaceDesc { get; set; }
+           }
+           /// <summary>
+           /// Desc:标识
+           /// Default:
+           /// Nullable:False
+           /// </summary>           
+           [SugarColumn(IsPrimaryKey=true)]
+           public string Id {get;set;}
 
-        public string PlatformName { get; set; }
+           /// <summary>
+           /// Desc:项目名称
+           /// Default:
+           /// Nullable:False
+           /// </summary>           
+           public string WorkspaceName {get;set;}
 
-        public DateTime? CreateTime { get; set; }
+           /// <summary>
+           /// Desc:项目描述
+           /// Default:
+           /// Nullable:False
+           /// </summary>           
+           public string WorkspaceDesc {get;set;}
 
-        public long? CreateId { get; set; }
+           /// <summary>
+           /// Desc:平台名称
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string PlatformName {get;set;}
+
+           /// <summary>
+           /// Desc:创建时间
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public DateTime? CreateTime {get;set;}
+
+           /// <summary>
+           /// Desc:创建人
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public long? CreateId {get;set;}
+
+           /// <summary>
+           /// Desc:绑定码
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string BindCode {get;set;}
+
+           /// <summary>
+           /// Desc:作业中心点经度
+           /// Default:0
+           /// Nullable:True
+           /// </summary>           
+           public decimal? CenterLng {get;set;}
+
+           /// <summary>
+           /// Desc:作业中心点维度
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public decimal? CenterLat {get;set;}
+
+           /// <summary>
+           /// Desc:是否允许申请码加入项目
+           /// Default:false
+           /// Nullable:True
+           /// </summary>           
+           public bool IsAllowRequestCode {get;set;}
+
+           /// <summary>
+           /// Desc:申请码
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public string RequestCode {get;set;}
+
+           /// <summary>
+           /// Desc:申请码截止时间
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public DateTime? RequestCodeCutOffTime {get;set;}
+
+           /// <summary>
+           /// Desc:云端阻飞
+           /// Default:false
+           /// Nullable:True
+           /// </summary>           
+           public bool IsCloudBlockFlight {get;set;}
+
+           /// <summary>
+           /// Desc:天气预报阻飞
+           /// Default:false
+           /// Nullable:True
+           /// </summary>           
+           public bool IsWeatherBlockFlight {get;set;}
+
+           /// <summary>
+           /// Desc:多机安全起降
+           /// Default:false
+           /// Nullable:True
+           /// </summary>           
+           public bool IsMultipleAircraft {get;set;}
+
+           /// <summary>
+           /// Desc:机场自动录制
+           /// Default:false
+           /// Nullable:True
+           /// </summary>           
+           public bool IsAirportRecord {get;set;}
+
+           /// <summary>
+           /// Desc:飞行器自动录制
+           /// Default:false
+           /// Nullable:True
+           /// </summary>           
+           public bool IsAircraftRecord {get;set;}
+
+           /// <summary>
+           /// Desc:直播分享
+           /// Default:false
+           /// Nullable:True
+           /// </summary>           
+           public bool IsLiveShare {get;set;}
+
+           /// <summary>
+           /// Desc:媒体分享
+           /// Default:false
+           /// Nullable:True
+           /// </summary>           
+           public bool IsMediaShare {get;set;}
+
+           /// <summary>
+           /// Desc:设备直传
+           /// Default:false
+           /// Nullable:True
+           /// </summary>           
+           public bool IsDeviceTrans {get;set;}
+
+           /// <summary>
+           /// Desc:设备直传--计划设置
+           /// Default:false
+           /// Nullable:True
+           /// </summary>           
+           public bool IsDeicePlaneTrans {get;set;}
+
+           /// <summary>
+           /// Desc:项目状态（0进行中，1已归档）
+           /// Default:
+           /// Nullable:True
+           /// </summary>           
+           public short Sate {get;set;}
+
+           /// <summary>
+           /// Desc:是否删除	
+           /// Default:false
+           /// Nullable:True
+           /// </summary>           
+           public bool IsDelete {get;set;}
 
-        public string BindCode { get; set; }
     }
 }

OpenAuth.Repository/Domain/LaseSpaceDevice.cs

@@ -0,0 +1,28 @@
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OpenAuth.Repository.Domain
+{
+    [SugarTable("lasa_spacedevice")]
+    public class LasaSpaceDevice
+    {
+        /// <summary>
+        /// Desc:项目id
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        [SugarColumn(IsPrimaryKey = true)]
+        public string WorkSpaceId { get; set; }
+        /// <summary>
+        /// Desc:设备Id
+        /// Default:
+        /// Nullable:False
+        /// </summary>           
+        [SugarColumn(IsPrimaryKey = true)]
+        public string DeviceId { get; set; }
+    }
+}

OpenAuth.Repository/SugarDbContext.cs

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

OpenAuth.WebApi/Controllers/ServiceControllers/ManageController.cs

@@ -5,6 +5,7 @@ using Infrastructure.Helpers;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using OpenAuth.App.ServiceApp;
+using OpenAuth.App.ServiceApp.Request;
 using OpenAuth.Repository.Domain;
 
 namespace OpenAuth.WebApi.Controllers.ServiceControllers
@@ -272,7 +273,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public async Task<Response<bool>> AddWorkspace(LasaWorkspace info)
+        public async Task<Response<bool>> AddWorkspace(WorkSpace info)
         {
             return await _app.AddWorkspace(info);
         }
@@ -282,7 +283,7 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public async Task<Response<bool>> EditWorkspace(LasaWorkspace info)
+        public async Task<Response<bool>> EditWorkspace(WorkSpace info)
         {
             return await _app.EditWorkspace(info);
         }