From 1f17ff190aa73db844a4c6ba05fb6bde64b03ec4 Mon Sep 17 00:00:00 2001 From: "qianhao.xu" Date: Fri, 1 Nov 2024 14:19:17 +0800 Subject: [PATCH] logging --- .../PBL/Logging/LightLogController.cs | 102 ++++++++++++++++++ .../PBL/Logging/MESInteractionController.cs | 49 +++++++++ .../PBL/Logging/MesInterationLogController.cs | 102 ++++++++++++++++++ 3 files changed, 253 insertions(+) create mode 100644 DOAN.Admin.WebApi/Controllers/PBL/Logging/LightLogController.cs create mode 100644 DOAN.Admin.WebApi/Controllers/PBL/Logging/MESInteractionController.cs create mode 100644 DOAN.Admin.WebApi/Controllers/PBL/Logging/MesInterationLogController.cs diff --git a/DOAN.Admin.WebApi/Controllers/PBL/Logging/LightLogController.cs b/DOAN.Admin.WebApi/Controllers/PBL/Logging/LightLogController.cs new file mode 100644 index 0000000..1259733 --- /dev/null +++ b/DOAN.Admin.WebApi/Controllers/PBL/Logging/LightLogController.cs @@ -0,0 +1,102 @@ +using Microsoft.AspNetCore.Mvc; +using DOAN.Model.PBL.Dto; +using DOAN.Model.PBL; +using DOAN.Service.PBL.IPBLService; +using DOAN.Admin.WebApi.Filters; + +//创建时间：2024-11-01 +namespace DOAN.Admin.WebApi.Controllers.PBL +{ + /// + /// + /// + [Verify] + [Route("PBL/LightLog")] + public class LightLogController : BaseController + { + /// + /// 接口 + /// + private readonly ILightLogService _LightLogService; + + public LightLogController(ILightLogService LightLogService) + { + _LightLogService = LightLogService; + } + + /// + /// 查询列表 + /// + /// + /// + [HttpGet("list")] + [ActionPermissionFilter(Permission = "lightlog:list")] + public IActionResult QueryLightLog([FromQuery] LightLogQueryDto parm) + { + var response = _LightLogService.GetList(parm); + return SUCCESS(response); + } + + + /// + /// 查询详情 + /// + /// + /// + [HttpGet("{Id}")] + [ActionPermissionFilter(Permission = "lightlog:query")] + public IActionResult GetLightLog(string Id) + { + var response = _LightLogService.GetInfo(Id); + + var info = response.Adapt(); + return SUCCESS(info); + } + + /// + /// 添加 + /// + /// + [HttpPost] + [ActionPermissionFilter(Permission = "lightlog:add")] + [Log(Title = "", BusinessType = BusinessType.INSERT)] + public IActionResult AddLightLog([FromBody] LightLogDto parm) + { + var modal = parm.Adapt().ToCreate(HttpContext); + + var response = _LightLogService.AddLightLog(modal); + + return SUCCESS(response); + } + + /// + /// 更新 + /// + /// + [HttpPut] + [ActionPermissionFilter(Permission = "lightlog:edit")] + [Log(Title = "", BusinessType = BusinessType.UPDATE)] + public IActionResult UpdateLightLog([FromBody] LightLogDto parm) + { + var modal = parm.Adapt().ToUpdate(HttpContext); + var response = _LightLogService.UpdateLightLog(modal); + + return ToResponse(response); + } + + /// + /// 删除 + /// + /// + [HttpPost("delete/{ids}")] + [ActionPermissionFilter(Permission = "lightlog:delete")] + [Log(Title = "", BusinessType = BusinessType.DELETE)] + public IActionResult DeleteLightLog([FromRoute]string ids) + { + var idArr = Tools.SplitAndConvert(ids); + + return ToResponse(_LightLogService.Delete(idArr)); + } + + } +} \ No newline at end of file diff --git a/DOAN.Admin.WebApi/Controllers/PBL/Logging/MESInteractionController.cs b/DOAN.Admin.WebApi/Controllers/PBL/Logging/MESInteractionController.cs new file mode 100644 index 0000000..46c517f --- /dev/null +++ b/DOAN.Admin.WebApi/Controllers/PBL/Logging/MESInteractionController.cs @@ -0,0 +1,49 @@ +using Microsoft.AspNetCore.Mvc; +using DOAN.Model.PBL.Dto; +using DOAN.Model.PBL; +using DOAN.Service.PBL.IService; +using DOAN.Admin.WebApi.Filters; + +//创建时间：2024-09-23 +namespace DOAN.Admin.WebApi.Controllers.PBL +{ + /// + /// 与MES交互 + /// + [AllowAnonymous] + [Route("PBL/mes_interation")] + public class MESInteractionController : BaseController + { + private readonly IMESInteractionServcie mesInteraction; + public MESInteractionController(IMESInteractionServcie mesInteraction) + { + this.mesInteraction = mesInteraction; + } + + //TODO 接受工单 亮灯 + + [HttpPost("mes_light_up")] + public IActionResult MESLightUp([FromBody] LightUpDto light) + { + var response= mesInteraction.MESLightUp(light); + + return SUCCESS(response); + } + + //TODO 扫码灭灯 + [HttpGet("mes_light_down")] + public IActionResult MESLightDown(string scan_code) + { + var response = mesInteraction.MESLightDown(scan_code); + + return SUCCESS(response); + } + + + } + +} + + + + diff --git a/DOAN.Admin.WebApi/Controllers/PBL/Logging/MesInterationLogController.cs b/DOAN.Admin.WebApi/Controllers/PBL/Logging/MesInterationLogController.cs new file mode 100644 index 0000000..38c4040 --- /dev/null +++ b/DOAN.Admin.WebApi/Controllers/PBL/Logging/MesInterationLogController.cs @@ -0,0 +1,102 @@ +using Microsoft.AspNetCore.Mvc; +using DOAN.Model.PBL.Dto; +using DOAN.Model.PBL; +using DOAN.Service.PBL.IPBLService; +using DOAN.Admin.WebApi.Filters; + +//创建时间：2024-11-01 +namespace DOAN.Admin.WebApi.Controllers.PBL +{ + /// + /// + /// + [Verify] + [Route("PBL/MesInterationLog")] + public class MesInterationLogController : BaseController + { + /// + /// 接口 + /// + private readonly IMesInterationLogService _MesInterationLogService; + + public MesInterationLogController(IMesInterationLogService MesInterationLogService) + { + _MesInterationLogService = MesInterationLogService; + } + + /// + /// 查询列表 + /// + /// + /// + [HttpGet("list")] + [ActionPermissionFilter(Permission = "mesinterationlog:list")] + public IActionResult QueryMesInterationLog([FromQuery] MesInterationLogQueryDto parm) + { + var response = _MesInterationLogService.GetList(parm); + return SUCCESS(response); + } + + + /// + /// 查询详情 + /// + /// + /// + [HttpGet("{Id}")] + [ActionPermissionFilter(Permission = "mesinterationlog:query")] + public IActionResult GetMesInterationLog(string Id) + { + var response = _MesInterationLogService.GetInfo(Id); + + var info = response.Adapt(); + return SUCCESS(info); + } + + /// + /// 添加 + /// + /// + [HttpPost] + [ActionPermissionFilter(Permission = "mesinterationlog:add")] + [Log(Title = "", BusinessType = BusinessType.INSERT)] + public IActionResult AddMesInterationLog([FromBody] MesInterationLogDto parm) + { + var modal = parm.Adapt().ToCreate(HttpContext); + + var response = _MesInterationLogService.AddMesInterationLog(modal); + + return SUCCESS(response); + } + + /// + /// 更新 + /// + /// + [HttpPut] + [ActionPermissionFilter(Permission = "mesinterationlog:edit")] + [Log(Title = "", BusinessType = BusinessType.UPDATE)] + public IActionResult UpdateMesInterationLog([FromBody] MesInterationLogDto parm) + { + var modal = parm.Adapt().ToUpdate(HttpContext); + var response = _MesInterationLogService.UpdateMesInterationLog(modal); + + return ToResponse(response); + } + + /// + /// 删除 + /// + /// + [HttpPost("delete/{ids}")] + [ActionPermissionFilter(Permission = "mesinterationlog:delete")] + [Log(Title = "", BusinessType = BusinessType.DELETE)] + public IActionResult DeleteMesInterationLog([FromRoute]string ids) + { + var idArr = Tools.SplitAndConvert(ids); + + return ToResponse(_MesInterationLogService.Delete(idArr)); + } + + } +} \ No newline at end of file