From 08a515946d6763b26746d593af76a8af9b1b4076 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期五, 28 六月 2024 16:05:44 +0800
Subject: [PATCH] 操作日志

---
 Wms/Wms/Controllers/BasisController.cs |  115 +++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 71 insertions(+), 44 deletions(-)

diff --git a/Wms/Wms/Controllers/BasisController.cs b/Wms/Wms/Controllers/BasisController.cs
index 2370f47..fb0997a 100644
--- a/Wms/Wms/Controllers/BasisController.cs
+++ b/Wms/Wms/Controllers/BasisController.cs
@@ -21,6 +21,7 @@
 using System.Data;
 using Model.ModelDto.LogDto;
 using Utility;
+using Model.ModelVm.LogVm;
 
 namespace Wms.Controllers
 {
@@ -119,11 +120,18 @@
         /// <exception cref="System.Exception">鎹曡幏寮傚父</exception>
         [HttpPost]
         [ServiceFilter(typeof(ApiResponseActionFilter))]
+        [UnitOfWork]
         public async Task InsertUserinfo(UserInfoDto UserInfoDto)
         {
             await _userInforServer.InsertUserInfo(UserInfoDto);
-            await _operation.InsertOperation("绯荤粺璁剧疆", "鐢ㄦ埛绠$悊", UserInfoDto.UserNo, "娣诲姞", "娣诲姞鐢ㄦ埛淇℃伅 鐢ㄦ埛鍙凤細" + UserInfoDto.UserNo, _userManager.UserId);
-
+            await _operation.InsertOperation(new OperationInputVm()
+            {
+                ParentName = "绯荤粺璁剧疆",
+                MenuName = "鐢ㄦ埛绠$悊",
+                FkNo = UserInfoDto.UserNo,
+                TypeName = "娣诲姞",
+                Msg = "娣诲姞鐢ㄦ埛淇℃伅 鐢ㄦ埛鍙凤細" + UserInfoDto.UserNo
+            });
         }
 
 
@@ -135,12 +143,20 @@
         /// <exception cref="System.Exception">寮傚父</exception>
         [HttpGet]
         [ServiceFilter(typeof(ApiResponseActionFilter))]
+        [UnitOfWork]
         public async Task DeleteUserInfo(int userids)
         {
             //鑾峰彇鐢ㄦ埛淇℃伅
             SysUserInfor user = await _userInforServer.GetUserInfoById(userids);
             await _userInforServer.DeleteUserinfo(user);
-            await _operation.InsertOperation("绯荤粺璁剧疆", "鐢ㄦ埛绠$悊", user.UserNo, "鍒犻櫎", "鍒犻櫎鐢ㄦ埛淇℃伅 鐢ㄦ埛鍙凤細" + user.UserNo, _userManager.UserId);
+            await _operation.InsertOperation(new OperationInputVm()
+            {
+                ParentName = "绯荤粺璁剧疆",
+                MenuName = "鐢ㄦ埛绠$悊",
+                FkNo = user.UserNo,
+                TypeName = "鍒犻櫎",
+                Msg = "鍒犻櫎鐢ㄦ埛淇℃伅 鐢ㄦ埛鍙凤細" + user.UserNo
+            });
         }
 
 
@@ -152,11 +168,18 @@
         /// <exception cref="System.Exception">鎹曡幏寮傚父</exception>
         [HttpPost]
         [ServiceFilter(typeof(ApiResponseActionFilter))]
+        [UnitOfWork]
         public async Task UpdateUserinfo(UserInfoDto userdto)
         {
             await _userInforServer.UpdateUserinfo(userdto);
-            await _operation.InsertOperation("绯荤粺璁剧疆", "鐢ㄦ埛绠$悊", userdto.UserNo, "淇敼", "淇敼鐢ㄦ埛淇℃伅 鐢ㄦ埛鍙凤細" + userdto.UserNo, _userManager.UserId);
-
+            await _operation.InsertOperation(new OperationInputVm()
+            {
+                ParentName = "绯荤粺璁剧疆",
+                MenuName = "鐢ㄦ埛绠$悊",
+                FkNo = userdto.UserNo,
+                TypeName = "缂栬緫",
+                Msg = "淇敼鐢ㄦ埛淇℃伅 鐢ㄦ埛鍙凤細" + userdto.UserNo
+            });
         }
 
 
@@ -183,20 +206,13 @@
             //鑾峰彇褰撳墠鎿嶄綔鐢ㄦ埛id
             SysUserInfor user = await _userInforServer.GetUserInfoById(_userManager.UserId);
             if (user == null)
-            {
                 throw Oops.Bah("鎵句笉鍒扮敤鎴蜂俊鎭�");
-            }
             if (user.PassWord != pwdOld)
-            {
                 throw Oops.Bah("鍘熷瘑鐮佷笉姝g‘");
-            }
-            else
-            {
-                //淇敼瀵嗙爜
-                int i = await _userInforServer.UptUserPassWord(pwdNew, _userManager.UserId);
-                if (i <= 0)
-                    throw Oops.Bah("淇敼瀵嗙爜澶辫触");
-            }
+            //淇敼瀵嗙爜
+            int i = await _userInforServer.UptUserPassWord(pwdNew, _userManager.UserId);
+            if (i <= 0)
+                throw Oops.Bah("淇敼瀵嗙爜澶辫触");
         }
         /// <summary>
         /// x澶╁悗鎻愰啋鐢ㄦ埛淇敼瀵嗙爜
