diff --git a/CloudBuilder/CloudBuilder.Master.Service/DmsFileService.auto.cs b/CloudBuilder/CloudBuilder.Master.Service/DmsFileService.auto.cs index 597ad52..dac23b3 100644 --- a/CloudBuilder/CloudBuilder.Master.Service/DmsFileService.auto.cs +++ b/CloudBuilder/CloudBuilder.Master.Service/DmsFileService.auto.cs @@ -17,6 +17,7 @@ using SixLabors.ImageSharp; using SixLabors.ImageSharp.PixelFormats; using SixLabors.ImageSharp.Processing; using System; +using System.Linq; using static System.Net.Mime.MediaTypeNames; using Image = SixLabors.ImageSharp.Image; namespace CloudBuilder.Master.Service @@ -255,8 +256,8 @@ namespace CloudBuilder.Master.Service { sqlWhere = sqlWhere + string.Format(" and {0} ='{1}' ", FamilyDmsFileViewEntity.DB_CREATED_BY, service.UserId); } - - if (string.IsNullOrEmpty(sqlWhere)) sqlWhere = " and 1=0 "; + //取了顶级目录 + if (string.IsNullOrEmpty(sqlWhere)) sqlWhere = string.Format(" and {0} ={1} ", FamilyDmsFileViewEntity.DB_FAMILY_NAME, FamilyDmsFileViewEntity.DB_FILE_PATH); FamilyDmsFileViewEntity entity = FamilyDmsFileViewEntity.GetInstance(repository.GetDbContext().Database.ProviderName); string sql = entity.GetSelectTopFrom(criteria.limit, criteria.page, criteria.orderby.StringToDbField(), criteria.orderbytag, sqlWhere); @@ -320,11 +321,16 @@ namespace CloudBuilder.Master.Service { item.Url = FileTypePolicy.PackUrl(service, item.CreatedBy, item.OrderKey, item.TranscodeIndc); } + + data.Families = list.Select(x => new FamilyDmsFileViewDisplayData(x) + { + FileType = FileTypePolicy.GetType(x.OrderKey), + FormattedPic = FileTypePolicy.PackUrl(service, x.CreatedBy, x.OrderKey, YesNoPolicy.YES) + }).ToArray(); } data.Limit = criteria.limit; data.Page = criteria.page; - data.Families = list.Select(x => new FamilyDmsFileViewDisplayData(x) { FileType = FileTypePolicy.GetType(x.OrderKey) }).ToArray(); data.Total = count; //data.Sql = sql; data.ErrorMessage = err; @@ -1504,7 +1510,7 @@ namespace CloudBuilder.Master.Service { IRepository repositoryFamilyGroupManager = repository.GetRepository>(); - FamilyGroupManagerUserViewEntity[] ents = repositoryFamilyGroupManager.DetachedEntities.Where(x => x.UserName == service.UserId).ToArray(); + FamilyGroupManagerUserViewEntity[] ents = repositoryFamilyGroupManager.DetachedEntities.Where(x => x.UserName == service.UserId && x.ValidIndc=="Y").ToArray(); List l = new List(); SelectOption selectOption; @@ -1530,7 +1536,7 @@ namespace CloudBuilder.Master.Service IRepository repositoryFamilyGroup = repository.GetRepository>(); - FamilyGroupEntity group = repositoryFamilyGroup.DetachedEntities.Where(x => x.FamilyName == familyName).FirstOrDefault()!; + FamilyGroupEntity group = repositoryFamilyGroup.DetachedEntities.Where(x => x.FamilyName == familyName && x.ValidIndc==YesNoPolicy.YES).FirstOrDefault()!; if (group == null) return l.ToArray(); selectOption = new SelectOption(); diff --git a/CloudBuilder/CloudBuilder.Master.Service/FamilyGroupService.auto.cs b/CloudBuilder/CloudBuilder.Master.Service/FamilyGroupService.auto.cs index ce9b160..58d27fa 100644 --- a/CloudBuilder/CloudBuilder.Master.Service/FamilyGroupService.auto.cs +++ b/CloudBuilder/CloudBuilder.Master.Service/FamilyGroupService.auto.cs @@ -152,6 +152,19 @@ namespace CloudBuilder.Master.Service IsSharePermission = true, }).ToArray(); } + else + { + data.FamilyGroupManagers = null; + fgms = repositoryFamilyGroupManager.DetachedEntities.Where(x => x.FamilyName == key && x.UserName == service.UserId).ToArray(); + if (fgms != null && fgms.Length > 0) + { + data.FamilyGroupManagers = fgms.Where(x => x.ValidIndc == YesNoPolicy.YES)!.Select(x => new FamilyGroupManagerDisplayData(x) + { UserLocalName = users!.Where(y => y.UserName == x.UserName).FirstOrDefault()!.UserLocalName }).ToArray(); + + data.FamilyGroupRequests = fgms.Where(x => x.ValidIndc == YesNoPolicy.NO)!.Select(x => new FamilyGroupManagerDisplayData(x) + { UserLocalName = users!.Where(y => y.UserName == x.UserName).FirstOrDefault()!.UserLocalName }).ToArray(); + } + } data.IsManager = isManager; @@ -570,7 +583,7 @@ namespace CloudBuilder.Master.Service bool isManager = false; IRepository repositoryFamilyGroupManager = repository.GetRepository>(); - FamilyGroupManagerEntity[] fgms = repositoryFamilyGroupManager.DetachedEntities.Where(x => x.ManagerIndc == YesNoPolicy.YES && x.FamilyName == key && x.ValidIndc == YesNoPolicy.YES).ToArray(); + FamilyGroupManagerEntity[] fgms = repositoryFamilyGroupManager.DetachedEntities.Where(x => x.ManagerIndc == YesNoPolicy.YES && x.UserName == service.UserId && x.FamilyName == key && x.ValidIndc == YesNoPolicy.YES).ToArray(); if (fgms == null || fgms.Length == 0) { throw new ValidatedException("您不是管理员,不能解散"); @@ -588,7 +601,7 @@ namespace CloudBuilder.Master.Service { IRepository repositoryFamilyGroupManager = repository.GetRepository>(); FamilyGroupManagerEntity org = repositoryFamilyGroupManager.DetachedEntities.Where(x => x.FamilyName == manager.FamilyName && x.UserName == service.UserId).FirstOrDefault()!; - if (org != null) { return; } + if (org != null) { throw new ValidatedException("您已申请加入,耐心等待审核。"); } org = new FamilyGroupManagerEntity(); org.FamilyName = manager.FamilyName; @@ -623,6 +636,13 @@ namespace CloudBuilder.Master.Service public void UpdateFamilyGroupManager(FamilyGroupManagerEntity manager) { IRepository repositoryFamilyGroupManager = repository.GetRepository>(); + + FamilyGroupManagerEntity[] fgms = repositoryFamilyGroupManager.DetachedEntities.Where(x => x.ManagerIndc == YesNoPolicy.YES && x.UserName == service.UserId && x.FamilyName == manager.FamilyName && x.ValidIndc == YesNoPolicy.YES).ToArray(); + if (fgms == null || fgms.Length == 0) + { + throw new ValidatedException("您不是管理员"); + } + FamilyGroupManagerEntity org = repositoryFamilyGroupManager.DetachedEntities.Where(x => x.FamilyName == manager.FamilyName && x.UserName == manager.UserName).FirstOrDefault()!; if (org == null) { return; } @@ -636,6 +656,13 @@ namespace CloudBuilder.Master.Service public void DeleteFamilyGroupManager(FamilyGroupManagerEntity manager) { IRepository repositoryFamilyGroupManager = repository.GetRepository>(); + + FamilyGroupManagerEntity[] fgms = repositoryFamilyGroupManager.DetachedEntities.Where(x => x.ManagerIndc == YesNoPolicy.YES && x.UserName == service.UserId && x.FamilyName == manager.FamilyName && x.ValidIndc == YesNoPolicy.YES).ToArray(); + if (fgms == null || fgms.Length == 0) + { + throw new ValidatedException("您不是管理员"); + } + FamilyGroupManagerEntity org = repositoryFamilyGroupManager.DetachedEntities.Where(x => x.FamilyName == manager.FamilyName && x.UserName == manager.UserName).FirstOrDefault()!; if (org == null) { return; } diff --git a/CloudBuilder/CloudBuilder.Master/Data/FamilyDmsFileViewDisplayData.cs b/CloudBuilder/CloudBuilder.Master/Data/FamilyDmsFileViewDisplayData.cs index 5c426e7..a312787 100644 --- a/CloudBuilder/CloudBuilder.Master/Data/FamilyDmsFileViewDisplayData.cs +++ b/CloudBuilder/CloudBuilder.Master/Data/FamilyDmsFileViewDisplayData.cs @@ -32,5 +32,7 @@ namespace CloudBuilder.Master.Data public string? IsPlay { get; set; } public string? IsPause { get; set; } + + public string? FormattedPic { get; set; } } } diff --git a/CloudBuilder/CloudBuilder.Web.Entry/appsettings.json b/CloudBuilder/CloudBuilder.Web.Entry/appsettings.json index 18e7ad2..56133b1 100644 --- a/CloudBuilder/CloudBuilder.Web.Entry/appsettings.json +++ b/CloudBuilder/CloudBuilder.Web.Entry/appsettings.json @@ -38,7 +38,7 @@ "Issuer": "Owen Chen", "Audience": "Cloud Builder", "Secret": "{8619F7C3-B53C-4B85-99F0-983D351ECD82}", - "AccessExpireMins": 120, //4小时过期 + "AccessExpireMins": 480, //8小时过期 "RefreshExpireMins": 1440, // 1天 "IsRefreshAbsoluteExpired": false }, diff --git a/WebVue/src/components/basic/MyComputerFamily.vue b/WebVue/src/components/basic/MyComputerFamily.vue new file mode 100644 index 0000000..6328b7f --- /dev/null +++ b/WebVue/src/components/basic/MyComputerFamily.vue @@ -0,0 +1,488 @@ + + + diff --git a/WebVue/src/components/basic/OperatorStationFamily.vue b/WebVue/src/components/basic/OperatorStationFamily.vue new file mode 100644 index 0000000..eb60b4f --- /dev/null +++ b/WebVue/src/components/basic/OperatorStationFamily.vue @@ -0,0 +1,287 @@ + + + + + diff --git a/WebVue/src/views/master/FamilyGroupOperation.vue b/WebVue/src/views/master/FamilyGroupOperation.vue index 0f661f0..27cc1f9 100644 --- a/WebVue/src/views/master/FamilyGroupOperation.vue +++ b/WebVue/src/views/master/FamilyGroupOperation.vue @@ -223,7 +223,7 @@ - + {{ datas.record.Notice }} - + diff --git a/WebVue/src/views/master/OrgFamilyGroupShare.vue b/WebVue/src/views/master/OrgFamilyGroupShare.vue new file mode 100644 index 0000000..01a9812 --- /dev/null +++ b/WebVue/src/views/master/OrgFamilyGroupShare.vue @@ -0,0 +1,1274 @@ + + + +