修改

OpenAuth.App/ServiceApp/FireManagement/FireManagementApp.cs

@@ -259,6 +259,7 @@ namespace OpenAuth.App.ServiceApp.FireManagement
             {
                 RefAsync<int> totalNumber = 0;
                 var tasks = await db.FmFireclueTask.AsQueryable()
+                    .Where(r=>r.IsDelete == false)
                     .Where(r => r.IsDelete == false)
                     .WhereIF(req.state!=null,r=>r.State==req.state)
                     .WhereIF(req.type!=null,r=>r.Type==req.type)

OpenAuth.App/ServiceApp/FmPreventionPlanManage/FmPreventionPlanApp.cs

@@ -16,6 +16,8 @@ using Microsoft.Extensions.Configuration;
 using Infrastructure;
 using OpenAuth.App.ServiceApp.FireManagement.Request;
 using OpenAuth.App.ServiceApp.FmPreventionPlanManage.Request;
+using Yitter.IdGenerator;
+using OpenAuth.App.Const;
 
 namespace OpenAuth.App.ServiceApp.FmPreventionPlanManage
 {
@@ -41,6 +43,7 @@ namespace OpenAuth.App.ServiceApp.FmPreventionPlanManage
             {
                 RefAsync<int> totalNumber = 0;
                 var infos = await db.FmPreventionplan.AsQueryable()
+                    .Where(r=>r.IsDelete==false)
                     .WhereIF(req.state != null, r => r.Status == req.state)
                     .WhereIF(req.plancategory != null, r => r.PlanCategory == req.plancategory)
                     .WhereIF(req.createtimebegin != null && req.createtimeend != null, r => r.CreateTime >= req.createtimebegin && r.CreateTime <= req.createtimeend)
@@ -71,5 +74,68 @@ namespace OpenAuth.App.ServiceApp.FmPreventionPlanManage
         }
 
 
+        //删除应急预案
+        public async Task<Response<bool>> DeletePreventionplan(string id)
+        {
+            using (var db = base.UnitWork.CreateContext())
+            {
+                var taskinfo = await db.FmPreventionplan.AsQueryable().FirstAsync(r => r.Id == id);
+                if (taskinfo != null) 
+                {
+                    var flag=await db.FmPreventionplan.UpdateAsync(r => new FmPreventionplan
+                    {
+                        IsDelete = true
+                    }, r => r.Id == id);
+                    if (db.Commit()&&flag)
+                    {
+                        return new Response<bool> { Result = true, Message = "操作成功" };
+                    }
+                    else
+                    {
+                        return new Response<bool> { Result = false, Message = "操作失败" };
+                    }
+                }
+                else
+                {
+                    return new Response<bool> { Result = false, Message = "预案不存在" };
+                }
+            }
+        }
+
+        //添加预案
+        public async Task<Response<bool>> AddPreventionplan(FmPreventionplan info)
+        {
+            using (var db = base.UnitWork.CreateContext())
+            {
+                var user = _auth.GetCurrentUser().User;
+                info.Id = Guid.NewGuid().ToString();
+                info.CreateTime = DateTime.Now;
+                info.CreateUser = user.Name;
+                info.IsDelete = false;
+                if (string.IsNullOrEmpty(info.PlanCode))
+                {
+                    throw new Exception("请输入预案编号");
+                }
+                
+                var exitinfo = db.FmPreventionplan
+                    .AsQueryable()
+                    .Count(a => a.PlanCode==info.PlanCode);
+                if (exitinfo > 0)
+                {
+                    throw new Exception("预案编号已存在，请重新输入");
+                }
+
+                var flag=await db.FmPreventionplan.InsertAsync(info);
+
+                if (db.Commit()&&flag)
+                {
+                    return new Response<bool> { Result = true, Message = "操作成功" };
+                }
+                else
+                {
+                    return new Response<bool> { Result = false, Message = "操作失败" };
+                }
+            }
+        }
     }
 }

OpenAuth.Repository/Domain/FmPreventionplan.cs

@@ -142,5 +142,12 @@ namespace OpenAuth.Repository.Domain
            /// </summary>           
            public string Remarks {get;set;}
 
+            /// <summary>
+            /// Desc:是否删除
+            /// Default:
+            /// Nullable:True
+            /// </summary>           
+            public bool IsDelete { get; set; }
+
     }
 }

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

@@ -313,7 +313,6 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement
         /// <param name="info"></param>
         /// <returns></returns>
         [HttpPost]
-        [AllowAnonymous]
         public async Task<Response<bool>> AddFireClueInfo(FmFireclueInfo info)
         {
             Response<bool> response = new();

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

@@ -29,7 +29,6 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-        [AllowAnonymous]
         public async Task<Response<PageInfo<List<FmPreventionplan>>>> GetPreventionplanPageList([FromQuery] FmPreventionplanReq req)
         {
             Response<PageInfo<List<FmPreventionplan>>> response = new Response<PageInfo<List<FmPreventionplan>>>();
@@ -51,7 +50,6 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement
         /// </summary>
         /// <returns></returns>
         [HttpGet]
-        [AllowAnonymous]
         public async Task<Response<FmPreventionplan>> LoadClueInfoById(string id)
         {
             Response<FmPreventionplan> response = new Response<FmPreventionplan>();
@@ -68,5 +66,47 @@ namespace OpenAuth.WebApi.Controllers.ServiceControllers.FireManagement
         }
 
 
+        /// <summary>
+        /// 添加预案
+        /// </summary>
+        /// <param name="info"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<Response<bool>> AddPreventionplan(FmPreventionplan info)
+        {
+            Response<bool> response = new();
+            try
+            {
+                return await _app.AddPreventionplan(info);
+            }
+            catch (Exception ex)
+            {
+                response.Code = 500;
+                response.Message = ex.InnerException?.Message ?? ex.Message;
+            }
+            return response;
+        }
+
+        /// <summary>
+        /// 删除预案
+        /// </summary>
+        /// <param name="info"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<Response<bool>> DeletePreventionplan(string id)
+        {
+            Response<bool> response = new();
+            try
+            {
+                return await _app.DeletePreventionplan(id);
+            }
+            catch (Exception ex)
+            {
+                response.Code = 500;
+                response.Message = ex.InnerException?.Message ?? ex.Message;
+            }
+            return response;
+        }
+
     }
 }