From 0aac30d1c6f1ca0c2bf7662fb9ca4f0d98b3bca7 Mon Sep 17 00:00:00 2001
From: z8018 <1282578289@qq.com>
Date: 星期一, 09 六月 2025 14:29:25 +0800
Subject: [PATCH] Merge branch 'qy0427' of http://115.159.85.185:8098/r/MeiXinLaiRui/ShenSuoGanKongZhi into qy0427
---
project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/MaintenanceController.cs | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/MaintenanceController.cs b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/MaintenanceController.cs
index 34cdb72..1a89567 100644
--- a/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/MaintenanceController.cs
+++ b/project/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/MaintenanceController.cs
@@ -4,6 +4,7 @@
using System;
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.BaseController;
+using WIDESEAWCS_Core.Helper;
using WIDESEAWCS_DTO.Telescopic;
using WIDESEAWCS_ITelescopicService;
using WIDESEAWCS_IWMSPart;
@@ -15,23 +16,24 @@
[ApiController]
public class MaintenanceController : ApiBaseController<IMaintenanceService, Dt_Maintenance>
{
+
public MaintenanceController(IMaintenanceService service) : base(service)
{
-
+
}
/// <summary>
/// 鏌ョ湅妫�淇鐞�
/// </summary>
/// <returns></returns>
- [HttpPost,Route("ShowMaintence"),AllowAnonymous]
+ [HttpPost, Route("ShowMaintence"), AllowAnonymous]
public WebResponseContent ShowMaintence([FromBody] PaginationDTO pagination)
{
return Service.ShowMaintence(pagination);
}
/// <summary>
- /// 鍦ㄦ淇汉鍛樼洃鎺�
+ /// 鍦ㄦ淇汉鍛樼洃鎺э紙鏁板瓧澶у睆锛�
/// </summary>
/// <returns></returns>
[HttpPost, Route("PersonnelMonitoring"), AllowAnonymous]
@@ -46,10 +48,11 @@
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
- [HttpPost,Route("RunOperation"), AllowAnonymous]
+ [HttpPost, Route("RunOperation"), AllowAnonymous]
public WebResponseContent RunOperation(int id, string ispossible)
{
- return Service.RunOperation(id,ispossible);
+ //
+ return Service.RunOperation(id, ispossible);
}
/// <summary>
@@ -71,6 +74,7 @@
[HttpPost, Route("MaintenanceOperationRecord"), AllowAnonymous]
public WebResponseContent MaintenanceOperationRecord([FromBody] PaginationDTO pagination)
{
+
return Service.MaintenanceOperationRecord(pagination);
}
@@ -80,23 +84,26 @@
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
- [HttpPost, Route("MaintenanceTasksOfTheDay"), AllowAnonymous]
+ [HttpPost, Route("MaintenanceTasksOfTheDay")]
public WebResponseContent MaintenanceTasksOfTheDay(string account)
{
+
return Service.MaintenanceTasksOfTheDay(account);
}
-
+
/// <summary>
/// 寮�濮嬫淇�
/// </summary>
/// <param name="account"></param>
/// <returns></returns>
- [HttpPost, Route("StartMaintenceTask"), AllowAnonymous]
+ [HttpPost, Route("StartMaintenceTask")]
public WebResponseContent StartMaintenceTask(string account)
{
- return Service.StartMaintenceTask(account);
+ var userIp = HttpContext.GetUserIp();//鐢ㄦ埛鐢佃剳ip
+ var reslut = userIp.Replace("::ffff:", " ");
+ return Service.StartMaintenceTask(account, reslut);
}
@@ -105,10 +112,23 @@
/// </summary>
/// <param name="account"></param>
/// <returns></returns>
- [HttpPost, Route("StopMaintenanceTask"), AllowAnonymous]
+ [HttpPost, Route("StopMaintenanceTask")]
public WebResponseContent StopMaintenanceTask(string account)
{
return Service.StopMaintenanceTask(account);
}
+
+
+ /// <summary>
+ /// 灞曠ず寮�濮嬫淇汉鍛�
+ /// </summary>
+ /// <param name="status">妫�淇姸鎬�</param>
+ /// <returns></returns>
+ [HttpPost,Route("YShowStartTake")]
+ public WebResponseContent YShowStartTake()
+ {
+ return Service.YShowStartTake();
+ }
+
}
}
--
Gitblit v1.9.3