HC_YFZX
/
Infrastructure
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: HC_YFZX:ac48243183534bc7fab65cf2701dd8cfe1ae203e
Branches Tags
HC_YFZX:DataMaintenance
HC_YFZX:FileMonitor
HC_YFZX:IdleResources
HC_YFZX:Insight
HC_YFZX:main
HC_YFZX:main_dev_1.0
..
compare: HC_YFZX:3f5ba6141074363940d9304a97a4221ee50eb1b2
Branches Tags
HC_YFZX:DataMaintenance
HC_YFZX:FileMonitor
HC_YFZX:IdleResources
HC_YFZX:Insight
HC_YFZX:main
HC_YFZX:main_dev_1.0

No commits in common. "ac48243183534bc7fab65cf2701dd8cfe1ae203e" and "3f5ba6141074363940d9304a97a4221ee50eb1b2" have entirely different histories.
ac48243183 ... 3f5ba61410

5 changed files with 3 additions and 116 deletions
Show Stats Expand all files Collapse all files

1
OpenAuth.App/ServiceApp/FireManagement/FireManagementApp.cs
View File

@ -259,7 +259,6 @@ 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)

66
OpenAuth.App/ServiceApp/FmPreventionPlanManage/FmPreventionPlanApp.cs
View File

@ -16,8 +16,6 @@ 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
{
@ -43,7 +41,6 @@ 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)
@ -74,68 +71,5 @@ 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 = "操作失败" };
}
}
}
}
}

7
OpenAuth.Repository/Domain/FmPreventionplan.cs
View File

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

1
OpenAuth.WebApi/Controllers/ServiceControllers/FireManagement/FireManagementController.cs
View File

@ -313,6 +313,7 @@ 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();

44
OpenAuth.WebApi/Controllers/ServiceControllers/FireManagement/FmPreventionPlanController.cs
View File

@ -29,6 +29,7 @@ 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>>>();
@ -50,6 +51,7 @@ 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>();
@ -66,47 +68,5 @@ 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;
}
}
}