1

yanjinhui

6 天以前 a3b1d7bfe497ca5ece2a51eb15a5534a98b33dcb

1

 ÏîÄ¿´úÂë/ºó¶Ë/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/ISys_RoleService.cs

@@ -18,6 +18,8 @@

        WebResponseContent GetUserTreePermission(int role_Id);

        WebResponseContent GetUserTreeUserRole(string url);

        WebResponseContent SavePermission(List<UserPermissionDTO> userPermissions, int roleId);
    }
}

 ÏîÄ¿´úÂë/ºó¶Ë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/System/Sys_RoleController.cs

@@ -8,6 +8,7 @@
using WIDESEAWCS_ISystemServices;
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_Model.Models.System;
using Microsoft.AspNetCore.Authorization;

namespace WIDESEAWCS_WCSServer.Controllers.System
{
@@ -55,6 +56,13 @@
            return Json(Service.GetUserTreePermission(roleId));
        }

        [HttpPost, Route("GetUserTreeUserRole"), AllowAnonymous]
        public IActionResult GetUserTreeUserRole(string url)
        {

            return Json(Service.GetUserTreeUserRole(url));
        }

        [HttpPost, Route("savePermission")]
        public IActionResult SavePermission([FromBody] List<UserPermissionDTO> userPermissions, int roleId)
        {

 ÏîÄ¿´úÂë/ºó¶Ë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json

@@ -18,6 +18,8 @@
  "DBType": "SqlServer",
  //连接字符串
  "ConnectionString": "Data Source=.;Initial Catalog=WIDESEAWCS_MXSSG;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
  //"ConnectionString": "Data Source=192.168.1.103;Initial Catalog=WIDESEAWCS_MXSSG;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",





 ÏîÄ¿´úÂë/ºó¶Ë/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_RoleService.cs

@@ -116,6 +116,24 @@
            return WebResponseContent.Instance.OK(null, data);
        }


        /// <summary>
        /// èŽ·å–角色是否可进入操作页面
        /// </summary>
        /// <param name="roleId"></param>
        /// <returns></returns>
        public WebResponseContent GetUserTreeUserRole(string url)
        {
            List<MenuDTO> menus = _MenuService.GetUserMenuList(App.User.RoleId);

            if (menus.Where(x => x.Url == url).Count() == 0)
            {
                return WebResponseContent.Instance.Error("该账号没有访问当前功能权限");
            }
            return WebResponseContent.Instance.OK();
        }


        /// <summary>
        /// ä¿å­˜è§’色权限
        /// </summary>

 ÏîÄ¿´úÂë/ºó¶Ë/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserFaceService.cs

@@ -211,6 +211,8 @@
                };
                base.AddData(userFace);

                

                return WebResponseContent.Instance.OK(data: filePath);
            }
            catch (Exception ex)

 ÏîÄ¿´úÂë/ºó¶Ë/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs

@@ -33,8 +33,9 @@
        private readonly IRepository<Dt_Maintenance> _MainServer;
        private readonly IRepository<Sys_Role> _RoleServer;
        private readonly IRepository<Dt_AuthorizationRecord> _AuthorizatRecServer;
        private readonly IRepository<Sys_UserFace> _userFace;

        public Sys_UserService(IRepository<Dt_AuthorizationRecord> AuthorizatRecServer,IRepository<Sys_Role> RoleServer,IRepository<Dt_Loginhsy> LoginhsyServer,IRepository<Dt_FaceRecognition> faceServer, IRepository<Sys_User> repository, IUnitOfWorkManage unitOfWorkManage, ICacheService cacheService, ISys_MenuService menuService, IRepository<Dt_Maintenance> MainServer) : base(repository)
        public Sys_UserService(IRepository<Sys_UserFace> _userFace,IRepository<Dt_AuthorizationRecord> AuthorizatRecServer,IRepository<Sys_Role> RoleServer,IRepository<Dt_Loginhsy> LoginhsyServer,IRepository<Dt_FaceRecognition> faceServer, IRepository<Sys_User> repository, IUnitOfWorkManage unitOfWorkManage, ICacheService cacheService, ISys_MenuService menuService, IRepository<Dt_Maintenance> MainServer) : base(repository)
        {
            _faceServer = faceServer;
            _LoginhsyServer = LoginhsyServer;
@@ -695,7 +696,7 @@
                        UserTeam = addUserDTO.userteam,
                        EnableTime = addUserDTO.enable == 1 ? DateTime.Now : (DateTime?)null, //启用
                        DisableTime = addUserDTO.enable == 0 ? DateTime.Now : (DateTime?)null,//不启用
                       
                      
                    };


