From f3b0e9d9fe2042b3730fe944d9e3eb733fb417af Mon Sep 17 00:00:00 2001 From: liujiaqiang <1448951783@qq.com> Date: Wed, 21 Jun 2023 14:02:33 +0800 Subject: [PATCH] =?UTF-8?q?app=E6=9F=A5=E8=AF=A2=E9=A2=84=E7=BA=A6?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4=EF=BC=8C?= =?UTF-8?q?=E8=A7=86=E9=A2=91=E4=B8=BE=E6=8A=A5=E6=9F=A5=E8=AF=A2=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=B0=83=E6=95=B4=EF=BC=8C=E7=99=BB=E5=BD=95=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=8F=82=E6=95=B0=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 24Hour/Controllers/Common/CommonController.cs | 46 +++++++++---------- 24Hour/Controllers/Common/RemoteController.cs | 2 +- 24Hour/Controllers/Common/VideoController.cs | 11 +++-- .../Controllers/Common/WebSocketController.cs | 2 +- 24Hour/Controllers/LoginController.cs | 11 +++-- .../logs/Logs/ExceptionLog/20230620/20.log | 12 +++++ .../logs/Logs/ExceptionLog/20230621/11.log | 12 +++++ .../AppMode/App_LawyerServicesModel.cs | 8 +++- Elight.Logic/Model/App_LawyerServicesInput.cs | 8 +++- Elight.Logic/Model/Commonpage.cs | 2 + 10 files changed, 78 insertions(+), 36 deletions(-) create mode 100644 24Hour/wwwroot/CaseFile/logs/Logs/ExceptionLog/20230620/20.log create mode 100644 24Hour/wwwroot/CaseFile/logs/Logs/ExceptionLog/20230621/11.log diff --git a/24Hour/Controllers/Common/CommonController.cs b/24Hour/Controllers/Common/CommonController.cs index b621845..fd5f26b 100644 --- a/24Hour/Controllers/Common/CommonController.cs +++ b/24Hour/Controllers/Common/CommonController.cs @@ -235,6 +235,7 @@ namespace _24Hour.Controllers.Common ettime = "", creationtime = q.creationtime, receptionuser = q.receptionuser, + receive= q.receptionuser, username = userda?.name, notes = q.notes }); @@ -266,7 +267,8 @@ namespace _24Hour.Controllers.Common creationtime = q.creationtime, receptionuser = q.meetwitId, username = q.meetwitname, - notes=q.notes, + receive = q.meetwitId, + notes =q.notes, appurl=q.appurl }); }); @@ -297,13 +299,13 @@ namespace _24Hour.Controllers.Common creationtime = q.creationtime, receptionuser = q.meetwitId, username = q.meetwitname, + receive = q.meetwitId, notes = q.notes, appurl = "" }); }); //分页查询--如有预约类型--reservationId可筛选预约类型,预约信息Id--可筛选预约信息 - list = list.WhereIF(Commondata.reservationId.NotNull(),x=>x.daId== Commondata.reservationId) - .WhereIF(Commondata.Id.NotNull(), x => x.Id == Commondata.Id) + list = list.WhereIF(Commondata.matter.NotNull(),x=>x.matter.Contains(Commondata.matter)|| x.title.Contains(Commondata.matter) || x.name.Contains(Commondata.matter) || x.objectstr.Contains(Commondata.matter)) .Skip(Commondata.PageSize * (Commondata.PageIndex - 1)).Take(Commondata.PageSize).ToList(); result.IsSucceed = true; result.result = list.ToList().OrderByDescending(q => q.creationtime).ToList(); @@ -357,6 +359,7 @@ namespace _24Hour.Controllers.Common ettime = "", creationtime = q.creationtime, receptionuser = q.receptionuser, + receive = q.createuserId, username = userda?.name, notes = q.notes }); @@ -387,6 +390,7 @@ namespace _24Hour.Controllers.Common creationtime = q.creationtime, receptionuser = q.meetwitId, username = q.meetwitname, + receive = q.createuserId, notes = q.notes, appurl = q.appurl }); @@ -416,6 +420,7 @@ namespace _24Hour.Controllers.Common ettime = q.ettime, creationtime = q.creationtime, receptionuser = q.meetwitId, + receive = q.createuserId, username = q.meetwitname, notes = q.notes, appurl = "" @@ -442,7 +447,7 @@ namespace _24Hour.Controllers.Common // username = q.createusername // }); //}); - list = list.WhereIF(Commondata.matter.NotNull(), q => q.matter.Contains(Commondata.matter) || q.objectstr.Contains(Commondata.matter)).Skip(Commondata.PageSize * (Commondata.PageIndex - 1)).Take(Commondata.PageSize).ToList(); + list = list.WhereIF(Commondata.matter.NotNull(), x => x.matter.Contains(Commondata.matter) || x.title.Contains(Commondata.matter) || x.name.Contains(Commondata.matter) || x.objectstr.Contains(Commondata.matter)).Skip(Commondata.PageSize * (Commondata.PageIndex - 1)).Take(Commondata.PageSize).ToList(); result.IsSucceed = true; result.result = list.ToList().OrderByDescending(q => q.creationtime).ToList(); @@ -475,6 +480,7 @@ namespace _24Hour.Controllers.Common if (Lawyerbol.Count() > 0) { Lawyerbol.FirstOrDefault().receptionuser = userId; + Lawyerbol.FirstOrDefault().receptionusername = username; _db.BeginTran(); var num = await _db.Updateable(Lawyerbol.FirstOrDefault()).UpdateColumns(it => new { it.receptionuser }).ExecuteCommandAsync(); _db.CommitTran(); @@ -485,20 +491,6 @@ namespace _24Hour.Controllers.Common result.result = "修改成功"; } } - //听证服务 - var Hearingbol = await _db.Queryable().Where(q => q.Id == Id).ToListAsync(); - if (Hearingbol.Count() > 0) - { - Hearingbol.FirstOrDefault().receptionuser = userId; - _db.BeginTran(); - var num = await _db.Updateable(Hearingbol.FirstOrDefault()).UpdateColumns(it => new { it.receptionuser }).ExecuteCommandAsync(); - _db.CommitTran(); - if (num > 0) - { - result.IsSucceed = true; - result.result = "修改成功"; - } - } //远程会见 var RemoteModelbol = await _db.Queryable().Where(q => q.Id == Id).ToListAsync(); if (RemoteModelbol.Count() > 0) @@ -556,10 +548,12 @@ namespace _24Hour.Controllers.Common var list = new List(); //获取工作台信息 var Stagingdata = await _db.Queryable().Where(q => q.IsDelete == 0).ToArrayAsync(); - //获取律师服务预约记录 + //获取律师服务预约记录--判断单位，查询不同数据信息 var Lawyerdata = await _db.Queryable() .WhereIF(Commondata.state!=null, x => x.state == Commondata.state) - .Where(q => q.IsDeleted == 0 && q.createuserId == _userdata.Id).ToArrayAsync(); + .WhereIF(Commondata.unitId.NotNull(), x => x.createuserId == _userdata.Id) + .WhereIF(!Commondata.unitId.NotNull(), x => x.receptionuser == _userdata.Id) + .Where(q => q.IsDeleted == 0).ToArrayAsync(); Lawyerdata.ToList().ForEach(q => { var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault(); @@ -578,10 +572,12 @@ namespace _24Hour.Controllers.Common creationtime = q.creationtime }); }); - //获取远程会见预约记录 + //获取远程会见预约记录--判断单位，查询不同数据信息 var Remotedata = await _db.Queryable() .WhereIF(Commondata.state!=null, x => x.state == Commondata.state) - .Where(q => q.IsDeleted == 0 && q.createuserId == _userdata.Id).ToArrayAsync(); + .WhereIF(Commondata.unitId.NotNull(), x => x.createuserId == _userdata.Id) + .WhereIF(!Commondata.unitId.NotNull(), x => x.meetwitId == _userdata.Id) + .Where(q => q.IsDeleted == 0).ToArrayAsync(); Remotedata.ToList().ForEach(q => { var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault(); @@ -600,10 +596,12 @@ namespace _24Hour.Controllers.Common creationtime = q.creationtime }); }); - //获取远程接待预约记录 + //获取远程接待预约记录--判断单位，查询不同数据信息 var Receptiondata = await _db.Queryable() .WhereIF(Commondata.state!=null, x => x.state == Commondata.state) - .Where(q => q.IsDeleted == 0 && q.createuserId == _userdata.Id).ToArrayAsync(); + .WhereIF(Commondata.unitId.NotNull(), x => x.createuserId == _userdata.Id) + .WhereIF(!Commondata.unitId.NotNull(), x => x.meetwitId == _userdata.Id) + .Where(q => q.IsDeleted == 0).ToArrayAsync(); Receptiondata.ToList().ForEach(q => { var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault(); diff --git a/24Hour/Controllers/Common/RemoteController.cs b/24Hour/Controllers/Common/RemoteController.cs index 38dd96a..a6460e7 100644 --- a/24Hour/Controllers/Common/RemoteController.cs +++ b/24Hour/Controllers/Common/RemoteController.cs @@ -281,7 +281,7 @@ namespace _24Hour.Controllers.Common /// 办理人Id /// 办理人名称 /// - [HttpGet] + [HttpPost] [Route("UpdateRemotestate")] public async Task UpdateRemotestate(App_Remoteput Remoteput) { diff --git a/24Hour/Controllers/Common/VideoController.cs b/24Hour/Controllers/Common/VideoController.cs index 3b41d69..522b690 100644 --- a/24Hour/Controllers/Common/VideoController.cs +++ b/24Hour/Controllers/Common/VideoController.cs @@ -2,6 +2,7 @@ using Elight.Logic; using Elight.Utility; using Elight.Utility.Code; +using javax.xml.crypto; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Newtonsoft.Json; @@ -43,18 +44,20 @@ namespace _24Hour.Controllers.Common [Route("QueryVideolist")] public async Task QueryVideolist(App_VideoInput Videodata) { + RefAsync totalNumber = 0;//总数据 var Videolist = new List(); //查询视频举报记录 var list = await _db.Queryable() .WhereIF(Videodata.reporting != null, q => q.reporting.Contains(Videodata.reporting)) - .WhereIF(Videodata.anonymous != null, q => q.anonymous == Videodata.anonymous) .WhereIF(Videodata.state != null, q => q.state == Videodata.state) .WhereIF(Videodata.StartTime != null && Videodata.EndTime != null, q => q.creationtime >= Videodata.StartTime && q.creationtime < Videodata.EndTime.Value.AddDays(1)) - .Where(q => q.IsDeleted == 0 && q.unitId == _userdata.unitCode).ToPageListAsync(Videodata.PageIndex, Videodata.PageSize); + .Where(q => q.IsDeleted == 0 && q.unitId == _userdata.unitCode).ToPageListAsync(Videodata.PageIndex, Videodata.PageSize, totalNumber); + Videodata.RowsCount = totalNumber; list.OrderByDescending(q => q.creationtime).ToList().ForEach(q => { Videolist.Add(new { + Id = q.Id, name = q.anonymous == 0 ? "匿名" : q.createusername, reporting = q.reporting, videofile = q.videofile, @@ -65,7 +68,7 @@ namespace _24Hour.Controllers.Common }); }); result.IsSucceed = true; - result.result = Videolist; + result.result =new { Paging = Videodata, Data = Videolist }; return result; } /// @@ -215,7 +218,7 @@ namespace _24Hour.Controllers.Common var Video = await _db.Queryable().Where(q => q.Id == Id).ToArrayAsync(); if (Video.Any()) { - Video.FirstOrDefault().state = 1; + Video.FirstOrDefault().state = state; _db.BeginTran(); var num = await _db.Updateable(Video.FirstOrDefault()).UpdateColumns(it => new { it.state}).ExecuteCommandAsync(); _db.CommitTran(); diff --git a/24Hour/Controllers/Common/WebSocketController.cs b/24Hour/Controllers/Common/WebSocketController.cs index 678f2a9..1f2064b 100644 --- a/24Hour/Controllers/Common/WebSocketController.cs +++ b/24Hour/Controllers/Common/WebSocketController.cs @@ -267,7 +267,7 @@ namespace _24Hour.Controllers.Common { userzx.Add(_userdata.Id, "1"); } - //判断接收人是否在线， + //判断接收人检察官是否在线， if (_userdata.usertype == 1 && userzx.ContainsKey(Senddata.recipient)) { result.IsSucceed = false; diff --git a/24Hour/Controllers/LoginController.cs b/24Hour/Controllers/LoginController.cs index 724bbca..5f39f06 100644 --- a/24Hour/Controllers/LoginController.cs +++ b/24Hour/Controllers/LoginController.cs @@ -6,6 +6,7 @@ using Elight.Utility.Code; using Elight.Utility.Encrypt; using Elight.Utility.Extensions; using Elight.Utility.logs; +using java.security; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Configuration; @@ -94,11 +95,13 @@ namespace _24Hour.Controllers var tokenString = new JwtSecurityTokenHandler().WriteToken(jwttoken); ret.result = new { + Id = date.Id, name = date.name, sex = date.sex, phone = date.phone, photo = date.photo, duties = date.duties, + identity=date.identity, unitCode = "", department = "", token = tokenString @@ -173,13 +176,13 @@ namespace _24Hour.Controllers var tokenString = new JwtSecurityTokenHandler().WriteToken(jwttoken); ret.result = new { + Id = date.Id, name = date.name, sex = date.sex, phone = date.phone, photo = date.photo, duties = date.duties, - unitCode = "", - department = "", + identity = date.identity, token = tokenString }; #endregion @@ -313,13 +316,13 @@ namespace _24Hour.Controllers var tokenString = new JwtSecurityTokenHandler().WriteToken(jwttoken); ret.result = new { + Id = date.Id, name = date.name, sex = date.sex, phone = date.phone, photo = date.photo, duties = date.duties, - unitCode = "", - department = "", + identity = date.identity, token = tokenString }; #endregion diff --git a/24Hour/wwwroot/CaseFile/logs/Logs/ExceptionLog/20230620/20.log b/24Hour/wwwroot/CaseFile/logs/Logs/ExceptionLog/20230620/20.log new file mode 100644 index 0000000..776b862 --- /dev/null +++ b/24Hour/wwwroot/CaseFile/logs/Logs/ExceptionLog/20230620/20.log @@ -0,0 +1,12 @@ +日志时间:2023-06-20 20:23:30 +************************Exception Start******************************** +Exception Remark：添加数据库日志信息_WriteSysLog_1 发生异常 +Exception Date:2023/6/20 20:23:30 +Exception Type:MySqlConnector.MySqlException +Exception Message:Data too long for column 'OperatingManual' at row 1 +Exception Source:SqlSugar +Exception StackTrace: at SqlSugar.AdoProvider.ExecuteCommand(String sql, SugarParameter[] parameters) + at SqlSugar.InsertableProvider`1.ExecuteCommand() + at Elight.Logic.WriteSysLog.WriteSysLogadd(String operationType, String content, Result result, SqlSugarClient _db, String opeCasDepAccCas) in E:\Code\24Hour.Service\Elight.Logic\WriteSysLog.cs:line 52 +************************Exception End************************************ + diff --git a/24Hour/wwwroot/CaseFile/logs/Logs/ExceptionLog/20230621/11.log b/24Hour/wwwroot/CaseFile/logs/Logs/ExceptionLog/20230621/11.log new file mode 100644 index 0000000..bbef12c --- /dev/null +++ b/24Hour/wwwroot/CaseFile/logs/Logs/ExceptionLog/20230621/11.log @@ -0,0 +1,12 @@ +日志时间:2023-06-21 11:44:41 +************************Exception Start******************************** +Exception Remark：添加数据库日志信息_WriteSysLog_1 发生异常 +Exception Date:2023/6/21 11:44:41 +Exception Type:MySqlConnector.MySqlException +Exception Message:Data too long for column 'OperatingManual' at row 1 +Exception Source:SqlSugar +Exception StackTrace: at SqlSugar.AdoProvider.ExecuteCommand(String sql, SugarParameter[] parameters) + at SqlSugar.InsertableProvider`1.ExecuteCommand() + at Elight.Logic.WriteSysLog.WriteSysLogadd(String operationType, String content, Result result, SqlSugarClient _db, String opeCasDepAccCas) in E:\Code\24Hour.Service\Elight.Logic\WriteSysLog.cs:line 52 +************************Exception End************************************ + diff --git a/Elight.Entity/AppMode/App_LawyerServicesModel.cs b/Elight.Entity/AppMode/App_LawyerServicesModel.cs index 169a8dd..cfa8da9 100644 --- a/Elight.Entity/AppMode/App_LawyerServicesModel.cs +++ b/Elight.Entity/AppMode/App_LawyerServicesModel.cs @@ -61,11 +61,17 @@ namespace Elight.Entity public string? objectstr { get; set; } /// - /// 接待人 + /// 接待人Id /// [DataMember] public string? receptionuser { get; set; } + /// + /// 接待人名称 + /// + [DataMember] + public string? receptionusername { get; set; } + /// /// 备注 /// diff --git a/Elight.Logic/Model/App_LawyerServicesInput.cs b/Elight.Logic/Model/App_LawyerServicesInput.cs index f6c8ef3..ebaea99 100644 --- a/Elight.Logic/Model/App_LawyerServicesInput.cs +++ b/Elight.Logic/Model/App_LawyerServicesInput.cs @@ -60,11 +60,17 @@ namespace Elight.Logic public string? objectstr { get; set; } /// - /// 接待人 + /// 接待人Id /// [DataMember] public string? receptionuser { get; set; } + /// + /// 接待人名称 + /// + [DataMember] + public string? receptionusername { get; set; } + /// /// 备注 /// diff --git a/Elight.Logic/Model/Commonpage.cs b/Elight.Logic/Model/Commonpage.cs index a13dba1..a78b5f9 100644 --- a/Elight.Logic/Model/Commonpage.cs +++ b/Elight.Logic/Model/Commonpage.cs @@ -17,6 +17,8 @@ namespace Elight.Logic [DataMember] public string? Id { get; set; } + [DataMember] + public string? unitId { get; set; } /// /// 开始时间 ///