解决冲突

qiuyao

2025-04-28 1dcc7b63a20daad7c7060f18878d8e8dbaad02de

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Telescopic/MaintenanceController.cs

@@ -1,8 +1,10 @@
using 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);
        }
    }
}