@@ -742,15 +743,17 @@
                //dynamic resultObj = JsonConvert.DeserializeObject(apiResult);
                //if (resultObj.error_code == 0)
                //{
                    // ç™¾åº¦åˆ é™¤æˆåŠŸåŽï¼Œåˆ é™¤æ•°æ®åº“中的用户
                  var user = BaseDal.QueryData(x => x.UserName == account).FirstOrDefault();
                // ç™¾åº¦åˆ é™¤æˆåŠŸåŽï¼Œåˆ é™¤æ•°æ®åº“中的用户
                var user = BaseDal.QueryData(x => x.UserName == account).FirstOrDefault();
                var main = _MainServer.QueryData(x => x.UserAccount == account).FirstOrDefault();
                if (user != null&&main!=null)
                    {
                        BaseDal.DeleteData(user);
                var face = _userFace.QueryData(x => x.UserName == account).FirstOrDefault();
                if (user != null && main != null && face != null)
                {
                    BaseDal.DeleteData(user);
                    _MainServer.DeleteData(main);
                    _userFace.DeleteData(face);
                }
                    return WebResponseContent.Instance.OK("用户删除成功");
                return WebResponseContent.Instance.OK("用户删除成功");
                //}
                //else
                //{

 ÏîÄ¿´úÂë/ºó¶Ë/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceService.cs

@@ -235,11 +235,12 @@
            {
                // 1. æŸ¥æ‰¾ç›®æ ‡ç”¨æˆ·ï¼ˆè¦è¢«å¼ºåˆ¶ä¸‹çº¿çš„人）
                var maint = BaseDal.QueryData().FirstOrDefault(x => x.ID == id);
                var sysuer = _user.QueryData(x => x.UserName == maint.UserAccount).FirstOrDefault();//user表
                if (maint == null || sysuer==null)
                if (maint==null)
                {
                    return new WebResponseContent { Status = false, Message = "没有找到该用户" };
                }
                var sysuer = _user.QueryData(x => x.UserName == maint.UserAccount).FirstOrDefault();//user表
               
               

                // 2. æŸ¥æ‰¾å½“前登录用户（执行操作的人）
@@ -262,7 +263,7 @@
                maint.MaintenanceStatus = 0;  // æ”¹å˜çŠ¶æ€ä¸ºä¸‹çº¿
                BaseDal.UpdateData(maint);

                var ip = LocalIP.Replace("::ffff:", "");
                var ip = LocalIP?.Replace("::ffff:", "") ?? ""; // å¦‚æžœ LocalIP æ˜¯ null，ip ä¼šæ˜¯ ""

                // 5. è®°å½•æ“ä½œæ—¥å¿—
                var recording = new Dt_MaintenanceTeam
@@ -539,7 +540,8 @@
                    }

                }
                var ip = LocalIP.Replace("::ffff:", "");
               
                var ip = LocalIP?.Replace("::ffff:", "") ?? ""; // å¦‚æžœ LocalIP æ˜¯ null，ip ä¼šæ˜¯ ""
                //如果满足下面的条件就开始
                maint.MaintenancStartTime = DateTime.Now;//记录开始时间
                maint.MaintenanceStatus = 1;//更改状态
@@ -561,7 +563,7 @@
                    Account = account,
                    MaintenanceStatus=1,
                    OperatorName = sysuer.UserTrueName,
                    TeamName = sysuer.RoleName,
                    TeamName = sysuer.Userteam,
                    DistributionTime = DateTime.Now,
                    IPAddress = addressIp,
                };
@@ -619,7 +621,7 @@
                            return new WebResponseContent
                            {
                                Status = false,
                                Message = "您是最后一个在场的组长，请等待所有组员完成检修后再结束"
                                Message = "您是最后一个在场的一级人员，请等待所有二级人员完成检修后再结束"
                            };
                        }
                    }
