4/9

yanjinhui

2025-04-09 b1aa3a97ed3fcc221a863b8a26ae447975e65907

4/9

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITelescopicService/IMaintenanceService.cs

@@ -42,7 +42,26 @@
        /// </summary>
        /// <returns></returns>
        WebResponseContent MaintenanceOperationRecord(PaginationDTO pagination);
       


        //开始检修和结束检修（展示当前登入用户的检修任务）
        WebResponseContent MaintenanceTasksOfTheDay(string account);

        /// <summary>
        /// å¼€å§‹æ£€ä¿®
        /// </summary>
        /// <param name="id">用户id</param>
        /// <returns></returns>
        WebResponseContent StartMaintenceTask(string account);

        /// <summary>
        /// ç»“束检修
        /// </summary>
        /// <param name="id">用户id</param>
        /// <returns></returns>
        WebResponseContent StopMaintenanceTask(string account);


    }

   

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/Telescopic/Dt_Maintenance.cs

@@ -45,13 +45,13 @@
        /// æ£€ä¿®å¼€å§‹æ—¶é—´
        /// </summary>
        [SugarColumn(Length = 50, IsNullable = true, ColumnDescription = "检修开始时间")]
        public DateTime MaintenancStartTime { get; set; }
        public DateTime? MaintenancStartTime { get; set; }

        // <summary>
        /// æ£€ä¿®ç»“束时间
        /// </summary>
        [SugarColumn(Length = 50, IsNullable = true, ColumnDescription = "检修结束时间")]
        public DateTime MaintenancEendTime { get; set; }
        public DateTime? MaintenancEendTime { get; set; }




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

@@ -1,6 +1,7 @@
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;
@@ -72,5 +73,42 @@
        {
            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);
        }
    }
}

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Server.csproj

@@ -86,8 +86,4 @@
        </Content>
    </ItemGroup>

    <ItemGroup>
      <Folder Include="wwwroot\image\" />
    </ItemGroup>

</Project>

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/wwwroot/image/59293addef4da93a4de193c42fc3c21.jpg

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/wwwroot/image/newLogo.png

Binary files differ

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs

@@ -210,7 +210,7 @@
                    content = WebResponseContent.Instance.OK(data: new
                    {
                        token,
                        userName = user.UserTrueName,
                        userName = user.UserName,
                        img = user.HeadImageUrl,
                        ID = user.UserId,
                        RoleId = user.RoleId,

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceService.cs

@@ -142,7 +142,12 @@




        /// <summary>
        /// æ›´æ–°çŠ¶æ€æ˜¯å¦å…è®¸è¿›å…¥æ£€ä¿®
        /// </summary>
        /// <param name="id"></param>
        /// <param name="ispossible"></param>
        /// <returns></returns>
        public WebResponseContent RunOperation(int id, string  ispossible)
        {
            try
@@ -292,7 +297,122 @@
            }
        }

      

        /// <summary>
        /// çœ‹ä»Šå¤©çš„检修任务
        /// </summary>
        /// <param name="id"></param>
        /// <returns></returns>
        public WebResponseContent MaintenanceTasksOfTheDay(string account)
        {
            try
            {
                var today = DateTime.Today;               // ä»Šå¤©çš„零点
                var tomorrow = today.AddDays(1);         // æ˜Žå¤©çš„零点

                var query = _user.Db.Queryable<Sys_User>()
                    .InnerJoin<Dt_Maintenance>((a, b) => a.UserName == b.UserAccount)
                    .Where((a, b) => b.IsPossible == "true" && b.UserAccount == account &&
                    b.MaintenanceDate >= today && b.MaintenanceDate < tomorrow).Select((a, b) => new
                    {
                        b.ID,
                        a.UserTrueName,
                        a.UserName,
                        a.CardNumber,
                        a.Userteam,
                        a.HeadImageUrl,
                        b.IsPossible,
                        b.MaintenanceDate,
                        b.MaintenancStartTime,
                        b.MaintenancEendTime,
                    }).ToList();
                if (query==null)
                {
                    return new WebResponseContent { Status = false, Message = "你今天没有检修任务" };
                }
                


                return new WebResponseContent { Status=true, Data = query };
            }
            catch (Exception ex)
            {

                return new WebResponseContent { Status = false, Message = "错误信息：" + ex.Message };
            }
                    
        }

        /// <summary>
        /// å¼€å§‹æ£€ä¿®
        /// </summary>
        /// <param name="account"></param>
        /// <returns></returns>
        public WebResponseContent StartMaintenceTask(string account)
        {
            try
            {
                var today = DateTime.Today;               // ä»Šå¤©çš„零点
                var tomorrow = today.AddDays(1);         // æ˜Žå¤©çš„零点


                var maint = BaseDal.QueryData(x =>
                    x.UserAccount == account &&
                    x.IsPossible == "true" &&
                    x.MaintenanceDate >= today &&
                    x.MaintenanceDate < tomorrow
                ).FirstOrDefault();

                if (maint == null)
                {
                    return new WebResponseContent { Status = false, Message = "未找到今日的维护任务记录" };
                }

                maint.MaintenancStartTime = DateTime.Now;
                BaseDal.UpdateData(maint);

                return new WebResponseContent { Status = true, Data = maint };
            }
            catch (Exception ex)
            {
                return new WebResponseContent { Status = false, Message = "错误信息：" + ex.Message };
            }
        }


        /// <summary>
        /// ç»“束检修
        /// </summary>
        /// <param name="account"></param>
        /// <returns></returns>
        public WebResponseContent StopMaintenanceTask(string account)
        {
            try
            {
                var today = DateTime.Today;               // ä»Šå¤©çš„零点
                var tomorrow = today.AddDays(1);         // æ˜Žå¤©çš„零点

                var maint = BaseDal.QueryData(x => x.UserAccount == account && x.IsPossible == "true"
                && x.MaintenanceDate >= today &&x.MaintenanceDate < tomorrow).FirstOrDefault();
                if (maint == null)
                {
                    return new WebResponseContent { Status = false, Message = "未找到可用的维护任务记录" };
                }
                // ä¿®æ”¹å…¶ç»“束时间
                maint.MaintenancEendTime = DateTime.Now;
                maint.IsPossible = "ok";//ok就代表完成了
                BaseDal.UpdateData(maint);
                return new WebResponseContent { Status = true, Data = maint };

            }
            catch (Exception ex)
            {

                return new WebResponseContent { Status = false, Message = "错误信息：" + ex.Message };
            }
        }



        /// <summary>
        /// çŠ¶æ€æžšä¸¾