From b7d2673158b85817bb8ede21f46e920a2b896815 Mon Sep 17 00:00:00 2001
From: zpc <zpc1131@gamil.com>
Date: Tue, 12 Aug 2025 12:10:40 +0800
Subject: [PATCH] 333

---
 .../Business/OdfPortsController.cs            | 44 ++++++++++++++++++-
 .../System/SysProfileController.cs            | 19 +++++++-
 ZR.Model/System/Model/Dto/UserUpdatePwdDto.cs | 14 ++++++
 3 files changed, 74 insertions(+), 3 deletions(-)
 create mode 100644 ZR.Model/System/Model/Dto/UserUpdatePwdDto.cs

diff --git a/ZR.Admin.WebApi/Controllers/Business/OdfPortsController.cs b/ZR.Admin.WebApi/Controllers/Business/OdfPortsController.cs
index 6f74a3e..8e99acb 100644
--- a/ZR.Admin.WebApi/Controllers/Business/OdfPortsController.cs
+++ b/ZR.Admin.WebApi/Controllers/Business/OdfPortsController.cs
@@ -163,6 +163,7 @@ namespace ZR.Admin.WebApi.Controllers.Business
             {
                 return SUCCESS(new List<OdfPortsQuDto>());
             }
+
             var predicate = Expressionable.Create<OdfPorts>();
             var list = _OdfPortsService.AsQueryable().Where(it => it.Name.Contains(key) || it.Remarks.Contains(key) || it.HistoryRemarks.Contains(key) || it.OpticalAttenuation.Contains(key)).ToPage<OdfPorts, OdfPortsQuDto>(dto);
             var roomId = list.Result.Select(it => it.RoomId).Distinct();
@@ -180,6 +181,45 @@ namespace ZR.Admin.WebApi.Controllers.Business
         }
 
 
+        /// <summary>
+        /// 查询端口详情
+        /// </summary>
+        /// <param name="Id"></param>
+        /// <returns></returns>
+        [HttpGet("search2")]
+        [ActionPermissionFilter(Permission = "odfports:query")]
+        public async Task<IActionResult> GetOdfPortsInfo2([FromQuery] OdfPortsSearchDto dto)
+        {
+            var key = dto.Key;
+            if (string.IsNullOrEmpty(key))
+            {
+                return SUCCESS(new List<OdfPortsQuDto>());
+            }
+            var room = await _OdfRoomsService.AsQueryable().Where(it => it.Remarks.Contains(key) || it.RoomAddress.Contains(key) || it.RoomName.Contains(key)).Select((it) => new
+            {
+                it.RoomName,
+                it.RoomAddress,
+                it.Remarks,
+                it.DeptName
+            }).ToListAsync();
+
+            var predicate = Expressionable.Create<OdfPorts>();
+            var list = _OdfPortsService.AsQueryable().Where(it => it.Name.Contains(key) || it.Remarks.Contains(key) || it.HistoryRemarks.Contains(key) || it.OpticalAttenuation.Contains(key)).ToPage<OdfPorts, OdfPortsQuDto>(dto);
+            var roomId = list.Result.Select(it => it.RoomId).Distinct();
+            var roomList = await _OdfRoomsService.AsQueryable().Where(it => roomId.Contains(it.Id)).ToListAsync();
+            list.Result.ForEach(it =>
+            {
+                var t = roomList.Find(r => r.Id == it.RoomId);
+                if (t != null)
+                {
+                    it.Address = t.RoomAddress;
+                }
+                //roomList
+            });
+            return SUCCESS(new { Rooms = list, Ports = list });
+        }
+
+
         /// <summary>
         /// 修改端口
         /// </summary>
@@ -319,7 +359,7 @@ namespace ZR.Admin.WebApi.Controllers.Business
             {
                 return ToResponse(ResultCode.FAIL, "没有要导出的数据");
             }
-          
+
             var result = ExportExcelMini(list, "端口", "端口");
             return ExportExcel(result.Item2, result.Item1);
         }
@@ -338,7 +378,7 @@ namespace ZR.Admin.WebApi.Controllers.Business
             {
                 return ToResponse(ResultCode.FAIL, "没有要导出的数据");
             }
-          
+
             var result = ExportExcelMini(list, "端口数据", "端口数据");
             return ExportExcel(result.Item2, result.Item1);
         }
diff --git a/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs b/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs
index b12b085..f0246d4 100644
--- a/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs
+++ b/ZR.Admin.WebApi/Controllers/System/SysProfileController.cs
@@ -1,6 +1,8 @@
 using Microsoft.AspNetCore.Mvc;
+
 using ZR.Model.System;
 using ZR.Model.System.Dto;
+using ZR.Model.System.Model.Dto;
 
 namespace ZR.Admin.WebApi.Controllers.System
 {
@@ -96,13 +98,28 @@ namespace ZR.Admin.WebApi.Controllers.System
             if (UserService.ResetPwd(userId, newMd5) > 0)
             {
                 //TODO 更新缓存
-
                 return SUCCESS(1);
             }
 
             return ToResponse(ApiResult.Error("修改密码异常，请联系管理员"));
         }
 
+        /// <summary>
+        /// 修改密码
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost("updateUserPwd")]
+        [ActionPermissionFilter(Permission = "common")]
+        [Log(Title = "App修改密码", BusinessType = BusinessType.UPDATE, IsSaveRequestData = false)]
+        public IActionResult UpdatePwd([FromBody] UserUpdatePwdDto userUpdatePwdDto)
+        {
+            var oldPassword = userUpdatePwdDto.OldPassword;
+            var newPassword = userUpdatePwdDto.NewPassword;
+
+            return UpdatePwd(oldPassword, newPassword);
+        }
+
+
         /// <summary>
         /// 修改头像
         /// </summary>
diff --git a/ZR.Model/System/Model/Dto/UserUpdatePwdDto.cs b/ZR.Model/System/Model/Dto/UserUpdatePwdDto.cs
new file mode 100644
index 0000000..0d38ee9
--- /dev/null
+++ b/ZR.Model/System/Model/Dto/UserUpdatePwdDto.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ZR.Model.System.Model.Dto
+{
+    public class UserUpdatePwdDto
+    {
+        public string OldPassword { get; set; }
+        public string NewPassword { get; set; }
+    }
+}