@@ -629,7 +631,7 @@
                //    return new WebResponseContent { Status = false, Message = "操作设备不同，请回到原本设备再点击结束检修" };
                //}
                var address = _ipaddress.QueryData(x => x.IPaddress == LocalIP).FirstOrDefault();
                var ip = LocalIP.Replace("::ffff:", "");
                var ip = LocalIP?.Replace("::ffff:", "") ?? ""; // å¦‚æžœ LocalIP æ˜¯ null，ip ä¼šæ˜¯ ""
                var addressIp = "";
                if (address != null) //找到了
                {
@@ -651,7 +653,7 @@
                    Account = account,
                    MaintenanceStatus = 0,
                    OperatorName = sysuer.UserTrueName,
                    TeamName = sysuer.RoleName,
                    TeamName = sysuer.Userteam,
                    IPAddress = addressIp,
                    EndTime = DateTime.Now,
                };

 ÏîÄ¿´úÂë/ºó¶Ë/WCS/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceTeamService.cs

@@ -114,7 +114,7 @@
                    a.RoleName,//角色名称
                    a.Unit,//单位
                    b.IPAddress,//电脑ip地址
                    b.OperatorName,
                    b.OperatorName,//姓名
                    b.TeamName,//班组
                    b.MaintenanceStatus,//检修状态
                    b.Creater,

 ÏîÄ¿´úÂë/ºó¶Ë/ºǫ́¹ÜÀí/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/Telescopic/Dt_MaintenanceTeam.cs

@@ -8,7 +8,7 @@

