diff --git a/24Hour/Controllers/Common/CommonController.cs b/24Hour/Controllers/Common/CommonController.cs index dd6c5dc..c5f354b 100644 --- a/24Hour/Controllers/Common/CommonController.cs +++ b/24Hour/Controllers/Common/CommonController.cs @@ -63,11 +63,11 @@ namespace _24Hour.Controllers.Common var list = new List(); //获取工作台信息 var Stagingdata = await _db.Queryable().Where(q => q.IsDelete == 0).ToArrayAsync(); - var Userdata = await _db.Queryable().Where(q => q.usertype == 0 && q.unitCode == _userdata.unitCode).ToArrayAsync(); + var Userdata = await _db.Queryable().Where(q => q.usertype == 0 ).ToArrayAsync(); //获取律师服务预约记录 var Lawyerdata = await _db.Queryable() .WhereIF(Commondata.state != null, x => x.state == Commondata.state) - .Where(q => q.IsDeleted == 0 && q.unitCode == _userdata.unitCode).ToListAsync(); + .Where(q => q.IsDeleted == 0 ).ToListAsync(); Lawyerdata.ToList().ForEach(q => { var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault(); @@ -96,7 +96,7 @@ namespace _24Hour.Controllers.Common //获取远程会见预约记录 var Remotedata = await _db.Queryable() .WhereIF(Commondata.state != null, x => x.state == Commondata.state) - .Where(q => q.IsDeleted == 0 && q.unitCode == _userdata.unitCode).ToArrayAsync(); + .Where(q => q.IsDeleted == 0).ToArrayAsync(); Remotedata.ToList().ForEach(q => { var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault(); @@ -122,7 +122,7 @@ namespace _24Hour.Controllers.Common //获取远程接待预约记录 var Receptiondata = await _db.Queryable() .WhereIF(Commondata.state != null, x => x.state == Commondata.state) - .Where(q => q.IsDeleted == 0 && q.unitCode == _userdata.unitCode).ToArrayAsync(); + .Where(q => q.IsDeleted == 0).ToArrayAsync(); Receptiondata.ToList().ForEach(q => { var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault(); @@ -149,7 +149,7 @@ namespace _24Hour.Controllers.Common //获取认罪认罚预约记录 var Confessiondata = await _db.Queryable() .WhereIF(Commondata.state != null, x => x.state == Commondata.state) - .Where(q => q.IsDeleted == 0 && q.unitCode == _userdata.unitCode).ToArrayAsync(); + .Where(q => q.IsDeleted == 0).ToArrayAsync(); Confessiondata.ToList().ForEach(q => { var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault(); @@ -175,7 +175,7 @@ namespace _24Hour.Controllers.Common //获取听证预约记录 var Hearingdata = await _db.Queryable() .WhereIF(Commondata.state != null, x => x.state == Commondata.state) - .Where(q => q.IsDeleted == 0 && q.unitCode == _userdata.unitCode).ToArrayAsync(); + .Where(q => q.IsDeleted == 0).ToArrayAsync(); Hearingdata.ToList().ForEach(q => { var da = Stagingdata.Where(x => x.Id == q.reservationId).FirstOrDefault(); @@ -238,55 +238,85 @@ namespace _24Hour.Controllers.Common //获取律师服务预约记录 var list = await _db.Queryable() .Where(q => q.IsDeleted == 0 && q.Id == Id).ToListAsync(); - var unitdal = _Unitdata.Where(q => q.unitCode == list.FirstOrDefault().unitCode).FirstOrDefault(); - list.FirstOrDefault().unitCode = unitdal.unitname; - result.result = list.FirstOrDefault(); + if (list.Count>0) + { + var unitdal = _Unitdata.Where(q => q.unitCode == list.FirstOrDefault().unitCode).FirstOrDefault(); + if (unitdal!= null) + { + list.FirstOrDefault().unitCode = unitdal.unitname; + } + result.result = list.FirstOrDefault(); + } + else + { + result.result =null; + } break; case 1: //获取远程会见预约记录 var Remotedata = await _db.Queryable() .Where(q => q.IsDeleted == 0 && q.Id == Id).ToListAsync(); - var unitdatote = _Unitdata.Where(q => q.unitCode == Remotedata.FirstOrDefault().unitCode).FirstOrDefault(); - Remotedata.FirstOrDefault().unitCode = unitdatote.unitname; - result.result = Remotedata.FirstOrDefault(); + if (Remotedata.Count>0) + { + var unitdatote = _Unitdata.Where(q => q.unitCode == Remotedata.FirstOrDefault().unitCode).FirstOrDefault(); + if (unitdatote!= null) + Remotedata.FirstOrDefault().unitCode = unitdatote.unitname; + result.result = Remotedata.FirstOrDefault(); + } break; case 2: //获取远程接待预约记录 var Receptiondata = await _db.Queryable() .Where(q => q.IsDeleted == 0 && q.Id == Id).ToListAsync(); - var unitdatR = _Unitdata.Where(q => q.unitCode == Receptiondata.FirstOrDefault().unitCode).FirstOrDefault(); - Receptiondata.FirstOrDefault().unitCode = unitdatR.unitname; - result.result = Receptiondata.FirstOrDefault(); + if (Receptiondata.Count>0) + { + var unitdatR = _Unitdata.Where(q => q.unitCode == Receptiondata.FirstOrDefault().unitCode).FirstOrDefault(); + if (unitdatR!= null) + Receptiondata.FirstOrDefault().unitCode = unitdatR.unitname; + result.result = Receptiondata.FirstOrDefault(); + } break; case 3: //获取听证预约记录 var Hearingdata = await _db.Queryable() .Where(q => q.IsDeleted == 0 && q.Id == Id).ToListAsync(); - var unitdata = _Unitdata.Where(q => q.unitCode == Hearingdata.FirstOrDefault().unitCode).FirstOrDefault(); - Hearingdata.FirstOrDefault().unitCode = unitdata.unitname; - result.result = Hearingdata.FirstOrDefault(); + if (Hearingdata.Count>0) + { + var unitdata = _Unitdata.Where(q => q.unitCode == Hearingdata.FirstOrDefault().unitCode).FirstOrDefault(); + if (unitdata!= null) + Hearingdata.FirstOrDefault().unitCode = unitdata.unitname; + result.result = Hearingdata.FirstOrDefault(); + } break; case 4: //获取文书签收记录 var Documentdata = await _db.Queryable() .Where(q => q.Id == Id).ToListAsync(); - var unitda = _Unitdata.Where(q => q.unitCode == Documentdata.FirstOrDefault().dwbm).FirstOrDefault(); - Documentdata.FirstOrDefault().dwbm = unitda.unitname; - result.result = Documentdata.FirstOrDefault(); + if (Documentdata.Count>0) + { + var unitda = _Unitdata.Where(q => q.unitCode == Documentdata.FirstOrDefault().dwbm).FirstOrDefault(); + if (unitda!= null) + Documentdata.FirstOrDefault().dwbm = unitda.unitname; + result.result = Documentdata.FirstOrDefault(); + } break; case 5: //获取云柜记录 var CloudCabinetdata = await _db.Queryable() .Where(q => q.Id == Id).ToListAsync(); - var unitdat = _Unitdata.Where(q => q.unitCode == CloudCabinetdata.FirstOrDefault().dwbm).FirstOrDefault(); - CloudCabinetdata.FirstOrDefault().dwbm = unitdat.unitname; - result.result = CloudCabinetdata.FirstOrDefault(); + if (CloudCabinetdata.Count>0) + { + var unitdat = _Unitdata.Where(q => q.unitCode == CloudCabinetdata.FirstOrDefault().dwbm).FirstOrDefault(); + CloudCabinetdata.FirstOrDefault().dwbm = unitdat.unitname; + result.result = CloudCabinetdata.FirstOrDefault(); + } break; case 6: //获取认罪认罚预约记录 var Confessiondata = await _db.Queryable() .Where(q => q.IsDeleted == 0 && q.Id == Id).ToListAsync(); - result.result = Confessiondata.FirstOrDefault(); + if (Confessiondata.Count>0) + result.result = Confessiondata.FirstOrDefault(); break; } result.IsSucceed = true; @@ -550,6 +580,12 @@ namespace _24Hour.Controllers.Common try { var list = new List(); + if (string.IsNullOrEmpty(_userdata.department)) + { + result.IsSucceed = true; + result.result=list; + return result; + } //获取工作台信息 var Stagingdata = await _db.Queryable().Where(q => q.IsDelete == 0).ToArrayAsync(); var Userdata = await _db.Queryable().Where(q => q.IsDeleted == 0 && q.usertype == 0).ToArrayAsync(); @@ -886,6 +922,13 @@ namespace _24Hour.Controllers.Common //获取工作台信息 var Stagingdata = await _db.Queryable().Where(q => q.IsDelete == 0).ToArrayAsync(); var Userdata = await _db.Queryable().Where(q => q.IsDeleted == 0 && q.usertype == 0).ToArrayAsync(); + if (string.IsNullOrEmpty(_userdata.department)) + { + result.IsSucceed = true; + result.result=list; + return result; + } + //获取律师服务预约记录 var Lawyerdata = await _db.Queryable().WhereIF(!string.IsNullOrEmpty(_userdata.department), x => x.receptionuser==_userdata.department) .Where(q => q.IsDeleted == 0 && !string.IsNullOrEmpty(q.receptionuser) && q.state != 2 && q.state != 3).ToArrayAsync(); @@ -1182,6 +1225,7 @@ namespace _24Hour.Controllers.Common { try { + var newmodel = _userdata; if (dto == null) { result.IsSucceed = false; @@ -1227,8 +1271,8 @@ namespace _24Hour.Controllers.Common Lawyerbol.FirstOrDefault().acceptancetime = dto.time; Lawyerbol.FirstOrDefault().reason = dto.reason; Lawyerbol.FirstOrDefault().state = Convert.ToInt32(dto.state); - Lawyerbol.FirstOrDefault().operatorId =_userdata.Id; - Lawyerbol.FirstOrDefault().operatorName = _userdata.name; + Lawyerbol.FirstOrDefault().operatorId =newmodel.Id; + Lawyerbol.FirstOrDefault().operatorName = newmodel.name; } else { @@ -1236,7 +1280,7 @@ namespace _24Hour.Controllers.Common Lawyerbol.FirstOrDefault().receptionusername = dto.username; } _db.BeginTran(); - var num = await _db.Updateable(Lawyerbol.FirstOrDefault()).UpdateColumns(it => new { it.receptionuser, it.receptionusername, it.acceptancetime, it.reason, it.state,it.operatorId,it.operatorName }).ExecuteCommandAsync(); + var num = await _db.Updateable(Lawyerbol.FirstOrDefault()).UpdateColumns(it => new { it.receptionuser, it.receptionusername, it.acceptancetime, it.reason, it.state, it.operatorId, it.operatorName }).ExecuteCommandAsync(); _db.CommitTran(); if (num > 0) { @@ -1255,8 +1299,8 @@ namespace _24Hour.Controllers.Common RemoteModelbol.FirstOrDefault().acceptancetime = dto.time; RemoteModelbol.FirstOrDefault().reason = dto.reason; RemoteModelbol.FirstOrDefault().state = Convert.ToInt32(dto.state); - RemoteModelbol.FirstOrDefault().operatorId =_userdata.Id; - RemoteModelbol.FirstOrDefault().operatorName = _userdata.name; + RemoteModelbol.FirstOrDefault().operatorId =newmodel.Id; + RemoteModelbol.FirstOrDefault().operatorName = newmodel.name; } else { @@ -1283,8 +1327,8 @@ namespace _24Hour.Controllers.Common Receptiondata.FirstOrDefault().acceptancetime = dto.time; Receptiondata.FirstOrDefault().reason = dto.reason; Receptiondata.FirstOrDefault().state = Convert.ToInt32(dto.state); - Receptiondata.FirstOrDefault().operatorId =_userdata.Id; - Receptiondata.FirstOrDefault().operatorName = _userdata.name; + Receptiondata.FirstOrDefault().operatorId =newmodel.Id; + Receptiondata.FirstOrDefault().operatorName = newmodel.name; } else { @@ -1310,8 +1354,8 @@ namespace _24Hour.Controllers.Common Confessiondata.FirstOrDefault().acceptancetime = dto.time; Confessiondata.FirstOrDefault().reason = dto.reason; Confessiondata.FirstOrDefault().state =Convert.ToInt32(dto.state); - Confessiondata.FirstOrDefault().operatorId =_userdata.Id; - Confessiondata.FirstOrDefault().operatorName = _userdata.name; + Confessiondata.FirstOrDefault().operatorId =newmodel.Id; + Confessiondata.FirstOrDefault().operatorName = newmodel.name; } else { @@ -1338,8 +1382,8 @@ namespace _24Hour.Controllers.Common Hearingdata.FirstOrDefault().acceptancetime = dto.time; Hearingdata.FirstOrDefault().reason = dto.reason; Hearingdata.FirstOrDefault().state = Convert.ToInt32(dto.state); - Confessiondata.FirstOrDefault().operatorId =_userdata.Id; - Confessiondata.FirstOrDefault().operatorName = _userdata.name; + Hearingdata.FirstOrDefault().operatorId =newmodel.Id; + Hearingdata.FirstOrDefault().operatorName = newmodel.name; } else { diff --git a/24Hour/Controllers/Common/VideoController.cs b/24Hour/Controllers/Common/VideoController.cs index 9d2bb00..19f255e 100644 --- a/24Hour/Controllers/Common/VideoController.cs +++ b/24Hour/Controllers/Common/VideoController.cs @@ -18,8 +18,9 @@ namespace _24Hour.Controllers.Common [ApiController] [Route("api/Video")] public class VideoController : Controller - { + { #region Identity + //private readonly IHostingEnvironment _hostingEnvironment; private readonly SqlSugarClient _db;//数据库 private readonly WriteSysLog _logs;//操作日志 App_Sys_UserModel _userdata = new App_Sys_UserModel();//当前用户 @@ -98,7 +99,7 @@ namespace _24Hour.Controllers.Common videofile = q.videofile, creationtime = q.creationtime, notes = q.notes, - annexurl =JsonConvert.DeserializeObject(q.annexurl), + annexurl = JsonConvert.DeserializeObject(q.annexurl), contact = q.anonymous == 0 ? "" : q.contact }); }); @@ -223,7 +224,7 @@ namespace _24Hour.Controllers.Common { Video.FirstOrDefault().state = state; _db.BeginTran(); - var num = await _db.Updateable(Video.FirstOrDefault()).UpdateColumns(it => new { it.state}).ExecuteCommandAsync(); + var num = await _db.Updateable(Video.FirstOrDefault()).UpdateColumns(it => new { it.state }).ExecuteCommandAsync(); _db.CommitTran(); if (num > 0) { @@ -246,7 +247,100 @@ namespace _24Hour.Controllers.Common } _logs.WriteSysLogadd("视频举报管理", "修改视频举报", result, _db); return result; - } + } + /// + /// 下载 + /// + /// + /// + /// + [HttpGet] + [Route("Download")] + public FileResult Download(string path) + { + var dic = Path.Combine(Environment.CurrentDirectory, "wwwroot"); + if (!string.IsNullOrEmpty(path)) + dic += path; + if (!System.IO.File.Exists(dic)) + { + throw new Exception("数据不存在"); + } + try + { + string la = path.Split(".").LastOrDefault(); + string filename = dic; + FileStream fileStream = new FileStream(filename, FileMode.Open, FileAccess.Read, FileShare.Read); + byte[] bytes = new byte[fileStream.Length]; + fileStream.Read(bytes, 0, bytes.Length); + fileStream.Close(); + Stream stream = new MemoryStream(bytes); + return File(stream, contentType("."+la), DateTime.Now.ToString("yyyyMMddHHmmss")+"."+la); + } + catch (Exception) + { + + throw; + } + } + + private static string contentType(string FilenameExtension) + { + if (FilenameExtension.Contains(".BMP") || FilenameExtension.Contains(".bmp") + || FilenameExtension.ToUpper().Contains(".BMP")) + { + return "image/bmp"; + } + if (FilenameExtension.Contains(".GIF") || FilenameExtension.Contains(".gif") + || FilenameExtension.ToUpper().Contains(".GIF")) + { + return "image/gif"; + } + if (FilenameExtension.Contains(".JPEG") || FilenameExtension.Contains(".jpeg") || FilenameExtension.Contains(".JPG") + || FilenameExtension.Contains(".jpg") || FilenameExtension.Contains(".PNG") + || FilenameExtension.Contains(".png") || FilenameExtension.ToUpper().Contains(".JPEG") + || FilenameExtension.ToUpper().Contains(".JPG") || FilenameExtension.ToUpper().Contains(".PNG")) + { + return "image/jpeg"; + } + if (FilenameExtension.Contains(".HTML") || FilenameExtension.Contains(".html")) + { + return "text/html"; + } + if (FilenameExtension.Contains(".TXT") || FilenameExtension.Contains(".txt") + || FilenameExtension.ToUpper().Contains(".TXT")) + { + return "text/plain"; + } + if (FilenameExtension.Contains(".VSD") || FilenameExtension.Contains(".vsd") + || FilenameExtension.ToUpper().Contains(".VSD")) + { + return "application/vnd.visio"; + } + if (FilenameExtension.Contains(".PPTX") || FilenameExtension.Contains(".pptx") || FilenameExtension.Contains(".PPT") + || FilenameExtension.Contains(".ppt") || FilenameExtension.ToUpper().Contains(".PPTX") + || FilenameExtension.ToUpper().Contains(".PPT")) + { + return "application/vnd.ms-powerpoint"; + } + if (FilenameExtension.Contains(".DOCX") || FilenameExtension.Contains(".docx") || FilenameExtension.Contains(".DOC") + || FilenameExtension.Contains(".doc") || FilenameExtension.ToUpper().Contains(".DOCX") + || FilenameExtension.ToUpper().Contains(".DOC")) + { + return "application/msword"; + } + if (FilenameExtension.Contains(".XML") || FilenameExtension.Contains(".xml") + || FilenameExtension.ToUpper().Contains(".XML")) + { + return "text/xml"; + } + if (FilenameExtension.Contains(".pdf") || FilenameExtension.Contains(".PDF") + || FilenameExtension.ToUpper().Contains(".PDF")) + { + return "application/pdf"; + } + return null; + } + #endregion } } diff --git a/24Hour/Properties/PublishProfiles/FolderProfile.pubxml.user b/24Hour/Properties/PublishProfiles/FolderProfile.pubxml.user index 98caf20..193ae64 100644 --- a/24Hour/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/24Hour/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -5,7 +5,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. <_PublishTargetUrl>D:\24小时发布 - True|2023-07-01T07:55:14.1686837Z;True|2023-07-01T15:52:20.6931207+08:00;True|2023-07-01T15:16:19.0847303+08:00;True|2023-07-01T14:32:30.7938970+08:00;True|2023-07-01T14:11:46.9198753+08:00;True|2023-07-01T13:52:41.7443973+08:00;True|2023-07-01T12:05:00.1914915+08:00;True|2023-07-01T11:35:15.2688362+08:00;True|2023-07-01T11:15:50.0622714+08:00;True|2023-07-01T10:12:33.0301410+08:00;True|2023-06-30T20:53:10.2775714+08:00;True|2023-06-30T20:47:24.3123829+08:00;True|2023-06-30T18:44:10.1995292+08:00;True|2023-06-30T18:35:05.6876552+08:00;True|2023-06-30T14:33:30.1363930+08:00;True|2023-06-30T14:17:02.8263130+08:00;True|2023-06-30T14:16:41.6529398+08:00;True|2023-06-30T10:20:34.2470363+08:00;True|2023-06-30T09:51:41.3251931+08:00;True|2023-06-29T16:07:09.3334291+08:00;True|2023-06-29T15:56:52.9510718+08:00;True|2023-06-29T15:49:16.8161173+08:00;True|2023-06-27T18:06:12.3724487+08:00;True|2023-06-27T17:22:11.4211972+08:00;True|2023-06-27T15:48:34.1728433+08:00;True|2023-06-13T18:05:11.2568840+08:00;False|2023-06-13T18:04:56.9546003+08:00; + True|2023-07-01T14:22:56.9799185Z;True|2023-07-01T22:04:26.8941882+08:00;True|2023-07-01T21:40:11.5842496+08:00;True|2023-07-01T21:12:07.0048729+08:00;True|2023-07-01T18:55:25.7547257+08:00;True|2023-07-01T15:55:14.1686837+08:00;True|2023-07-01T15:52:20.6931207+08:00;True|2023-07-01T15:16:19.0847303+08:00;True|2023-07-01T14:32:30.7938970+08:00;True|2023-07-01T14:11:46.9198753+08:00;True|2023-07-01T13:52:41.7443973+08:00;True|2023-07-01T12:05:00.1914915+08:00;True|2023-07-01T11:35:15.2688362+08:00;True|2023-07-01T11:15:50.0622714+08:00;True|2023-07-01T10:12:33.0301410+08:00;True|2023-06-30T20:53:10.2775714+08:00;True|2023-06-30T20:47:24.3123829+08:00;True|2023-06-30T18:44:10.1995292+08:00;True|2023-06-30T18:35:05.6876552+08:00;True|2023-06-30T14:33:30.1363930+08:00;True|2023-06-30T14:17:02.8263130+08:00;True|2023-06-30T14:16:41.6529398+08:00;True|2023-06-30T10:20:34.2470363+08:00;True|2023-06-30T09:51:41.3251931+08:00;True|2023-06-29T16:07:09.3334291+08:00;True|2023-06-29T15:56:52.9510718+08:00;True|2023-06-29T15:49:16.8161173+08:00;True|2023-06-27T18:06:12.3724487+08:00;True|2023-06-27T17:22:11.4211972+08:00;True|2023-06-27T15:48:34.1728433+08:00;True|2023-06-13T18:05:11.2568840+08:00;False|2023-06-13T18:04:56.9546003+08:00; \ No newline at end of file