From a79c8a82429f4445f8521ef33ddd6f672d68af21 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 1 Jun 2022 11:31:59 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4QA=E6=B6=88=E6=81=AF=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/QC/DTO/QARecordViewModel.cs | 58 ----- .../CommandAndQueries/QAMessageRequest.cs | 23 -- .../_MediatR/Handlers/QAMessageHandler.cs | 234 ------------------ .../Common/DataTypeEnum.cs | 6 +- IRaCIS.Core.Domain.Share/QC/NoticeType.cs | 40 --- IRaCIS.Core.Domain.Share/QC/QAItemStatus.cs | 13 - .../QC/QATrialTemplateStatus.cs | 9 - IRaCIS.Core.Domain/QC/QANotice.cs | 44 ---- IRaCIS.Core.Domain/QC/QANoticeUser.cs | 19 -- .../Context/IRaCISDBContext.cs | 6 +- .../Exception/CustomException.cs | 0 .../IQueryablePageListExtensions.cs | 0 .../IQueryableWhereExtension.cs | 0 .../{Extention => _IRaCIS}/Input/PageInput.cs | 0 .../{Extention => _IRaCIS}/LinqExtension.cs | 0 .../ListTreeExtensions.cs} | 2 +- .../{Helper => _IRaCIS}/MD5Helper.cs | 0 .../{Extention => _IRaCIS}/ObjectExtension.cs | 0 .../Output/ApiResponseCodeEnum.cs | 0 .../Output/IResponseOutput.cs | 0 .../Output/NUllCheckExtension.cs | 0 .../Output/PageOutput.cs | 0 .../Output/ResponseOutput.cs | 0 23 files changed, 5 insertions(+), 449 deletions(-) delete mode 100644 IRaCIS.Core.Application/_MediatR/CommandAndQueries/QAMessageRequest.cs delete mode 100644 IRaCIS.Core.Application/_MediatR/Handlers/QAMessageHandler.cs delete mode 100644 IRaCIS.Core.Domain.Share/QC/NoticeType.cs delete mode 100644 IRaCIS.Core.Domain.Share/QC/QAItemStatus.cs delete mode 100644 IRaCIS.Core.Domain.Share/QC/QATrialTemplateStatus.cs delete mode 100644 IRaCIS.Core.Domain/QC/QANotice.cs delete mode 100644 IRaCIS.Core.Domain/QC/QANoticeUser.cs rename IRaCIS.Core.Infrastructure/{ => _IRaCIS}/Exception/CustomException.cs (100%) rename IRaCIS.Core.Infrastructure/{Extention => _IRaCIS}/IQueryablePageListExtensions.cs (100%) rename IRaCIS.Core.Infrastructure/{Extention => _IRaCIS}/IQueryableWhereExtension.cs (100%) rename IRaCIS.Core.Infrastructure/{Extention => _IRaCIS}/Input/PageInput.cs (100%) rename IRaCIS.Core.Infrastructure/{Extention => _IRaCIS}/LinqExtension.cs (100%) rename IRaCIS.Core.Infrastructure/{Extention/ListExtensions.cs => _IRaCIS/ListTreeExtensions.cs} (98%) rename IRaCIS.Core.Infrastructure/{Helper => _IRaCIS}/MD5Helper.cs (100%) rename IRaCIS.Core.Infrastructure/{Extention => _IRaCIS}/ObjectExtension.cs (100%) rename IRaCIS.Core.Infrastructure/{Extention => _IRaCIS}/Output/ApiResponseCodeEnum.cs (100%) rename IRaCIS.Core.Infrastructure/{Extention => _IRaCIS}/Output/IResponseOutput.cs (100%) rename IRaCIS.Core.Infrastructure/{Extention => _IRaCIS}/Output/NUllCheckExtension.cs (100%) rename IRaCIS.Core.Infrastructure/{Extention => _IRaCIS}/Output/PageOutput.cs (100%) rename IRaCIS.Core.Infrastructure/{Extention => _IRaCIS}/Output/ResponseOutput.cs (100%) diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs index b311b9a25..15424f2e2 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs +++ b/IRaCIS.Core.Application/Service/QC/DTO/QARecordViewModel.cs @@ -6,37 +6,12 @@ namespace IRaCIS.Core.Application.Contracts.DTO { - public class VisitQACommand - { - public QCChallengeCommand QARecord { get; set; } = new QCChallengeCommand(); - - public List QATrialTemplateItemList { get; set; } = new List(); - } - - - - public class QARecordTrialTemplateItemCommand - { - public int ShowOrder { get; set; } - public string TemplateItemName { get; set; } = String.Empty; - public Guid QATrialTemplateItemId { get; set; } - public string Note { get; set; } = String.Empty; - public QAItemStatus Status { get; set; } = QAItemStatus.Undefined; - - } - - public class QARecordTrialTemplateItemDTO : QARecordTrialTemplateItemCommand - { - public Guid QARecordId { get; set; } - } - - public class UpdateModalityCommand { public Guid Id { get; set; } @@ -269,40 +244,7 @@ namespace IRaCIS.Core.Application.Contracts.DTO } - public class HistoryGroupDTO - { - public DateTime CreateTime { get; set; } - public string IQA { get; set; } = string.Empty; - - public DateTime? IQADeadline { get; set; } - - public string IQANote { get; set; } = string.Empty; - - public DateTime? IQACreateTime { get; set; } - - - public List TemplateItems { get; set; } = new List(); - } - - public class TemplateItemProblem - { - [JsonIgnore] - public string IQA { get; set; } = string.Empty; - [JsonIgnore] - public DateTime? IQADeadline { get; set; } - [JsonIgnore] - public string IQANote { get; set; } = string.Empty; - [JsonIgnore] - public DateTime? IQACreateTime { get; set; } - - public Guid QARecordId { get; set; } - public int ShowOrder { get; set; } - public string TemplateItemName { get; set; } = String.Empty; - public string Note { get; set; } = String.Empty; - public QAItemStatus Status { get; set; } = QAItemStatus.Undefined; - public DateTime CreateTime { get; set; } = DateTime.Now; - } public class TrialVisitQADTO diff --git a/IRaCIS.Core.Application/_MediatR/CommandAndQueries/QAMessageRequest.cs b/IRaCIS.Core.Application/_MediatR/CommandAndQueries/QAMessageRequest.cs deleted file mode 100644 index 2482c2571..000000000 --- a/IRaCIS.Core.Application/_MediatR/CommandAndQueries/QAMessageRequest.cs +++ /dev/null @@ -1,23 +0,0 @@ -using IRaCIS.Core.Domain.Share; -using MediatR; -using System; - -namespace IRaCIS.Core.Application.MediatR.CommandAndQueries -{ - - public class QAMessageRequest:IRequest - { - //有一部分QA 消息 在 AutoFac AOP中，但是由于直接服务生成API 上面切入的AOP会失效， - //因为采用进程内消息通信，可以解耦代码，避免写在一起，影响阅读，专注于业务逻辑 - public NoticeType MessageType { get; set; } - - public Guid SubjectVisitId { get; set; } - - //用于关联关系记录 删除的时候，处理消息 - public Guid QCChallengeId { get; set; } - - //用于关联关系记录 删除的时候，处理消息 - public Guid QCChallengeReplyId { get; set; } - - } -} \ No newline at end of file diff --git a/IRaCIS.Core.Application/_MediatR/Handlers/QAMessageHandler.cs b/IRaCIS.Core.Application/_MediatR/Handlers/QAMessageHandler.cs deleted file mode 100644 index 3a497034c..000000000 --- a/IRaCIS.Core.Application/_MediatR/Handlers/QAMessageHandler.cs +++ /dev/null @@ -1,234 +0,0 @@ -//using IRaCIS.Core.Application.MediatR.CommandAndQueries; -//using MediatR; -//using System.Threading; -//using System.Threading.Tasks; -//using IRaCIS.Core.Domain.Share; -//using IRaCIS.Core.Infra.EFCore; -//using IRaCIS.Core.Domain.Models; -//using System.Linq; -//using System; - - -//namespace IRaCIS.Core.Application.MediatR.Handlers -//{ - -// public class QAMessageHandler : IRequestHandler -// { -// private readonly IRepository _userTrialRepository; -// private readonly IRepository _userTrialSiteRepository; -// private readonly IRepository _studyRepository; -// private readonly IRepository _qaNoticeRepository; -// private readonly IUserInfo _userInfo; -// private readonly IRepository _qaRecordRepository; -// private readonly IRepository _subjectRepository; -// private readonly IRepository _subjectVisitRepository; - -// /// -// /// 构造函数注入 -// /// - -// public QAMessageHandler(IRepository studyRepository, IRepository userTrialRepository, IRepository userTrialSiteRepository, IRepository qaNoticeRepository, IUserInfo userInfo, -// IRepository qaRecordRepository, IRepository subjectRepository, IRepository subjectVisitRepository) -// { -// _userTrialSiteRepository = userTrialSiteRepository; -// _userTrialRepository = userTrialRepository; -// _studyRepository = studyRepository; -// _qaNoticeRepository = qaNoticeRepository; -// _userInfo = userInfo; -// _qaRecordRepository = qaRecordRepository; -// _subjectRepository = subjectRepository; -// _subjectVisitRepository = subjectVisitRepository; -// } - -// public Task Handle(QAMessageRequest request, CancellationToken cancellationToken) -// { -// var qaRecord = _qaRecordRepository.FirstOrDefault(t => t.Id == request.QCChallengeId); - -// var subjectQuery = -// from sv in _subjectVisitRepository.Where(t => t.Id == qaRecord.SubjectVisitId) -// join sub in _subjectRepository.AsQueryable() on sv.SubjectId equals sub.Id -// select new -// { -// sv.VisitName, -// sv.VisitNum, -// SubjectName = sub.LastName + " / " + sub.FirstName, -// sub.SiteId -// }; - -// var subject = subjectQuery.First(); - - - -// //查询项目的参与者 和 负责site下CRC用户 -// var trialUserList = _userTrialRepository.Where(t => t.TrialId == qaRecord.TrialId).ToList(); - - -// var qaList = trialUserList.Where(t => t.User.UserTypeEnum == UserTypeEnum.IQC).ToList(); - - -// if (request.MessageType == NoticeType.QA_AddQARecord_NoticeCRC) -// { - - -// //找出当前操作的QA 如果是pm 或者admin 代替操作 此时会有问题 所以 谁代替，就以谁的名义执行 -// //var currentQA = qaList.First(t => t.UserId == _userInfo.Id); -// //var currentQA = trialUserList.First(t => t.UserId == _userInfo.Id); - -// //在项目CRC列表中筛选出 负责该study关联 site的CRC - -// var siteCRCList = _userTrialSiteRepository.Where(t => -// t.SiteId == subject.SiteId && t.User.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator && t.TrialId == qaRecord.TrialId).ToList(); - -// //var siteCRCList = userList.Where(t => t.SiteId == subject.SiteId && t.UserTypeEnum == UserType.ClinicalResearchCoordinator).ToList(); - - -// var notice = new QANotice() -// { -// TrialId = qaRecord.TrialId, -// SubjectVisitId = qaRecord.SubjectVisitId, - -// FromUser = _userInfo.RealName, -// FromUserId = _userInfo.Id, -// FromUserType = _userInfo.UserTypeShortName, -// NoticeTypeEnum = NoticeType.QA_AddQARecord_NoticeCRC, -// NeedDeal = true, -// Message = $"QA -> CRC : {_userInfo.RealName} add QA Record", -// SendTime = DateTime.Now, - -// RelationId = request.QCChallengeId -// }; - -// siteCRCList.ForEach(t => notice.QANoticeUserList.Add(new QANoticeUser() -// { -// QANoticeId = notice.Id, -// SubjectVisitId = qaRecord.SubjectVisitId, -// ToUser = t.User.LastName + " / " + t.User.FirstName, -// ToUserId = t.UserId, -// ToUserType = t.UserTypeRole.UserTypeShortName -// })); - -// //添加 发送给CRC的消息 消息和CRC是 一对多 -// _qaNoticeRepository.Add(notice); - -// } - -// else if (request.MessageType == NoticeType.QARecordDialogPost) -// { -// #region QA通知处理 新建一条QA通知消息 需要分用户类型 记录关联Id 为了删除操作 - -// //CRC =>QA -// if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ClinicalResearchCoordinator) -// { -// //PM 或者admin可以代替CRC角色 不能从CRC列表中查询用户 -// //var currentCRC = trialUserList.First(t => t.UserId == _userInfo.Id); - -// var notice = new QANotice() -// { -// TrialId = qaRecord.TrialId, -// SubjectVisitId = qaRecord.SubjectVisitId, -// //FromUser = currentCRC.UserRealName, -// //FromUserId = _userInfo.Id, -// //FromUserType = currentCRC.UserType, -// FromUser = _userInfo.RealName, -// FromUserId = _userInfo.Id, -// FromUserType = _userInfo.UserTypeShortName, -// NoticeTypeEnum = NoticeType.CRC_QARecordDialogPost_NoticeQA, -// NeedDeal = true, -// Message = $"CRC -> QA : {_userInfo.RealName} post or reply message for QA record about SubjectName:{subject.SubjectName } VisitName: {subject.VisitName} VisitNum:{subject.VisitName} !", -// SendTime = DateTime.Now, -// RelationId = request.QCChallengeReplyId -// }; - -// qaList.ForEach(t => notice.QANoticeUserList.Add(new QANoticeUser() -// { -// QANoticeId = notice.Id, -// SubjectVisitId = qaRecord.SubjectVisitId, -// ToUser = t.User.LastName + " / " + t.User.FirstName, -// ToUserId = t.UserId, -// ToUserType = t.User.UserTypeRole.UserTypeShortName -// })); - -// _qaNoticeRepository.Add(notice); - -// //这里作为 设置QA 设置 Inqa 状态的回复 或者QA和CRC对话的 -// var needDealNoticeList = _qaNoticeRepository.AsQueryable() -// .Where(t => t.SubjectVisitId == qaRecord.SubjectVisitId && t.NeedDeal && (t.NoticeTypeEnum == NoticeType.QA_InQA_NoticeCRC -// || t.NoticeTypeEnum == NoticeType.QA_QARecordDialogPost_NoticeCRC || t.NoticeTypeEnum == NoticeType.QA_AddQARecord_NoticeCRC)).ToList(); - -// needDealNoticeList.ForEach(t => -// { -// t.NeedDeal = false; -// t.DealTime = DateTime.Now; -// _qaNoticeRepository.Update(t); -// }); - -// } - -// if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.IQC) -// { - -// //找出当前操作的QA 如果是pm 或者admin 代替操作 此时会有问题 所以 谁代替，就以谁的名义执行 -// //var currentQA = qaList.First(t => t.UserId == _userInfo.Id); -// //var currentQA = trialUserList.First(t => t.UserId == _userInfo.Id); - -// //在项目CRC列表中筛选出 负责该study关联 site的CRC -// //var siteCRCList = userList.Where(t => t.SiteId == subject.SiteId && t.UserTypeEnum == UserType.ClinicalResearchCoordinator).ToList(); - -// var siteCRCList = _userTrialSiteRepository.Where(t => -// t.SiteId == subject.SiteId && t.User.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator && t.TrialId == qaRecord.TrialId).ToList(); - -// var notice = new QANotice() -// { -// TrialId = qaRecord.TrialId, -// SubjectVisitId = qaRecord.SubjectVisitId, -// //FromUser = currentQA.UserRealName, -// //FromUserId = _userInfo.Id, -// //FromUserType = currentQA.UserType, -// FromUser = _userInfo.RealName, -// FromUserId = _userInfo.Id, -// FromUserType = _userInfo.UserTypeShortName, -// NoticeTypeEnum = NoticeType.QA_QARecordDialogPost_NoticeCRC, -// NeedDeal = true, -// Message = $"QA -> CRC : {_userInfo.RealName} post or reply message for QA record about SubjectName:{subject.SubjectName } VisitName: {subject.VisitName} VisitNum:{subject.VisitName} !", -// SendTime = DateTime.Now, -// RelationId = request.QCChallengeReplyId -// }; - -// siteCRCList.ForEach(t => notice.QANoticeUserList.Add(new QANoticeUser() -// { -// QANoticeId = notice.Id, -// SubjectVisitId = qaRecord.SubjectVisitId, -// ToUser = t.User.LastName + " / " + t.User.FirstName, -// ToUserId = t.UserId, -// ToUserType = t.UserTypeRole.UserTypeShortName -// })); - -// //添加 发送给CRC的消息 消息和CRC是 一对多 -// _qaNoticeRepository.Add(notice); - -// //这里作为 CRC post的对话的回复 -// var needDealNoticeList = _qaNoticeRepository.AsQueryable() -// .Where(t => t.SubjectVisitId == qaRecord.SubjectVisitId && t.NeedDeal && t.NoticeTypeEnum == NoticeType.CRC_QARecordDialogPost_NoticeQA).ToList(); - -// needDealNoticeList.ForEach(t => -// { -// t.NeedDeal = false; -// t.DealTime = DateTime.Now; -// _qaNoticeRepository.Update(t); -// }); -// } - - -// #endregion -// } -// else -// { - -// } - - -// return Task.FromResult(true); - -// } -// } -//} \ No newline at end of file diff --git a/IRaCIS.Core.Domain.Share/Common/DataTypeEnum.cs b/IRaCIS.Core.Domain.Share/Common/DataTypeEnum.cs index 306311e32..18d126370 100644 --- a/IRaCIS.Core.Domain.Share/Common/DataTypeEnum.cs +++ b/IRaCIS.Core.Domain.Share/Common/DataTypeEnum.cs @@ -1,8 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; + namespace IRaCIS.Core.Domain.Share { diff --git a/IRaCIS.Core.Domain.Share/QC/NoticeType.cs b/IRaCIS.Core.Domain.Share/QC/NoticeType.cs deleted file mode 100644 index 998012562..000000000 --- a/IRaCIS.Core.Domain.Share/QC/NoticeType.cs +++ /dev/null @@ -1,40 +0,0 @@ -namespace IRaCIS.Core.Domain.Share -{ - public enum NoticeType - { - NotNeedNotice=0, - - CRC_RequestToQA_NoticeQA=1, - - QA_AddQARecord_NoticeCRC=2, - - QARecordDialogPost = 3, - - CRC_QARecordDialogPost_NoticeQA =4, - - QA_QARecordDialogPost_NoticeCRC = 5, - - - - QA_InQA_NoticeCRC = 7, - - CRC_ReUpload_NoticeQA=8, - - QA_QAPass_NoticeQA=9, - - QA_Anonymized_NoticeQA = 11,//匿名化完成 - - //QA_Anonymized_NoticePM = 11,//匿名化完成 - - // PM 不会转发消息 只作为匿名化消息的边界 - - //PM_Forwarded = 12,//已经转发 - - //删除操作 只是将以前的发送的消息删除 - //QA_DeleteQARecord_RemoveNotice=3, - //QA_QARecordDialogDelete_RemoveNotice =6, - - // QA不通过 QA和CRC 对话的消息置为已处理 - //QA_QANotPass_NoticeCRC = 10, - } -} \ No newline at end of file diff --git a/IRaCIS.Core.Domain.Share/QC/QAItemStatus.cs b/IRaCIS.Core.Domain.Share/QC/QAItemStatus.cs deleted file mode 100644 index 70a1e98b2..000000000 --- a/IRaCIS.Core.Domain.Share/QC/QAItemStatus.cs +++ /dev/null @@ -1,13 +0,0 @@ -namespace IRaCIS.Core.Domain.Share -{ - public enum QAItemStatus - { - Yes=1, - - No=2, - - Uncertain=3, - - Undefined=4 - } -} \ No newline at end of file diff --git a/IRaCIS.Core.Domain.Share/QC/QATrialTemplateStatus.cs b/IRaCIS.Core.Domain.Share/QC/QATrialTemplateStatus.cs deleted file mode 100644 index 2cfd0a542..000000000 --- a/IRaCIS.Core.Domain.Share/QC/QATrialTemplateStatus.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace IRaCIS.Core.Domain.Share -{ - public enum QATrialTemplateStatus - { - HasQuote=1, - - CanEditOrUpdate=0 - } -} \ No newline at end of file diff --git a/IRaCIS.Core.Domain/QC/QANotice.cs b/IRaCIS.Core.Domain/QC/QANotice.cs deleted file mode 100644 index ef7840438..000000000 --- a/IRaCIS.Core.Domain/QC/QANotice.cs +++ /dev/null @@ -1,44 +0,0 @@ -using System; -using System.Collections.Generic; -using IRaCIS.Core.Domain.Share; - -namespace IRaCIS.Core.Domain.Models -{ - public class QANotice : Entity - { - public Guid TrialId { get; set; } - - public Guid SubjectVisitId { get; set; } - - public Guid RelationId { get; set; }=Guid.Empty; - - public string Message { get; set; } - - public string StudyStatusStr { get; set; } = string.Empty; - - public DateTime SendTime { get; set; } - - public DateTime? DealTime { get; set; } - - public Guid FromUserId { get; set; } - - public string FromUser { get; set; } - - public string FromUserType { get; set; } - - public NoticeType NoticeTypeEnum { get; set; } - - public bool NeedDeal { get; set; } - - public virtual ICollection QANoticeUserList { get; set; } - - public QANotice() - { - QANoticeUserList=new HashSet(); - } - - } - - - -} \ No newline at end of file diff --git a/IRaCIS.Core.Domain/QC/QANoticeUser.cs b/IRaCIS.Core.Domain/QC/QANoticeUser.cs deleted file mode 100644 index 0248745ad..000000000 --- a/IRaCIS.Core.Domain/QC/QANoticeUser.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; - -namespace IRaCIS.Core.Domain.Models -{ - public class QANoticeUser:Entity - { - public Guid SubjectVisitId { get; set; } - - public Guid QANoticeId { get; set; } = Guid.Empty; - - public Guid ToUserId { get; set; } = Guid.Empty; - - public string ToUser { get; set; } - - public string ToUserType { get; set; } - - - } -} \ No newline at end of file diff --git a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs index 00b7f666c..73b7861cc 100644 --- a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs +++ b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs @@ -289,7 +289,7 @@ namespace IRaCIS.Core.Infra.EFCore #region QA public virtual DbSet QCChallengeDialog { get; set; } - public virtual DbSet QATemplateDictionary { get; set; } + //public virtual DbSet QATemplateDictionary { get; set; } public virtual DbSet QCChallenge { get; set; } public virtual DbSet SubjectVisit { get; set; } #endregion @@ -336,8 +336,8 @@ namespace IRaCIS.Core.Infra.EFCore //public virtual DbSet QARecordTrialTemplateItem { get; set; } //public virtual DbSet QARecordTemplateItemDetail { get; set; } //public virtual DbSet QATemplate { get; set; } - public virtual DbSet QANoticeUser { get; set; } - public virtual DbSet QANotice { get; set; } + //public virtual DbSet QANoticeUser { get; set; } + //public virtual DbSet QANotice { get; set; } #endregion diff --git a/IRaCIS.Core.Infrastructure/Exception/CustomException.cs b/IRaCIS.Core.Infrastructure/_IRaCIS/Exception/CustomException.cs similarity index 100% rename from IRaCIS.Core.Infrastructure/Exception/CustomException.cs rename to IRaCIS.Core.Infrastructure/_IRaCIS/Exception/CustomException.cs diff --git a/IRaCIS.Core.Infrastructure/Extention/IQueryablePageListExtensions.cs b/IRaCIS.Core.Infrastructure/_IRaCIS/IQueryablePageListExtensions.cs similarity index 100% rename from IRaCIS.Core.Infrastructure/Extention/IQueryablePageListExtensions.cs rename to IRaCIS.Core.Infrastructure/_IRaCIS/IQueryablePageListExtensions.cs diff --git a/IRaCIS.Core.Infrastructure/Extention/IQueryableWhereExtension.cs b/IRaCIS.Core.Infrastructure/_IRaCIS/IQueryableWhereExtension.cs similarity index 100% rename from IRaCIS.Core.Infrastructure/Extention/IQueryableWhereExtension.cs rename to IRaCIS.Core.Infrastructure/_IRaCIS/IQueryableWhereExtension.cs diff --git a/IRaCIS.Core.Infrastructure/Extention/Input/PageInput.cs b/IRaCIS.Core.Infrastructure/_IRaCIS/Input/PageInput.cs similarity index 100% rename from IRaCIS.Core.Infrastructure/Extention/Input/PageInput.cs rename to IRaCIS.Core.Infrastructure/_IRaCIS/Input/PageInput.cs diff --git a/IRaCIS.Core.Infrastructure/Extention/LinqExtension.cs b/IRaCIS.Core.Infrastructure/_IRaCIS/LinqExtension.cs similarity index 100% rename from IRaCIS.Core.Infrastructure/Extention/LinqExtension.cs rename to IRaCIS.Core.Infrastructure/_IRaCIS/LinqExtension.cs diff --git a/IRaCIS.Core.Infrastructure/Extention/ListExtensions.cs b/IRaCIS.Core.Infrastructure/_IRaCIS/ListTreeExtensions.cs similarity index 98% rename from IRaCIS.Core.Infrastructure/Extention/ListExtensions.cs rename to IRaCIS.Core.Infrastructure/_IRaCIS/ListTreeExtensions.cs index 752aba488..e093195f6 100644 --- a/IRaCIS.Core.Infrastructure/Extention/ListExtensions.cs +++ b/IRaCIS.Core.Infrastructure/_IRaCIS/ListTreeExtensions.cs @@ -5,7 +5,7 @@ using System.Linq.Expressions; namespace IRaCIS.Core.Infrastructure.Extention { - public static class ListExtensions + public static class ListTreeExtensions { /// /// 将列表转换为树形结构 diff --git a/IRaCIS.Core.Infrastructure/Helper/MD5Helper.cs b/IRaCIS.Core.Infrastructure/_IRaCIS/MD5Helper.cs similarity index 100% rename from IRaCIS.Core.Infrastructure/Helper/MD5Helper.cs rename to IRaCIS.Core.Infrastructure/_IRaCIS/MD5Helper.cs diff --git a/IRaCIS.Core.Infrastructure/Extention/ObjectExtension.cs b/IRaCIS.Core.Infrastructure/_IRaCIS/ObjectExtension.cs similarity index 100% rename from IRaCIS.Core.Infrastructure/Extention/ObjectExtension.cs rename to IRaCIS.Core.Infrastructure/_IRaCIS/ObjectExtension.cs diff --git a/IRaCIS.Core.Infrastructure/Extention/Output/ApiResponseCodeEnum.cs b/IRaCIS.Core.Infrastructure/_IRaCIS/Output/ApiResponseCodeEnum.cs similarity index 100% rename from IRaCIS.Core.Infrastructure/Extention/Output/ApiResponseCodeEnum.cs rename to IRaCIS.Core.Infrastructure/_IRaCIS/Output/ApiResponseCodeEnum.cs diff --git a/IRaCIS.Core.Infrastructure/Extention/Output/IResponseOutput.cs b/IRaCIS.Core.Infrastructure/_IRaCIS/Output/IResponseOutput.cs similarity index 100% rename from IRaCIS.Core.Infrastructure/Extention/Output/IResponseOutput.cs rename to IRaCIS.Core.Infrastructure/_IRaCIS/Output/IResponseOutput.cs diff --git a/IRaCIS.Core.Infrastructure/Extention/Output/NUllCheckExtension.cs b/IRaCIS.Core.Infrastructure/_IRaCIS/Output/NUllCheckExtension.cs similarity index 100% rename from IRaCIS.Core.Infrastructure/Extention/Output/NUllCheckExtension.cs rename to IRaCIS.Core.Infrastructure/_IRaCIS/Output/NUllCheckExtension.cs diff --git a/IRaCIS.Core.Infrastructure/Extention/Output/PageOutput.cs b/IRaCIS.Core.Infrastructure/_IRaCIS/Output/PageOutput.cs similarity index 100% rename from IRaCIS.Core.Infrastructure/Extention/Output/PageOutput.cs rename to IRaCIS.Core.Infrastructure/_IRaCIS/Output/PageOutput.cs diff --git a/IRaCIS.Core.Infrastructure/Extention/Output/ResponseOutput.cs b/IRaCIS.Core.Infrastructure/_IRaCIS/Output/ResponseOutput.cs similarity index 100% rename from IRaCIS.Core.Infrastructure/Extention/Output/ResponseOutput.cs rename to IRaCIS.Core.Infrastructure/_IRaCIS/Output/ResponseOutput.cs