@@ -251,8 +267,14 @@
         public async Task InsertRoleInfo(RoleDto roledto)
         {
             await _rolesServer.InsertRoleInfo(roledto);
-            await _operation.InsertOperation("绯荤粺璁剧疆", "瑙掕壊鏉冮檺", roledto.RoleNo, "娣诲姞", "娣诲姞瑙掕壊淇℃伅 瑙掕壊鍙凤細" + roledto.RoleNo, _userManager.UserId);
-
+            await _operation.InsertOperation(new OperationInputVm()
+            {
+                ParentName = "绯荤粺璁剧疆",
+                MenuName = "瑙掕壊鏉冮檺",
+                FkNo = roledto.RoleNo,
+                TypeName = "娣诲姞",
+                Msg = "娣诲姞瑙掕壊淇℃伅 瑙掕壊鍙凤細" + roledto.RoleNo
+            });
         }
 
         /// <summary>
@@ -269,7 +291,14 @@
             //鏍规嵁瑙掕壊id鑾峰彇瑙掕壊淇℃伅
             SysRoles role = await _rolesServer.GetRoleInfoById(roleids);
             await _rolesServer.DeleteRoleInfo(role);
-            await _operation.InsertOperation("绯荤粺璁剧疆", "瑙掕壊鏉冮檺", role.RoleNo, "鍒犻櫎", "鍒犻櫎瑙掕壊淇℃伅 瑙掕壊鍙凤細" + role.RoleNo, _userManager.UserId);
+            await _operation.InsertOperation(new OperationInputVm()
+            {
+                ParentName = "绯荤粺璁剧疆",
+                MenuName = "瑙掕壊鏉冮檺",
+                FkNo = role.RoleNo,
+                TypeName = "鍒犻櫎",
+                Msg = "鍒犻櫎瑙掕壊淇℃伅 瑙掕壊鍙凤細" + role.RoleNo
+            });
         }
 
         /// <summary>
@@ -284,7 +313,14 @@
         public async Task UpdateRolesInfo(SysRoles role)
         {
             await _rolesServer.UpdateRoleInfo(role);
-            await _operation.InsertOperation("绯荤粺璁剧疆", "瑙掕壊鏉冮檺", role.RoleNo, "淇敼", "淇敼瑙掕壊淇℃伅 瑙掕壊鍙凤細" + role.RoleNo, _userManager.UserId);
+            await _operation.InsertOperation(new OperationInputVm()
+            {
+                ParentName = "绯荤粺璁剧疆",
+                MenuName = "瑙掕壊鏉冮檺",
+                FkNo = role.RoleNo,
+                TypeName = "缂栬緫",
+                Msg = "淇敼瑙掕壊淇℃伅 瑙掕壊鍙凤細" + role.RoleNo
+            });
         }
 
         #endregion
@@ -365,8 +401,14 @@
             SysRoles roles = await _rolesServer.GetRoleInfoById(id);
             //淇濆瓨瑙掕壊鏉冮檺淇℃伅
             await _roleRightServer.InsertRoleRight(MenuNo, roles.RoleNo);
-            await _operation.InsertOperation("绯荤粺璁剧疆", "瑙掕壊鏉冮檺", roles.RoleNo, "淇敼", "鍒嗛厤瑙掕壊鏉冮檺 瑙掕壊鍙凤細" + roles.RoleNo, _userManager.UserId);
-            
+            await _operation.InsertOperation(new OperationInputVm()
+            {
+                ParentName = "绯荤粺璁剧疆",
+                MenuName = "瑙掕壊鏉冮檺",
+                FkNo = roles.RoleNo,
+                TypeName = "缂栬緫",
+                Msg = "鍒嗛厤瑙掕壊鏉冮檺 瑙掕壊鍙凤細" + roles.RoleNo
+            });
         }
 
         #endregion
@@ -2051,22 +2093,12 @@
         /// <summary>
         /// 鑾峰彇鎿嶄綔鏃ュ織淇℃伅鍒楄〃
         /// </summary>
-        /// <param name="menuName">鑿滃崟鍚嶇О</param>
-        /// <param name="type">鎿嶄綔绫诲瀷</param>
-        /// <param name="msg">鎿嶄綔鍐呭</param>
-        /// <param name="menuNo">鑿滃崟鍙�</param>
-        /// <param name="parentNo">妯″潡鍙�</param>
         /// <returns></returns>
-        [HttpGet]
-        public IActionResult GetSysOperationList(string menuName, string type, string msg, string menuNo, string parentNo)
+        [HttpPost]
+        [ServiceFilter(typeof(ApiResponseActionFilter))]
+        public async Task<SqlSugarPagedList<OperationDto>> GetSysOperationList(GetOperationVm model)
         {
-            List<OperationDto> operation = _operation.GetSysOperationList(menuName, type, msg, menuNo, parentNo);
-            return Ok(new
-            {
-                data = operation,
-                code = 0,
-                msg = "鎴愬姛"
-            });
+            return await _operation.GetSysOperationList(model);
         }
 
         /// <summary>
@@ -2075,15 +2107,10 @@
         /// <param name="dicName">瀛楀吀鍚嶇О</param>
         /// <returns></returns>
         [HttpGet]
-        public IActionResult GetDicTypeList(string dicName)
+        [ServiceFilter(typeof(ApiResponseActionFilter))]
+        public async Task<List<SysDictionary>> GetDicTypeList(string dicName)
         {
-            List<SysDictionary> diclist = _operation.GetDicTypeList(dicName);
-            return Ok(new
-            {
-                data = diclist,
-                code = 0,
-                msg = "鎴愬姛"
-            });
+            return await _operation.GetDicTypeList(dicName);
         }
 
         #endregion

--
Gitblit v1.8.0