From 1dcc7b63a20daad7c7060f18878d8e8dbaad02de Mon Sep 17 00:00:00 2001
From: qiuyao <qiuyao@hnkhzn.com>
Date: 星期一, 28 四月 2025 16:41:31 +0800
Subject: [PATCH] 解决冲突

---
 项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/MaintenanceController.cs |   64 ++++++++++++++++++++++++++++---
 1 files changed, 57 insertions(+), 7 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/MaintenanceController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/MaintenanceController.cs"
index c6ff046..34cdb72 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/MaintenanceController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/MaintenanceController.cs"
@@ -1,8 +1,10 @@
 锘縰sing Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using System;
 using WIDESEAWCS_Core;
 using WIDESEAWCS_Core.BaseController;
+using WIDESEAWCS_DTO.Telescopic;
 using WIDESEAWCS_ITelescopicService;
 using WIDESEAWCS_IWMSPart;
 using WIDESEAWCS_Model.Models;
@@ -22,10 +24,10 @@
         /// 鏌ョ湅妫�淇鐞�
         /// </summary>
         /// <returns></returns>
-        [HttpGet,Route("ShowMaintence"),AllowAnonymous]
-        public WebResponseContent ShowMaintence()
+        [HttpPost,Route("ShowMaintence"),AllowAnonymous]
+        public WebResponseContent ShowMaintence([FromBody] PaginationDTO pagination)
         {
-            return Service.ShowMaintence();
+            return Service.ShowMaintence(pagination);
         }
 
         /// <summary>
@@ -33,9 +35,9 @@
         /// </summary>
         /// <returns></returns>
         [HttpPost, Route("PersonnelMonitoring"), AllowAnonymous]
-        public WebResponseContent PersonnelMonitoring(bool ispossible)
+        public WebResponseContent PersonnelMonitoring([FromBody] PaginationDTO pagination)
         {
-            return Service.PersonnelMonitoring(ispossible);
+            return Service.PersonnelMonitoring(pagination);
         }
 
 
@@ -45,9 +47,9 @@
         /// <param name="id"></param>
         /// <returns></returns>
         [HttpPost,Route("RunOperation"), AllowAnonymous]
-        public WebResponseContent RunOperation(int id)
+        public WebResponseContent RunOperation(int id, string ispossible)
         {
-            return Service.RunOperation(id);
+            return Service.RunOperation(id,ispossible);
         }
 
         /// <summary>
@@ -60,5 +62,53 @@
         {
             return Service.ChangeTasState(id);
         }
+
+
+        /// <summary>
+        /// 妫�淇搷浣滆褰�
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost, Route("MaintenanceOperationRecord"), AllowAnonymous]
+        public WebResponseContent MaintenanceOperationRecord([FromBody] PaginationDTO pagination)
+        {
+            return Service.MaintenanceOperationRecord(pagination);
+        }
+
+
+        /// <summary>
+        /// 鏌ョ湅鐧诲叆浠婂ぉ璐﹀彿鐨勬淇换鍔�
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [HttpPost, Route("MaintenanceTasksOfTheDay"), AllowAnonymous]
+        public WebResponseContent MaintenanceTasksOfTheDay(string account)
+        {
+            return Service.MaintenanceTasksOfTheDay(account);
+        }
+
+       
+
+        /// <summary>
+        /// 寮�濮嬫淇�
+        /// </summary>
+        /// <param name="account"></param>
+        /// <returns></returns>
+        [HttpPost, Route("StartMaintenceTask"), AllowAnonymous]
+        public WebResponseContent StartMaintenceTask(string account)
+        {
+            return Service.StartMaintenceTask(account);
+        }
+
+
+        /// <summary>
+        /// 缁撴潫妫�淇�
+        /// </summary>
+        /// <param name="account"></param>
+        /// <returns></returns>
+        [HttpPost, Route("StopMaintenanceTask"), AllowAnonymous]
+        public WebResponseContent StopMaintenanceTask(string account)
+        {
+            return Service.StopMaintenanceTask(account);
+        }
     }
 }

--
Gitblit v1.9.3