From 6abdb18317bc59d4724564299cce5f97cdcc20d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E6=BD=87=E9=98=B3?= Date: Wed, 27 Sep 2023 10:04:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A0=BC=E5=BC=8F,=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=BE=AE=E4=BF=A1=E9=80=9A=E4=BF=A1=E4=B8=BB=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/SystemControllerController.cs | 127 +++++++++--------- 1 file changed, 65 insertions(+), 62 deletions(-) diff --git a/24Hour/Controllers/system/SystemControllerController.cs b/24Hour/Controllers/system/SystemControllerController.cs index d8cff4f..243601f 100644 --- a/24Hour/Controllers/system/SystemControllerController.cs +++ b/24Hour/Controllers/system/SystemControllerController.cs @@ -1,4 +1,5 @@ -using com.sun.xml.@internal.ws.api.model; +using com.sun.org.apache.bcel.@internal.generic; +using com.sun.xml.@internal.ws.api.model; using Elight.Entity; using Elight.Entity.SystemModel; using Elight.Logic; @@ -28,13 +29,15 @@ namespace _24Hour.Controllers.system private readonly WriteSysLog _logs;//操作日志 App_Sys_UserModel _userdata = new App_Sys_UserModel();//当前用户 private readonly ILogger _logger;//日志 + private readonly WechatMessagerClient wechatMessagerClient; Result result = new Result(); - public SystemControllerController(ILogger logger, SqlSugarClient db, WriteSysLog logs, User user) + public SystemControllerController(ILogger logger, SqlSugarClient db, WriteSysLog logs, User user, WechatMessagerClient _wechatMessagerClient) { _logger = logger; _db = db; _logs = logs; _userdata = user.Userdata(); + this.wechatMessagerClient = _wechatMessagerClient; } #endregion #region 用户管理 @@ -61,7 +64,7 @@ namespace _24Hour.Controllers.system [Route("QueryUserlist")] public async Task QueryUserlist() { - var Unitlist = await _db.Queryable().Where(q => q.IsDeleted == 0 && q.isdeactivate == 0 && q.usertype == 0 && q.unitCode == _userdata.unitCode && q.phone != "admin"&& q.usertype == 0).ToListAsync(); + var Unitlist = await _db.Queryable().Where(q => q.IsDeleted == 0 && q.isdeactivate == 0 && q.usertype == 0 && q.unitCode == _userdata.unitCode && q.phone != "admin" && q.usertype == 0).ToListAsync(); result.IsSucceed = true; result.result = Unitlist.OrderByDescending(q => q.createtime).ToList(); return result; @@ -85,7 +88,7 @@ namespace _24Hour.Controllers.system .WhereIF(!UserModel.phone.IsNull(), q => q.phone.Contains(UserModel.phone)) .WhereIF(!UserModel.duties.IsNull(), q => q.duties.Contains(UserModel.duties)) .WhereIF(!UserModel.cardId.IsNull(), q => q.cardId.Contains(UserModel.cardId)) - .Where(q => q.IsDeleted == 0 &&q.phone!="admin" && q.usertype == 0) + .Where(q => q.IsDeleted == 0 && q.phone != "admin" && q.usertype == 0) .ToPageListAsync(UserModel.PageIndex, UserModel.PageSize, totalNumber); UserModel.RowsCount = totalNumber; list.ForEach(q => @@ -134,7 +137,7 @@ namespace _24Hour.Controllers.system .WhereIF(!UserModel.phone.IsNull(), q => q.phone.Contains(UserModel.phone)) .WhereIF(!UserModel.duties.IsNull(), q => q.duties.Contains(UserModel.duties)) .WhereIF(!UserModel.cardId.IsNull(), q => q.cardId.Contains(UserModel.cardId)) - .WhereIF(UserModel.audit!=null, q => q.audit==UserModel.audit) + .WhereIF(UserModel.audit != null, q => q.audit == UserModel.audit) .Where(q => q.IsDeleted == 0 && q.usertype == 1).ToPageListAsync(UserModel.PageIndex, UserModel.PageSize, totalNumber); UserModel.RowsCount = totalNumber; var data = new QueryResult(UserModel, list); @@ -196,7 +199,7 @@ namespace _24Hour.Controllers.system { try { - var model = await _db.Queryable().Where(x => x.Id== UserModel.Id).FirstAsync(); + var model = await _db.Queryable().Where(x => x.Id == UserModel.Id).FirstAsync(); if (model == null) { result.IsSucceed = false; @@ -211,10 +214,10 @@ namespace _24Hour.Controllers.system return result; } - model.Password= newpass; + model.Password = newpass; _db.BeginTran(); - var num = await _db.Updateable(model).UpdateColumns(it => new { it.Password }).ExecuteCommandAsync(); + var num = await _db.Updateable(model).UpdateColumns(it => new { it.Password }).ExecuteCommandAsync(); _db.CommitTran(); if (num > 0) { @@ -243,16 +246,16 @@ namespace _24Hour.Controllers.system { try { - var model = await _db.Queryable().Where(x => x.Id== UserModel.Id).FirstAsync(); + var model = await _db.Queryable().Where(x => x.Id == UserModel.Id).FirstAsync(); if (model != null) { - model.unitCode=UserModel.unitCode; - model.department=UserModel.department; - model.name=UserModel.name; - model.sex=UserModel.sex; - model.duties=UserModel.duties; - model.phone=UserModel.phone; - model.cardId=UserModel.cardId; + model.unitCode = UserModel.unitCode; + model.department = UserModel.department; + model.name = UserModel.name; + model.sex = UserModel.sex; + model.duties = UserModel.duties; + model.phone = UserModel.phone; + model.cardId = UserModel.cardId; } _db.BeginTran(); var num = await _db.Updateable(model).UpdateColumns(it => new { it.unitCode, it.department, it.name, it.sex, it.duties, it.phone, it.cardId }).ExecuteCommandAsync(); @@ -272,21 +275,21 @@ namespace _24Hour.Controllers.system } _logs.WriteSysLogadd("用户管理", "修改人员信息", result, _db); return result; - } - + } + [HttpGet] - [Route("UserUnbindWechat")] - public async Task UserUnbindWechat() - { + [Route("UserUnbindWechat")] + public async Task UserUnbindWechat() + { try - { + { var model = await _db.Queryable().Where(x => x.Id == _userdata.Id && x.IsDeleted == 0).FirstAsync(); - if (model != null) - { - model.wechatId = string.Empty; + if (model != null) + { + model.wechatId = string.Empty; } - _db.BeginTran(); - var num = await _db.Updateable(model).UpdateColumns(it => new { it.wechatId }).ExecuteCommandAsync(); + _db.BeginTran(); + var num = await _db.Updateable(model).UpdateColumns(it => new { it.wechatId }).ExecuteCommandAsync(); //var num = await _db.Updateable(UserModel).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); _db.CommitTran(); if (num > 0) @@ -302,42 +305,42 @@ namespace _24Hour.Controllers.system result.Message = ex.Message; } _logs.WriteSysLogadd("用户管理", "修改人员信息", result, _db); - return result; - } - - /// - /// 用户绑定微信openid - /// - /// - /// + return result; + } + + /// + /// 用户绑定微信openid + /// + /// + /// [HttpGet] [Route("UserBindWechat")] - public async Task UserBindWechat(string code) - { + public async Task UserBindWechat(string code) + { try { var getopenid = await wechatMessagerClient.GetOpenId(code); - if (getopenid.IsSucceed == false) - { - return getopenid; - } - string openid = getopenid.result; - - if (await _db.Queryable().AnyAsync(x => x.wechatId == openid && x.IsDeleted == 0)) - { + if (getopenid.IsSucceed == false) + { + return getopenid; + } + string openid = getopenid.result; + + if (await _db.Queryable().AnyAsync(x => x.wechatId == openid && x.IsDeleted == 0)) + { result.IsSucceed = false; - result.Message = "当前微信已与其他账号绑定"; - return result; - } - - + result.Message = "当前微信已与其他账号绑定"; + return result; + } + + var model = await _db.Queryable().Where(x => x.Id == _userdata.Id && x.IsDeleted == 0).FirstAsync(); - if (model != null) - { - model.wechatId = getopenid.result; + if (model != null) + { + model.wechatId = getopenid.result; } - _db.BeginTran(); - var num = await _db.Updateable(model).UpdateColumns(it => new { it.wechatId }).ExecuteCommandAsync(); + _db.BeginTran(); + var num = await _db.Updateable(model).UpdateColumns(it => new { it.wechatId }).ExecuteCommandAsync(); //var num = await _db.Updateable(UserModel).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); _db.CommitTran(); if (num > 0) @@ -353,7 +356,7 @@ namespace _24Hour.Controllers.system result.Message = ex.Message; } _logs.WriteSysLogadd("用户管理", "修改人员信息", result, _db); - return result; + return result; } /// @@ -585,7 +588,7 @@ namespace _24Hour.Controllers.system /// 律师信息审核认证 [HttpGet] [Route("Examine")] - public async Task Examine(string Id, int status,string describe) + public async Task Examine(string Id, int status, string describe) { try { @@ -601,7 +604,7 @@ namespace _24Hour.Controllers.system if (num > 0) { result.IsSucceed = true; - result.result = status==0?"认证通过":"认证不通过"; + result.result = status == 0 ? "认证通过" : "认证不通过"; } } catch (System.Exception ex) @@ -770,7 +773,7 @@ namespace _24Hour.Controllers.system try { //查询角色下的菜单 - var list = await _db.Queryable().Where(q => q.roleId== RoleMenudata.Id).ToListAsync(); + var list = await _db.Queryable().Where(q => q.roleId == RoleMenudata.Id).ToListAsync(); _db.BeginTran(); //删除角色下的菜单 await _db.Deleteable(list).ExecuteCommandAsync(); @@ -1155,7 +1158,7 @@ namespace _24Hour.Controllers.system try { //添加单位前判断单位编码是否重复 - var data = await _db.Queryable().Where(q => q.departCode == Departdata.departCode && q.IsDelete==0).FirstAsync(); + var data = await _db.Queryable().Where(q => q.departCode == Departdata.departCode && q.IsDelete == 0).FirstAsync(); if (data != null) { @@ -1197,7 +1200,7 @@ namespace _24Hour.Controllers.system try { //判断单位编码是否已存在 - var data = await _db.Queryable().Where(q => q.departCode == Departdata.departCode && q.IsDelete==0).FirstAsync(); + var data = await _db.Queryable().Where(q => q.departCode == Departdata.departCode && q.IsDelete == 0).FirstAsync(); if (data != null) { @@ -1271,7 +1274,7 @@ namespace _24Hour.Controllers.system [Route("GetQueryMenulist")] public async Task GetQueryMenulist() { - var list = await _db.Queryable().Where(q => q.IsDelete == 0 || q.pid==null || q.pid == "").Select(q => new { q.Id, q.name }).ToListAsync(); + var list = await _db.Queryable().Where(q => q.IsDelete == 0 || q.pid == null || q.pid == "").Select(q => new { q.Id, q.name }).ToListAsync(); result.IsSucceed = true; result.result = list; return result;