namespace WIDESEAWCS_Model.Models
{
    [SugarTable("Dt_MaintenanceTeam", "检修班组表")] //('数据库表名'，'数据库表备注')
    [SugarTable("Dt_MaintenanceTeam", "检修班组记录表")] //('数据库表名'，'数据库表备注')
    public class Dt_MaintenanceTeam : BaseEntity
    {
        /// <summary>
@@ -16,8 +16,6 @@
        /// </summary>
        [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
        public int ID { get; set; }



        /// <summary>
        /// è´¦å·
@@ -33,6 +31,17 @@



        /// <summary>
        /// ç­ç»„名
        /// </summary>
        [SugarColumn(Length = 50, IsNullable = true, ColumnDescription = "班组名")]
        public string TeamName { get; set; }

        /// <summary>
        /// ip地址
        /// </summary>
        [SugarColumn(Length = 50, IsNullable = true, ColumnDescription = "ip地址")]
        public string IPAddress { get; set; }


        /// <summary>
@@ -41,26 +50,21 @@
        [SugarColumn(Length = 50, IsNullable = true, ColumnDescription = "检修状态")]
        public int MaintenanceStatus { get; set; }

        /// <summary>
        /// ç­ç»„名
        /// </summary>
        [SugarColumn(Length = 50, IsNullable = true, ColumnDescription = "班组名")]
        public string TeamName { get; set; }


        /// <summary>
        /// ip地址
        /// </summary>
        [SugarColumn(Length = 50, IsNullable = true, ColumnDescription = "ip地址")]
        public string IPAddress { get; set; }

        /// <summary>
        /// åˆ†é…æ—¶é—´
        /// </summary>
        [SugarColumn(IsNullable = true, ColumnDescription = "分配时间")]
        public DateTime DistributionTime { get; set; }
        public DateTime? DistributionTime { get; set; }

       

        /// <summary>
        /// å®Œæˆæ£€ä¿®æ—¶é—´
        /// </summary>
        [SugarColumn(IsNullable = true, ColumnDescription = "完成检修时间")]
        public DateTime? EndTime { get; set; }






 ÏîÄ¿´úÂë/ºó¶Ë/ºǫ́¹ÜÀí/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/Sys_UserService.cs

@@ -29,7 +29,9 @@
        private readonly IRepository<Dt_Maintenance> _MainServer;
        private readonly IRepository<Sys_Role> _RoleServer;
        private readonly IRepository<Dt_AuthorizationRecord> _AuthorizatRecServer;
        public Sys_UserService(IRepository<Dt_AuthorizationRecord> AuthorizatRecServer ,IRepository<Sys_Role> RoleServer,IRepository<Dt_Loginhsy> LoginhsyServer,IRepository<Dt_FaceRecognition> faceServer, IRepository<Sys_User> repository, IUnitOfWorkManage unitOfWorkManage, ICacheService cacheService, ISys_MenuService menuService, IRepository<Dt_Maintenance> MainServer) : base(repository)
        private readonly IRepository<Sys_UserFace> _userFace;
        
        public Sys_UserService(IRepository<Sys_UserFace> _userFace,IRepository<Dt_AuthorizationRecord> AuthorizatRecServer ,IRepository<Sys_Role> RoleServer,IRepository<Dt_Loginhsy> LoginhsyServer,IRepository<Dt_FaceRecognition> faceServer, IRepository<Sys_User> repository, IUnitOfWorkManage unitOfWorkManage, ICacheService cacheService, ISys_MenuService menuService, IRepository<Dt_Maintenance> MainServer) : base(repository)
        {
            _faceServer = faceServer;
            _LoginhsyServer = LoginhsyServer;
@@ -731,10 +733,12 @@
                // ç™¾åº¦åˆ é™¤æˆåŠŸåŽï¼Œåˆ é™¤æ•°æ®åº“中的用户
                var user = BaseDal.QueryData(x => x.UserName == account).FirstOrDefault();
                var main = _MainServer.QueryData(x => x.UserAccount == account).FirstOrDefault();
                if (user != null && main != null)
                var face= _userFace.QueryData(x=>x.UserName== account).FirstOrDefault();
                if (user != null && main != null&&face!=null)
                {
                    BaseDal.DeleteData(user);
                    _MainServer.DeleteData(main);
                    _userFace.DeleteData(face);
                }
                return WebResponseContent.Instance.OK("用户删除成功");
                //}

 ÏîÄ¿´úÂë/ºó¶Ë/ºǫ́¹ÜÀí/WIDESEAWCS_Server/WIDESEAWCS_TelescopicService/MaintenanceTeamService.cs

@@ -38,11 +38,15 @@
                var main = Db.Queryable<Dt_MaintenanceTeam>();



                var query = sys.InnerJoin<Dt_MaintenanceTeam>((a, b) => a.UserTrueName == b.OperatorName)
                               ;


                //模糊查询
                var query = sys.InnerJoin<Dt_MaintenanceTeam>((a, b) => a.UserTrueName == b.OperatorName);
                if (!string .IsNullOrEmpty(pagination.searchKeyword))
                if (!string.IsNullOrEmpty(pagination.searchKeyword))
                {
                   

                    query = query.Where((a, b) =>
                       b.OperatorName.Contains(pagination.searchKeyword) ||
                       b.TeamName.Contains(pagination.searchKeyword) ||
@@ -50,7 +54,7 @@
                   );
                }
                //时间查询
                if (pagination.startDate.HasValue&&pagination.endDate.HasValue)
                if (pagination.startDate.HasValue && pagination.endDate.HasValue)
                {
                    query = query.Where((a, b) => b.DistributionTime >= pagination.startDate && b.DistributionTime <= pagination.endDate);
                }
@@ -78,24 +82,43 @@
                    query = query.OrderByDescending((a, b) => b.Creater);
                }

                //// å¦‚果不是管理员，根据部门过滤
                //if (pagination.account != "admin")
                //{
                //    var currentUser = _user.Db.Queryable<Sys_User>()
                //        .Where(u => u.UserName == pagination.account)
                //        .First();

                //    if (currentUser == null)
                //    {
                //        return new WebResponseContent { Status = false, Data = "未获取到用户信息" };
                //    }

                //    int? deptId = currentUser.Dept_Id;

                //    query = query.Where((a, b) => a.Dept_Id == deptId);
                //}


                //返回结果
                var result=query
                var result = query
                .Select((a, b) => new
                {

                    a.User_Id,
                    a.Dept_Id,//轨道站
                    a.IsLeader,//是否是班长
                    a.RoleName,
                    a.Role_Id,
                    a.RoleName,//角色名称
                    a.Unit,//单位
                    b.IPAddress,//电脑ip地址
                    b.OperatorName,
                    b.TeamName,
                    b.TeamName,//班组
                    b.MaintenanceStatus,//检修状态
                    b.Creater,
                    a.HeadImageUrl,
                    b.DistributionTime,
                    b.EndTime,
                    b.Modifier,

                }).ToPageList(pagination.pageIndex, pagination.pageSize, ref totalCount);
                return new WebResponseContent
                {
@@ -113,7 +136,7 @@
            catch (Exception ex)
            {

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

        }