diff --git a/DOAN.Admin.WebApi/Controllers/MES/Andon/SiteSafeGreenCrossController.cs b/DOAN.Admin.WebApi/Controllers/MES/Andon/SiteSafeGreenCrossController.cs new file mode 100644 index 0000000..79ea545 --- /dev/null +++ b/DOAN.Admin.WebApi/Controllers/MES/Andon/SiteSafeGreenCrossController.cs @@ -0,0 +1,106 @@ +using Microsoft.AspNetCore.Mvc; + +using DOAN.Admin.WebApi.Filters; +using DOAN.Service.MES.Andon.IService; +using DOAN.Model.MES.Andon.Dto; +using DOAN.Model.MES.Andon; + +//创建时间:2025-04-14 +namespace DOAN.Admin.WebApi.Controllers +{ + /// + /// 现场安全绿色十字架 + /// + [Verify] + [Route("BZFM/SiteSafeGreenCross")] + public class SiteSafeGreenCrossController : BaseController + { + /// + /// 现场安全绿色十字架接口 + /// + private readonly ISiteSafeGreenCrossService _SiteSafeGreenCrossService; + + public SiteSafeGreenCrossController(ISiteSafeGreenCrossService SiteSafeGreenCrossService) + { + _SiteSafeGreenCrossService = SiteSafeGreenCrossService; + } + + /// + /// 查询现场安全绿色十字架列表 + /// + /// + /// + [HttpGet("list")] + [ActionPermissionFilter(Permission = "sitesafegreencross:list")] + public IActionResult QuerySiteSafeGreenCross([FromQuery] SiteSafeGreenCrossQueryDto parm) + { + var response = _SiteSafeGreenCrossService.GetList(parm); + return SUCCESS(response); + } + + + /// + /// 查询现场安全绿色十字架详情 + /// + /// + /// + [HttpGet("{Id}")] + [ActionPermissionFilter(Permission = "sitesafegreencross:query")] + public IActionResult GetSiteSafeGreenCross(int Id) + { + var response = _SiteSafeGreenCrossService.GetInfo(Id); + + var info = response.Adapt(); + return SUCCESS(info); + } + + /// + /// 添加现场安全绿色十字架 + /// + /// + [HttpPost] + [ActionPermissionFilter(Permission = "sitesafegreencross:add")] + [Log(Title = "现场安全绿色十字架", BusinessType = BusinessType.INSERT)] + public IActionResult AddSiteSafeGreenCross([FromBody] SiteSafeGreenCrossDto parm) + { + var modal = parm.Adapt().ToCreate(HttpContext); + + var response = _SiteSafeGreenCrossService.AddSiteSafeGreenCross(modal); + + return SUCCESS(response); + } + + /// + /// 更新现场安全绿色十字架 + /// + /// + [HttpPut] + [ActionPermissionFilter(Permission = "sitesafegreencross:edit")] + [Log(Title = "现场安全绿色十字架", BusinessType = BusinessType.UPDATE)] + public IActionResult UpdateSiteSafeGreenCross([FromBody] SiteSafeGreenCrossDto parm) + { + var modal = parm.Adapt().ToUpdate(HttpContext); + var response = _SiteSafeGreenCrossService.UpdateSiteSafeGreenCross(modal); + + return ToResponse(response); + } + + /// + /// 删除现场安全绿色十字架 + /// + /// + [HttpPost("delete/{ids}")] + [ActionPermissionFilter(Permission = "sitesafegreencross:delete")] + [Log(Title = "现场安全绿色十字架", BusinessType = BusinessType.DELETE)] + public IActionResult DeleteSiteSafeGreenCross([FromRoute]string ids) + { + var idArr = Tools.SplitAndConvert(ids); + + return ToResponse(_SiteSafeGreenCrossService.Delete(idArr)); + } + + + + + } +} \ No newline at end of file diff --git a/DOAN.Admin.WebApi/Controllers/MES/SmartScreen/Site/SiteSafeGreenCrossSmartController.cs b/DOAN.Admin.WebApi/Controllers/MES/SmartScreen/Site/SiteSafeGreenCrossSmartController.cs new file mode 100644 index 0000000..a8670bb --- /dev/null +++ b/DOAN.Admin.WebApi/Controllers/MES/SmartScreen/Site/SiteSafeGreenCrossSmartController.cs @@ -0,0 +1,18 @@ +using DOAN.Admin.WebApi.Filters; + +using Microsoft.AspNetCore.Mvc; + +namespace DOAN.Admin.WebApi.Controllers.MES.SmartScreen.Site +{ + /// + /// 质量大屏 + /// + [Verify] + [Route("mes/qualityManagement/QualitySmart")] + public class SiteSafeGreenCrossSmartController : BaseController + { + + public SiteSafeGreenCrossSmartController() { } + + } +} \ No newline at end of file diff --git a/DOAN.Model/MES/Andon/Dto/SiteSafeGreenCrossDto.cs b/DOAN.Model/MES/Andon/Dto/SiteSafeGreenCrossDto.cs new file mode 100644 index 0000000..5c5b6ed --- /dev/null +++ b/DOAN.Model/MES/Andon/Dto/SiteSafeGreenCrossDto.cs @@ -0,0 +1,34 @@ + +namespace DOAN.Model.MES.Andon.Dto +{ + /// + /// 现场安全绿色十字架查询对象 + /// + public class SiteSafeGreenCrossQueryDto : PagerInfo + { + } + + /// + /// 现场安全绿色十字架输入输出对象 + /// + public class SiteSafeGreenCrossDto + { + [Required(ErrorMessage = "Id不能为空")] + public int Id { get; set; } + + public DateTime? SafeDate { get; set; } + + public int? SafeNum { get; set; } + + public string CreatedBy { get; set; } + + public DateTime? CreatedTime { get; set; } + + public string UpdatedBy { get; set; } + + public DateTime? UpdatedTime { get; set; } + + + + } +} \ No newline at end of file diff --git a/DOAN.Model/MES/Andon/SiteSafeGreenCross.cs b/DOAN.Model/MES/Andon/SiteSafeGreenCross.cs new file mode 100644 index 0000000..eac8915 --- /dev/null +++ b/DOAN.Model/MES/Andon/SiteSafeGreenCross.cs @@ -0,0 +1,53 @@ + +namespace DOAN.Model.MES.Andon +{ + /// + /// 现场安全绿色十字架 + /// + [SugarTable("site_safe_green_cross")] + public class SiteSafeGreenCross + { + /// + /// Id + /// + [SugarColumn(IsPrimaryKey = true, IsIdentity = false)] + public int Id { get; set; } + + /// + /// 安全日期 + /// + [SugarColumn(ColumnName = "safe_date")] + public DateTime? SafeDate { get; set; } + + /// + /// 安全状态数字(1:绿色安全,2:黄色轻微事故,3:红色是重大事故) + /// + [SugarColumn(ColumnName = "safe_num")] + public int? SafeNum { get; set; } + + /// + /// CreatedBy + /// + [SugarColumn(ColumnName = "created_by")] + public string CreatedBy { get; set; } + + /// + /// CreatedTime + /// + [SugarColumn(ColumnName = "created_time")] + public DateTime? CreatedTime { get; set; } + + /// + /// UpdatedBy + /// + [SugarColumn(ColumnName = "updated_by")] + public string UpdatedBy { get; set; } + + /// + /// UpdatedTime + /// + [SugarColumn(ColumnName = "updated_time")] + public DateTime? UpdatedTime { get; set; } + + } +} \ No newline at end of file diff --git a/DOAN.Service/MES/Andon/IService/ISiteSafeGreenCrossService.cs b/DOAN.Service/MES/Andon/IService/ISiteSafeGreenCrossService.cs new file mode 100644 index 0000000..8290221 --- /dev/null +++ b/DOAN.Service/MES/Andon/IService/ISiteSafeGreenCrossService.cs @@ -0,0 +1,23 @@ + + +using DOAN.Model.MES.Andon; +using DOAN.Model.MES.Andon.Dto; + +namespace DOAN.Service.MES.Andon.IService +{ + /// + /// 现场安全绿色十字架service接口 + /// + public interface ISiteSafeGreenCrossService : IBaseService + { + PagedInfo GetList(SiteSafeGreenCrossQueryDto parm); + + SiteSafeGreenCross GetInfo(int Id); + + + SiteSafeGreenCross AddSiteSafeGreenCross(SiteSafeGreenCross parm); + int UpdateSiteSafeGreenCross(SiteSafeGreenCross parm); + + + } +} diff --git a/DOAN.Service/MES/Andon/SiteSafeGreenCrossService.cs b/DOAN.Service/MES/Andon/SiteSafeGreenCrossService.cs new file mode 100644 index 0000000..bbd067c --- /dev/null +++ b/DOAN.Service/MES/Andon/SiteSafeGreenCrossService.cs @@ -0,0 +1,81 @@ +using Infrastructure.Attribute; +using Infrastructure.Extensions; + +using DOAN.Repository; +using DOAN.Service.MES.Andon.IService; +using DOAN.Model.MES.Andon; +using DOAN.Model.MES.Andon.Dto; + + +namespace DOAN.Service.MES.Andon.Service +{ + /// + /// 现场安全绿色十字架Service业务层处理 + /// + [AppService(ServiceType = typeof(ISiteSafeGreenCrossService), ServiceLifetime = LifeTime.Transient)] + public class SiteSafeGreenCrossService : BaseService, ISiteSafeGreenCrossService + { + /// + /// 查询现场安全绿色十字架列表 + /// + /// + /// + public PagedInfo GetList(SiteSafeGreenCrossQueryDto parm) + { + var predicate = QueryExp(parm); + + var response = Queryable() + .Where(predicate.ToExpression()) + .ToPage(parm); + + return response; + } + + + /// + /// 获取详情 + /// + /// + /// + public SiteSafeGreenCross GetInfo(int Id) + { + var response = Queryable() + .Where(x => x.Id == Id) + .First(); + + return response; + } + + /// + /// 添加现场安全绿色十字架 + /// + /// + /// + public SiteSafeGreenCross AddSiteSafeGreenCross(SiteSafeGreenCross model) + { + return Insertable(model).ExecuteReturnEntity(); + } + + /// + /// 修改现场安全绿色十字架 + /// + /// + /// + public int UpdateSiteSafeGreenCross(SiteSafeGreenCross model) + { + return Update(model, true); + } + + /// + /// 查询导出表达式 + /// + /// + /// + private static Expressionable QueryExp(SiteSafeGreenCrossQueryDto parm) + { + var predicate = Expressionable.Create(); + + return predicate; + } + } +} \ No newline at end of file