diff --git a/Demo.Net.ProgramSchoolSystemAPI/.vs/Demo.Net.ProgramSchoolSystemAPI/DesignTimeBuild/.dtbcache.v2 b/Demo.Net.ProgramSchoolSystemAPI/.vs/Demo.Net.ProgramSchoolSystemAPI/DesignTimeBuild/.dtbcache.v2 index 6a4b787e4f6111570d2ba173484e8cfd338e92cb..64869bfb4bf0e23591736480171dfdb44a1d4cae 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/.vs/Demo.Net.ProgramSchoolSystemAPI/DesignTimeBuild/.dtbcache.v2 and b/Demo.Net.ProgramSchoolSystemAPI/.vs/Demo.Net.ProgramSchoolSystemAPI/DesignTimeBuild/.dtbcache.v2 differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/.vs/Demo.Net.ProgramSchoolSystemAPI/FileContentIndex/4a0762c6-b97c-4213-902d-b846dca0c6e6.vsidx b/Demo.Net.ProgramSchoolSystemAPI/.vs/Demo.Net.ProgramSchoolSystemAPI/FileContentIndex/4a0762c6-b97c-4213-902d-b846dca0c6e6.vsidx new file mode 100644 index 0000000000000000000000000000000000000000..9d5022eab0d45cb5b7462a36e7fda4b6e5d759be Binary files /dev/null and b/Demo.Net.ProgramSchoolSystemAPI/.vs/Demo.Net.ProgramSchoolSystemAPI/FileContentIndex/4a0762c6-b97c-4213-902d-b846dca0c6e6.vsidx differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/.vs/Demo.Net.ProgramSchoolSystemAPI/FileContentIndex/e7889952-926c-4cb7-b2c8-8b8c33c0645e.vsidx b/Demo.Net.ProgramSchoolSystemAPI/.vs/Demo.Net.ProgramSchoolSystemAPI/FileContentIndex/e7889952-926c-4cb7-b2c8-8b8c33c0645e.vsidx new file mode 100644 index 0000000000000000000000000000000000000000..21c55e474d80704cf8e8a0600d1e27c88087cc62 Binary files /dev/null and b/Demo.Net.ProgramSchoolSystemAPI/.vs/Demo.Net.ProgramSchoolSystemAPI/FileContentIndex/e7889952-926c-4cb7-b2c8-8b8c33c0645e.vsidx differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/.vs/Demo.Net.ProgramSchoolSystemAPI/FileContentIndex/f3e6dc1b-5faf-45fe-b87b-59a7c5216501.vsidx b/Demo.Net.ProgramSchoolSystemAPI/.vs/Demo.Net.ProgramSchoolSystemAPI/FileContentIndex/f3e6dc1b-5faf-45fe-b87b-59a7c5216501.vsidx new file mode 100644 index 0000000000000000000000000000000000000000..8b8caf131082032c3a7573ae977d3400e4d6ca07 Binary files /dev/null and b/Demo.Net.ProgramSchoolSystemAPI/.vs/Demo.Net.ProgramSchoolSystemAPI/FileContentIndex/f3e6dc1b-5faf-45fe-b87b-59a7c5216501.vsidx differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/.vs/Demo.Net.ProgramSchoolSystemAPI/v17/.futdcache.v2 b/Demo.Net.ProgramSchoolSystemAPI/.vs/Demo.Net.ProgramSchoolSystemAPI/v17/.futdcache.v2 index 82846107b2c81d64b525247242c933bba301daf3..8a64cd7fdd00fa45b6d182f30d64011739331922 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/.vs/Demo.Net.ProgramSchoolSystemAPI/v17/.futdcache.v2 and b/Demo.Net.ProgramSchoolSystemAPI/.vs/Demo.Net.ProgramSchoolSystemAPI/v17/.futdcache.v2 differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/.vs/Demo.Net.ProgramSchoolSystemAPI/v17/.suo b/Demo.Net.ProgramSchoolSystemAPI/.vs/Demo.Net.ProgramSchoolSystemAPI/v17/.suo index 37347dfbeb664ee4c0d756f90c77d852a3c2c64c..395ff204f2f00e28bcadf6c95323001a83a08842 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/.vs/Demo.Net.ProgramSchoolSystemAPI/v17/.suo and b/Demo.Net.ProgramSchoolSystemAPI/.vs/Demo.Net.ProgramSchoolSystemAPI/v17/.suo differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/.vs/ProjectEvaluation/demo.net.programschoolsystemapi.metadata.v7.bin b/Demo.Net.ProgramSchoolSystemAPI/.vs/ProjectEvaluation/demo.net.programschoolsystemapi.metadata.v7.bin index 8d82ce33b589703a836bf09bbf6703d278d65b14..97e6b292b0629e0092709dbaff5a934b1dd99888 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/.vs/ProjectEvaluation/demo.net.programschoolsystemapi.metadata.v7.bin and b/Demo.Net.ProgramSchoolSystemAPI/.vs/ProjectEvaluation/demo.net.programschoolsystemapi.metadata.v7.bin differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/.vs/ProjectEvaluation/demo.net.programschoolsystemapi.projects.v7.bin b/Demo.Net.ProgramSchoolSystemAPI/.vs/ProjectEvaluation/demo.net.programschoolsystemapi.projects.v7.bin index 58f9b4471cd265f00592d34bc58a234ee45de2bb..5f019eaea63d96028c3aa66807e309de9db8f31d 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/.vs/ProjectEvaluation/demo.net.programschoolsystemapi.projects.v7.bin and b/Demo.Net.ProgramSchoolSystemAPI/.vs/ProjectEvaluation/demo.net.programschoolsystemapi.projects.v7.bin differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IRepository/bin/Debug/net7.0/Demo.Net.IRepository.dll b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IRepository/bin/Debug/net7.0/Demo.Net.IRepository.dll index e5e3453029aab66229e877b3a134ebb31015c4cc..3960a80b8287679295d8a240f9d5f49f86d81542 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IRepository/bin/Debug/net7.0/Demo.Net.IRepository.dll and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IRepository/bin/Debug/net7.0/Demo.Net.IRepository.dll differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IRepository/bin/Debug/net7.0/Demo.Net.IRepository.pdb b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IRepository/bin/Debug/net7.0/Demo.Net.IRepository.pdb index 341f5ea041ddb45ed359c7e53180cd51a1e8b5f3..a50f00215fbd47547d199d5a5352a1308e317780 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IRepository/bin/Debug/net7.0/Demo.Net.IRepository.pdb and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IRepository/bin/Debug/net7.0/Demo.Net.IRepository.pdb differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IRepository/bin/Debug/net7.0/Demo.Net.Model.dll b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IRepository/bin/Debug/net7.0/Demo.Net.Model.dll index daefc61409a79de215f09391fef73fdf40f2b7a5..c59850415c1dab88b61e46a31e53039719971934 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IRepository/bin/Debug/net7.0/Demo.Net.Model.dll and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IRepository/bin/Debug/net7.0/Demo.Net.Model.dll differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IRepository/bin/Debug/net7.0/Demo.Net.Model.pdb b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IRepository/bin/Debug/net7.0/Demo.Net.Model.pdb index 920c29456e8dd6f40c76f17120321f99853892f6..a5ddc9455ebee859436bf99f144b836380ea6d35 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IRepository/bin/Debug/net7.0/Demo.Net.Model.pdb and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IRepository/bin/Debug/net7.0/Demo.Net.Model.pdb differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IRepository/obj/Debug/net7.0/Demo.Net.IRepository.assets.cache b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IRepository/obj/Debug/net7.0/Demo.Net.IRepository.assets.cache index 9c17de33c913e0e63be2e806a07b51042f2efff9..1752f27eb1ccf809f7f8414e298607437e86e215 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IRepository/obj/Debug/net7.0/Demo.Net.IRepository.assets.cache and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IRepository/obj/Debug/net7.0/Demo.Net.IRepository.assets.cache differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IRepository/obj/Debug/net7.0/Demo.Net.IRepository.csproj.AssemblyReference.cache b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IRepository/obj/Debug/net7.0/Demo.Net.IRepository.csproj.AssemblyReference.cache index 97d774cc92eeb7394a1e8d02e2c8f7f7e09067db..e16505f872f651097988e06b70e024fbed6e4ff8 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IRepository/obj/Debug/net7.0/Demo.Net.IRepository.csproj.AssemblyReference.cache and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IRepository/obj/Debug/net7.0/Demo.Net.IRepository.csproj.AssemblyReference.cache differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IRepository/obj/Debug/net7.0/Demo.Net.IRepository.dll b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IRepository/obj/Debug/net7.0/Demo.Net.IRepository.dll index e5e3453029aab66229e877b3a134ebb31015c4cc..3960a80b8287679295d8a240f9d5f49f86d81542 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IRepository/obj/Debug/net7.0/Demo.Net.IRepository.dll and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IRepository/obj/Debug/net7.0/Demo.Net.IRepository.dll differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IRepository/obj/Debug/net7.0/Demo.Net.IRepository.pdb b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IRepository/obj/Debug/net7.0/Demo.Net.IRepository.pdb index 341f5ea041ddb45ed359c7e53180cd51a1e8b5f3..a50f00215fbd47547d199d5a5352a1308e317780 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IRepository/obj/Debug/net7.0/Demo.Net.IRepository.pdb and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IRepository/obj/Debug/net7.0/Demo.Net.IRepository.pdb differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IServices/bin/Debug/net7.0/Demo.Net.IServices.dll b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IServices/bin/Debug/net7.0/Demo.Net.IServices.dll index 081652c507a872d7b8c434ccfcf941a008b37e3f..4bf530a8b3155ad6603c940bc11a95f0a6f7398f 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IServices/bin/Debug/net7.0/Demo.Net.IServices.dll and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IServices/bin/Debug/net7.0/Demo.Net.IServices.dll differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IServices/bin/Debug/net7.0/Demo.Net.IServices.pdb b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IServices/bin/Debug/net7.0/Demo.Net.IServices.pdb index 2db5039dff64d3837af841b0f8269444585c021a..6b85cded0bef1ee8f72df194710891aceed210c4 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IServices/bin/Debug/net7.0/Demo.Net.IServices.pdb and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IServices/bin/Debug/net7.0/Demo.Net.IServices.pdb differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IServices/bin/Debug/net7.0/Demo.Net.Model.dll b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IServices/bin/Debug/net7.0/Demo.Net.Model.dll index daefc61409a79de215f09391fef73fdf40f2b7a5..c59850415c1dab88b61e46a31e53039719971934 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IServices/bin/Debug/net7.0/Demo.Net.Model.dll and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IServices/bin/Debug/net7.0/Demo.Net.Model.dll differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IServices/bin/Debug/net7.0/Demo.Net.Model.pdb b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IServices/bin/Debug/net7.0/Demo.Net.Model.pdb index 920c29456e8dd6f40c76f17120321f99853892f6..a5ddc9455ebee859436bf99f144b836380ea6d35 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IServices/bin/Debug/net7.0/Demo.Net.Model.pdb and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IServices/bin/Debug/net7.0/Demo.Net.Model.pdb differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IServices/obj/Debug/net7.0/Demo.Net.IServices.assets.cache b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IServices/obj/Debug/net7.0/Demo.Net.IServices.assets.cache index 98d5bff0d436e6f41de53a30e216800b8ba4cf29..785d23f2503a3553867bf9685523787954289b85 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IServices/obj/Debug/net7.0/Demo.Net.IServices.assets.cache and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IServices/obj/Debug/net7.0/Demo.Net.IServices.assets.cache differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IServices/obj/Debug/net7.0/Demo.Net.IServices.csproj.AssemblyReference.cache b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IServices/obj/Debug/net7.0/Demo.Net.IServices.csproj.AssemblyReference.cache index 97d774cc92eeb7394a1e8d02e2c8f7f7e09067db..e16505f872f651097988e06b70e024fbed6e4ff8 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IServices/obj/Debug/net7.0/Demo.Net.IServices.csproj.AssemblyReference.cache and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IServices/obj/Debug/net7.0/Demo.Net.IServices.csproj.AssemblyReference.cache differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IServices/obj/Debug/net7.0/Demo.Net.IServices.dll b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IServices/obj/Debug/net7.0/Demo.Net.IServices.dll index 081652c507a872d7b8c434ccfcf941a008b37e3f..4bf530a8b3155ad6603c940bc11a95f0a6f7398f 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IServices/obj/Debug/net7.0/Demo.Net.IServices.dll and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IServices/obj/Debug/net7.0/Demo.Net.IServices.dll differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IServices/obj/Debug/net7.0/Demo.Net.IServices.pdb b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IServices/obj/Debug/net7.0/Demo.Net.IServices.pdb index 2db5039dff64d3837af841b0f8269444585c021a..6b85cded0bef1ee8f72df194710891aceed210c4 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IServices/obj/Debug/net7.0/Demo.Net.IServices.pdb and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.IServices/obj/Debug/net7.0/Demo.Net.IServices.pdb differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Model/Models/ProgramschoolsystemDbContext.cs b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Model/Models/ProgramschoolsystemDbContext.cs index a6ab23e5c5e1bb0a11e467a398cb80c44dc886b3..aacabf990ed666c45fb0d2acd363a194092938a5 100644 --- a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Model/Models/ProgramschoolsystemDbContext.cs +++ b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Model/Models/ProgramschoolsystemDbContext.cs @@ -593,7 +593,11 @@ public partial class ProgramschoolsystemDbContext : DbContext modelBuilder.Entity().HasQueryFilter(c => (bool)!c.IsDelete); modelBuilder.Entity().HasQueryFilter(c => (bool)!c.IsDelete); modelBuilder.Entity().HasQueryFilter(c => (bool)!c.IsDelete); +<<<<<<< HEAD + modelBuilder.Entity().HasQueryFilter(c=>(bool)!c.IsDelete); +======= modelBuilder.Entity().HasQueryFilter(c => (bool)!c.IsDelete); +>>>>>>> master #endregion } } \ No newline at end of file diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Model/bin/Debug/net7.0/Demo.Net.Model.dll b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Model/bin/Debug/net7.0/Demo.Net.Model.dll index daefc61409a79de215f09391fef73fdf40f2b7a5..c59850415c1dab88b61e46a31e53039719971934 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Model/bin/Debug/net7.0/Demo.Net.Model.dll and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Model/bin/Debug/net7.0/Demo.Net.Model.dll differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Model/bin/Debug/net7.0/Demo.Net.Model.pdb b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Model/bin/Debug/net7.0/Demo.Net.Model.pdb index 920c29456e8dd6f40c76f17120321f99853892f6..a5ddc9455ebee859436bf99f144b836380ea6d35 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Model/bin/Debug/net7.0/Demo.Net.Model.pdb and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Model/bin/Debug/net7.0/Demo.Net.Model.pdb differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Model/obj/Debug/net7.0/Demo.Net.Model.assets.cache b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Model/obj/Debug/net7.0/Demo.Net.Model.assets.cache index f6545713996d32e1f91f2a7ca98d5ac740607864..ccb68c4596789e1bef07a9170c05a4ba3c986e16 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Model/obj/Debug/net7.0/Demo.Net.Model.assets.cache and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Model/obj/Debug/net7.0/Demo.Net.Model.assets.cache differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Model/obj/Debug/net7.0/Demo.Net.Model.dll b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Model/obj/Debug/net7.0/Demo.Net.Model.dll index daefc61409a79de215f09391fef73fdf40f2b7a5..c59850415c1dab88b61e46a31e53039719971934 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Model/obj/Debug/net7.0/Demo.Net.Model.dll and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Model/obj/Debug/net7.0/Demo.Net.Model.dll differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Model/obj/Debug/net7.0/Demo.Net.Model.pdb b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Model/obj/Debug/net7.0/Demo.Net.Model.pdb index 920c29456e8dd6f40c76f17120321f99853892f6..a5ddc9455ebee859436bf99f144b836380ea6d35 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Model/obj/Debug/net7.0/Demo.Net.Model.pdb and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Model/obj/Debug/net7.0/Demo.Net.Model.pdb differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Model/obj/Debug/net7.0/ref/Demo.Net.Model.dll b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Model/obj/Debug/net7.0/ref/Demo.Net.Model.dll index fd59daca3be1aad2aaf0c92b71eb894677ad3057..bd1087734eea532ce7d87678dfe2ff57e44ea735 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Model/obj/Debug/net7.0/ref/Demo.Net.Model.dll and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Model/obj/Debug/net7.0/ref/Demo.Net.Model.dll differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Model/obj/Debug/net7.0/refint/Demo.Net.Model.dll b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Model/obj/Debug/net7.0/refint/Demo.Net.Model.dll index fd59daca3be1aad2aaf0c92b71eb894677ad3057..bd1087734eea532ce7d87678dfe2ff57e44ea735 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Model/obj/Debug/net7.0/refint/Demo.Net.Model.dll and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Model/obj/Debug/net7.0/refint/Demo.Net.Model.dll differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/Controllers/CourseTypeController.cs b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/Controllers/CourseTypeController.cs index a577b9d0d720e59077cfa17541fefce82a7e9c1d..a190780f1a964576c832733eacb0bdc9b7883b69 100644 --- a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/Controllers/CourseTypeController.cs +++ b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/Controllers/CourseTypeController.cs @@ -110,6 +110,14 @@ namespace Demo.Net.ProgramSchoolSystemAPI.Controllers [HttpPost] public async Task> updateCourseType(int coursetypeId, string coursename, bool isClassEnd) { +<<<<<<< HEAD + + var coursetype = await coursetypeinfoService.FindOneAsync(c => c.CourseTypeId == id); + coursetype.CourseTypeName = coursename; + bool isSuccess = await coursetypeinfoService.UpdateAsync(coursetype); + if (isSuccess) + { +======= //课程类型表 var coursetype = await coursetypeinfoService.FindOneAsync(c => c.CourseTypeId == coursetypeId); @@ -125,12 +133,14 @@ namespace Demo.Net.ProgramSchoolSystemAPI.Controllers bool isSuccess = await coursetypeinfoService.UpdateAsync(coursetype); if (isSuccess) { +>>>>>>> master return apiReturnsHelper.Success("修改成功"); } else { return apiReturnsHelper.Fail("修改失败"); } + } } } \ No newline at end of file diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/Controllers/FileController.cs b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/Controllers/FileController.cs index b2a8aa2b09b64d85aa103c0865fb34e9ee39564e..f35ccf83d43713fcee854c57172c5bf4aaa7dcda 100644 --- a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/Controllers/FileController.cs +++ b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/Controllers/FileController.cs @@ -5,15 +5,21 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using MimeKit; using Renci.SshNet; +<<<<<<< HEAD +using Renci.SshNet.Async; +using System.IO.Compression; +======= using Renci.SshNet.Sftp; using Microsoft.AspNetCore.Http; using System.IO; using System.Threading.Tasks; +>>>>>>> master namespace Demo.Net.ProgramSchoolSystemAPI.Controllers { [Route("api/[controller]/[action]")] [ApiController] + [Authorize] public class FileController : ControllerBase { private readonly ApiReturnsHelper apiReturnsHelper = new ApiReturnsHelper(); @@ -42,6 +48,216 @@ namespace Demo.Net.ProgramSchoolSystemAPI.Controllers 视频文件：video/mp4、video/mpeg、video/webm等。 应用程序文件：application/json、application/pdf、application/xml等。 */ + /// + /// 删除资料 + /// + /// + /// + [HttpPost] + public async Task> DelFile(int id) + { + var file = await studymateinfoService.FindByIdAsync(id); + if (file == null) + { + return apiReturnsHelper.Success("找不到这个文件"); + } + else + { + file.IsDelete = true; + bool isSuccess = await studymateinfoService.DeleteAsync(file); + if (isSuccess) + { + return apiReturnsHelper.Success("删除成功"); + } + else + { + return apiReturnsHelper.Fail("删除失败"); + } + } + } + + /// + /// 下载单个文件 + /// + /// 文件路径 + /// + [HttpGet] + public ApiReturns GetFile(string folderPath, string filePath) + { + var fileServer = "yck28.top"; + var sshUsername = "root"; + var sshPassword = "Yck94036"; + var fullFilePath = "/root/program_school_system/program_school_system_study_file/" + filePath; + using (var sshClient = new SshClient(fileServer, sshUsername, sshPassword)) + { + sshClient.Connect(); + + if (sshClient.IsConnected) + { + var sftpClient = new SftpClient(sshClient.ConnectionInfo); + sftpClient.Connect(); + + try + { + var fileName = Path.GetFileName(fullFilePath); + var localFilePath = Path.Combine(folderPath, fileName); // 下载到临时目录 + + using (var fileStream = System.IO.File.OpenWrite(localFilePath)) + { + sftpClient.DownloadFile(fullFilePath, fileStream); + } + + var fileBytes = System.IO.File.ReadAllBytes(localFilePath); + var mimeType = MimeTypes.GetMimeType(fileName); // 通过文件名获取MIME类型 + + return apiReturnsHelper.Success(File(fileBytes, mimeType, fileName), "下载成功"); + } + catch (Exception ex) + { + // 异常处理 + return apiReturnsHelper.Fail(ex.Message); + } + finally + { + sftpClient.Disconnect(); + sshClient.Disconnect(); + } + } + else + { + return apiReturnsHelper.Fail(); + } + } + } + + private string _localFolderPath; // 用于保存下载文件夹的本地路径 + + /// + /// 下载文件夹下的所有文件 + /// + /// + [HttpGet] + public IActionResult GetFiles() + { + var fileServer = "yck28.top"; + var sshUsername = "root"; + var sshPassword = "Yck94036"; + var remoteFolderPath = "/root/program_school_system/program_school_system_study_file/"; + + using (var sshClient = new SshClient(fileServer, sshUsername, sshPassword)) + { + sshClient.Connect(); + + if (sshClient.IsConnected) + { + var sftpClient = new SftpClient(sshClient.ConnectionInfo); + sftpClient.Connect(); + + var files = GetFileNamesRecursively(sftpClient, remoteFolderPath); + + sftpClient.Disconnect(); + sshClient.Disconnect(); + + return Ok(files); + } + else + { + return StatusCode(500); + } + } + } + + private string[] GetFileNamesRecursively(SftpClient sftpClient, string remoteFolderPath) + { + var files = sftpClient.ListDirectory(remoteFolderPath); + var fileNames = new List(); + + foreach (var file in files) + { + if (file.IsRegularFile) + { + fileNames.Add(file.Name); + } + else if (file.IsDirectory && !file.Name.StartsWith(".")) + { + var subFolderFileNames = GetFileNamesRecursively(sftpClient, Path.Combine(remoteFolderPath, file.Name)); + fileNames.AddRange(subFolderFileNames); + } + } + + return fileNames.ToArray(); + } + + /// + /// 获取文件夹下的所有文件信息 + /// + /// + [HttpGet] + public async Task> GetAllStudyMate() + { + var studymate = await studymateinfoService.FindAllAsync(); + var data = studymate.GroupBy(s => s.CourseTypeId).ToDictionary(s => s.Key, s => s.ToList()); + return apiReturnsHelper.Success(data, "OK"); + //var fileServer = "yck28.top"; + //var sshUsername = "root"; + //var sshPassword = "Yck94036"; + //var remoteFolderPath = "/root/program_school_system/program_school_system_study_file/C++/"; // 替换为服务器上要下载的文件夹路径 + + //// 在桌面创建一个新的文件夹来保存下载的文件夹 + //var desktopPath = Environment.GetFolderPath(Environment.SpecialFolder.Desktop); + //var folderName = Guid.NewGuid().ToString(); // 使用唯一的文件夹名称，避免冲突 + //_localFolderPath = Path.Combine(desktopPath, folderName); + //Directory.CreateDirectory(_localFolderPath); + + //using (var sshClient = new SshClient(fileServer, sshUsername, sshPassword)) + //{ + // sshClient.Connect(); + + // if (sshClient.IsConnected) + // { + // var sftpClient = new SftpClient(sshClient.ConnectionInfo); + // sftpClient.Connect(); + + // await DownloadFilesRecursively(sftpClient, remoteFolderPath); + + // sftpClient.Disconnect(); + // sshClient.Disconnect(); + + // return Ok($"文件夹已成功下载到 {_localFolderPath}"); + // } + // else + // { + // return StatusCode(500); + // } + //} + } + + // 递归下载指定文件夹下的所有文件和子文件夹 + //private async Task DownloadFilesRecursively(SftpClient sftpClient, string remoteFolderPath) + //{ + // var files = sftpClient.ListDirectory(remoteFolderPath); + + // foreach (var file in files) + // { + // if (file.IsRegularFile) + // { + // var remoteFilePath = Path.Combine(remoteFolderPath, file.Name); + // var localFilePath = Path.Combine(_localFolderPath, file.Name); + + // using (var fileStream = System.IO.File.Create(localFilePath)) + // { + // await sftpClient.DownloadAsync(remoteFilePath, fileStream); + // } + // } + // else if (file.IsDirectory && !file.Name.StartsWith(".")) + // { + // var subFolderName = Path.Combine(_localFolderPath, file.Name); + // Directory.CreateDirectory(subFolderName); + + // await DownloadFilesRecursively(sftpClient, Path.Combine(remoteFolderPath, file.Name)); + // } + // } + //} /// /// 删除资料 diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.IRepository.dll b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.IRepository.dll index e5e3453029aab66229e877b3a134ebb31015c4cc..3960a80b8287679295d8a240f9d5f49f86d81542 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.IRepository.dll and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.IRepository.dll differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.IRepository.pdb b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.IRepository.pdb index 341f5ea041ddb45ed359c7e53180cd51a1e8b5f3..a50f00215fbd47547d199d5a5352a1308e317780 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.IRepository.pdb and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.IRepository.pdb differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.IServices.dll b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.IServices.dll index 081652c507a872d7b8c434ccfcf941a008b37e3f..4bf530a8b3155ad6603c940bc11a95f0a6f7398f 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.IServices.dll and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.IServices.dll differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.IServices.pdb b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.IServices.pdb index 2db5039dff64d3837af841b0f8269444585c021a..6b85cded0bef1ee8f72df194710891aceed210c4 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.IServices.pdb and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.IServices.pdb differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.Model.dll b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.Model.dll index daefc61409a79de215f09391fef73fdf40f2b7a5..c59850415c1dab88b61e46a31e53039719971934 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.Model.dll and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.Model.dll differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.Model.pdb b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.Model.pdb index 920c29456e8dd6f40c76f17120321f99853892f6..a5ddc9455ebee859436bf99f144b836380ea6d35 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.Model.pdb and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.Model.pdb differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.ProgramSchoolSystemAPI.dll b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.ProgramSchoolSystemAPI.dll index 17de7a64c80ce85bccfa57df177468d931a9533e..3e37478decef58d4692aad415ab10b12e24fde78 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.ProgramSchoolSystemAPI.dll and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.ProgramSchoolSystemAPI.dll differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.ProgramSchoolSystemAPI.pdb b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.ProgramSchoolSystemAPI.pdb index 061b50dcf6d818263f32be7e107632d6f2d44f94..2bee15ffb64a6a6e643369543c669c1489fd58e4 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.ProgramSchoolSystemAPI.pdb and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.ProgramSchoolSystemAPI.pdb differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.Repository.dll b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.Repository.dll index 7689c08c27da2e1d055988f1aef1838a998cfdee..dc3179cb6f497bb1bfd1072b2b99d4653239ca5d 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.Repository.dll and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.Repository.dll differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.Repository.pdb b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.Repository.pdb index 0805d9c8e149da93cd61e4a6281ddeb4f2abc033..95e8426be9d7a79e1840224179a4ad7efd6e3967 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.Repository.pdb and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.Repository.pdb differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.Services.dll b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.Services.dll index 85c05cdc5a4d0f0f370115b8f9a5397f01c33477..6e77428f66b3845be2d9486c4abaf59c726148c3 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.Services.dll and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.Services.dll differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.Services.pdb b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.Services.pdb index 6a76a8bcb5ad895a4de65e14eebf700e2cdaaec9..5e5917c05e746ecafb614191b361943c84472849 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.Services.pdb and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/bin/Debug/net7.0/Demo.Net.Services.pdb differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/obj/Debug/net7.0/Demo.Net.ProgramSchoolSystemAPI.assets.cache b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/obj/Debug/net7.0/Demo.Net.ProgramSchoolSystemAPI.assets.cache index a08b7c45f2335c05c57474c50579621a88470467..106b94819bb90d71ab766d3aa51282190da5bb5c 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/obj/Debug/net7.0/Demo.Net.ProgramSchoolSystemAPI.assets.cache and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/obj/Debug/net7.0/Demo.Net.ProgramSchoolSystemAPI.assets.cache differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/obj/Debug/net7.0/Demo.Net.ProgramSchoolSystemAPI.csproj.AssemblyReference.cache b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/obj/Debug/net7.0/Demo.Net.ProgramSchoolSystemAPI.csproj.AssemblyReference.cache index 7f992d232e34aee7365112d0f3a3b1d57a973560..225d031405e59a218c8bde9644114da92bb9ff49 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/obj/Debug/net7.0/Demo.Net.ProgramSchoolSystemAPI.csproj.AssemblyReference.cache and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/obj/Debug/net7.0/Demo.Net.ProgramSchoolSystemAPI.csproj.AssemblyReference.cache differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/obj/Debug/net7.0/Demo.Net.ProgramSchoolSystemAPI.dll b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/obj/Debug/net7.0/Demo.Net.ProgramSchoolSystemAPI.dll index 17de7a64c80ce85bccfa57df177468d931a9533e..3e37478decef58d4692aad415ab10b12e24fde78 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/obj/Debug/net7.0/Demo.Net.ProgramSchoolSystemAPI.dll and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/obj/Debug/net7.0/Demo.Net.ProgramSchoolSystemAPI.dll differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/obj/Debug/net7.0/Demo.Net.ProgramSchoolSystemAPI.pdb b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/obj/Debug/net7.0/Demo.Net.ProgramSchoolSystemAPI.pdb index 061b50dcf6d818263f32be7e107632d6f2d44f94..2bee15ffb64a6a6e643369543c669c1489fd58e4 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/obj/Debug/net7.0/Demo.Net.ProgramSchoolSystemAPI.pdb and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/obj/Debug/net7.0/Demo.Net.ProgramSchoolSystemAPI.pdb differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/obj/Debug/net7.0/ref/Demo.Net.ProgramSchoolSystemAPI.dll b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/obj/Debug/net7.0/ref/Demo.Net.ProgramSchoolSystemAPI.dll index e099468fe8dabf07d61950370c81bd795554f49b..cbcb9387dd2b737661fc5a9609c0e25ccb37be70 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/obj/Debug/net7.0/ref/Demo.Net.ProgramSchoolSystemAPI.dll and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/obj/Debug/net7.0/ref/Demo.Net.ProgramSchoolSystemAPI.dll differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/obj/Debug/net7.0/refint/Demo.Net.ProgramSchoolSystemAPI.dll b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/obj/Debug/net7.0/refint/Demo.Net.ProgramSchoolSystemAPI.dll index e099468fe8dabf07d61950370c81bd795554f49b..cbcb9387dd2b737661fc5a9609c0e25ccb37be70 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/obj/Debug/net7.0/refint/Demo.Net.ProgramSchoolSystemAPI.dll and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.ProgramSchoolSystemAPI/obj/Debug/net7.0/refint/Demo.Net.ProgramSchoolSystemAPI.dll differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Repository/bin/Debug/net7.0/Demo.Net.IRepository.dll b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Repository/bin/Debug/net7.0/Demo.Net.IRepository.dll index e5e3453029aab66229e877b3a134ebb31015c4cc..3960a80b8287679295d8a240f9d5f49f86d81542 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Repository/bin/Debug/net7.0/Demo.Net.IRepository.dll and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Repository/bin/Debug/net7.0/Demo.Net.IRepository.dll differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Repository/bin/Debug/net7.0/Demo.Net.IRepository.pdb b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Repository/bin/Debug/net7.0/Demo.Net.IRepository.pdb index 341f5ea041ddb45ed359c7e53180cd51a1e8b5f3..a50f00215fbd47547d199d5a5352a1308e317780 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Repository/bin/Debug/net7.0/Demo.Net.IRepository.pdb and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Repository/bin/Debug/net7.0/Demo.Net.IRepository.pdb differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Repository/bin/Debug/net7.0/Demo.Net.Model.dll b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Repository/bin/Debug/net7.0/Demo.Net.Model.dll index daefc61409a79de215f09391fef73fdf40f2b7a5..c59850415c1dab88b61e46a31e53039719971934 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Repository/bin/Debug/net7.0/Demo.Net.Model.dll and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Repository/bin/Debug/net7.0/Demo.Net.Model.dll differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Repository/bin/Debug/net7.0/Demo.Net.Model.pdb b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Repository/bin/Debug/net7.0/Demo.Net.Model.pdb index 920c29456e8dd6f40c76f17120321f99853892f6..a5ddc9455ebee859436bf99f144b836380ea6d35 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Repository/bin/Debug/net7.0/Demo.Net.Model.pdb and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Repository/bin/Debug/net7.0/Demo.Net.Model.pdb differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Repository/bin/Debug/net7.0/Demo.Net.Repository.dll b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Repository/bin/Debug/net7.0/Demo.Net.Repository.dll index 7689c08c27da2e1d055988f1aef1838a998cfdee..dc3179cb6f497bb1bfd1072b2b99d4653239ca5d 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Repository/bin/Debug/net7.0/Demo.Net.Repository.dll and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Repository/bin/Debug/net7.0/Demo.Net.Repository.dll differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Repository/bin/Debug/net7.0/Demo.Net.Repository.pdb b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Repository/bin/Debug/net7.0/Demo.Net.Repository.pdb index 0805d9c8e149da93cd61e4a6281ddeb4f2abc033..95e8426be9d7a79e1840224179a4ad7efd6e3967 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Repository/bin/Debug/net7.0/Demo.Net.Repository.pdb and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Repository/bin/Debug/net7.0/Demo.Net.Repository.pdb differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Repository/obj/Debug/net7.0/Demo.Net.Repository.assets.cache b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Repository/obj/Debug/net7.0/Demo.Net.Repository.assets.cache index 296d5445b4ee4e4061793b93d712d8ea64be5bd3..8b97c1f4f3062933ff866c2defdc742faee1be25 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Repository/obj/Debug/net7.0/Demo.Net.Repository.assets.cache and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Repository/obj/Debug/net7.0/Demo.Net.Repository.assets.cache differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Repository/obj/Debug/net7.0/Demo.Net.Repository.csproj.AssemblyReference.cache b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Repository/obj/Debug/net7.0/Demo.Net.Repository.csproj.AssemblyReference.cache index 9b98d4a3ca515f25d070556f2db790178f2d5b6a..2acaefa72273e0322f44d28c1c62f83cdb1e0be3 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Repository/obj/Debug/net7.0/Demo.Net.Repository.csproj.AssemblyReference.cache and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Repository/obj/Debug/net7.0/Demo.Net.Repository.csproj.AssemblyReference.cache differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Repository/obj/Debug/net7.0/Demo.Net.Repository.dll b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Repository/obj/Debug/net7.0/Demo.Net.Repository.dll index 7689c08c27da2e1d055988f1aef1838a998cfdee..dc3179cb6f497bb1bfd1072b2b99d4653239ca5d 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Repository/obj/Debug/net7.0/Demo.Net.Repository.dll and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Repository/obj/Debug/net7.0/Demo.Net.Repository.dll differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Repository/obj/Debug/net7.0/Demo.Net.Repository.pdb b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Repository/obj/Debug/net7.0/Demo.Net.Repository.pdb index 0805d9c8e149da93cd61e4a6281ddeb4f2abc033..95e8426be9d7a79e1840224179a4ad7efd6e3967 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Repository/obj/Debug/net7.0/Demo.Net.Repository.pdb and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Repository/obj/Debug/net7.0/Demo.Net.Repository.pdb differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/bin/Debug/net7.0/Demo.Net.IRepository.dll b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/bin/Debug/net7.0/Demo.Net.IRepository.dll index e5e3453029aab66229e877b3a134ebb31015c4cc..3960a80b8287679295d8a240f9d5f49f86d81542 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/bin/Debug/net7.0/Demo.Net.IRepository.dll and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/bin/Debug/net7.0/Demo.Net.IRepository.dll differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/bin/Debug/net7.0/Demo.Net.IRepository.pdb b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/bin/Debug/net7.0/Demo.Net.IRepository.pdb index 341f5ea041ddb45ed359c7e53180cd51a1e8b5f3..a50f00215fbd47547d199d5a5352a1308e317780 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/bin/Debug/net7.0/Demo.Net.IRepository.pdb and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/bin/Debug/net7.0/Demo.Net.IRepository.pdb differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/bin/Debug/net7.0/Demo.Net.IServices.dll b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/bin/Debug/net7.0/Demo.Net.IServices.dll index 081652c507a872d7b8c434ccfcf941a008b37e3f..4bf530a8b3155ad6603c940bc11a95f0a6f7398f 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/bin/Debug/net7.0/Demo.Net.IServices.dll and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/bin/Debug/net7.0/Demo.Net.IServices.dll differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/bin/Debug/net7.0/Demo.Net.IServices.pdb b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/bin/Debug/net7.0/Demo.Net.IServices.pdb index 2db5039dff64d3837af841b0f8269444585c021a..6b85cded0bef1ee8f72df194710891aceed210c4 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/bin/Debug/net7.0/Demo.Net.IServices.pdb and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/bin/Debug/net7.0/Demo.Net.IServices.pdb differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/bin/Debug/net7.0/Demo.Net.Model.dll b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/bin/Debug/net7.0/Demo.Net.Model.dll index daefc61409a79de215f09391fef73fdf40f2b7a5..c59850415c1dab88b61e46a31e53039719971934 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/bin/Debug/net7.0/Demo.Net.Model.dll and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/bin/Debug/net7.0/Demo.Net.Model.dll differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/bin/Debug/net7.0/Demo.Net.Model.pdb b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/bin/Debug/net7.0/Demo.Net.Model.pdb index 920c29456e8dd6f40c76f17120321f99853892f6..a5ddc9455ebee859436bf99f144b836380ea6d35 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/bin/Debug/net7.0/Demo.Net.Model.pdb and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/bin/Debug/net7.0/Demo.Net.Model.pdb differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/bin/Debug/net7.0/Demo.Net.Repository.dll b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/bin/Debug/net7.0/Demo.Net.Repository.dll index 7689c08c27da2e1d055988f1aef1838a998cfdee..dc3179cb6f497bb1bfd1072b2b99d4653239ca5d 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/bin/Debug/net7.0/Demo.Net.Repository.dll and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/bin/Debug/net7.0/Demo.Net.Repository.dll differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/bin/Debug/net7.0/Demo.Net.Repository.pdb b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/bin/Debug/net7.0/Demo.Net.Repository.pdb index 0805d9c8e149da93cd61e4a6281ddeb4f2abc033..95e8426be9d7a79e1840224179a4ad7efd6e3967 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/bin/Debug/net7.0/Demo.Net.Repository.pdb and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/bin/Debug/net7.0/Demo.Net.Repository.pdb differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/bin/Debug/net7.0/Demo.Net.Services.dll b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/bin/Debug/net7.0/Demo.Net.Services.dll index 85c05cdc5a4d0f0f370115b8f9a5397f01c33477..6e77428f66b3845be2d9486c4abaf59c726148c3 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/bin/Debug/net7.0/Demo.Net.Services.dll and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/bin/Debug/net7.0/Demo.Net.Services.dll differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/bin/Debug/net7.0/Demo.Net.Services.pdb b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/bin/Debug/net7.0/Demo.Net.Services.pdb index 6a76a8bcb5ad895a4de65e14eebf700e2cdaaec9..5e5917c05e746ecafb614191b361943c84472849 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/bin/Debug/net7.0/Demo.Net.Services.pdb and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/bin/Debug/net7.0/Demo.Net.Services.pdb differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/obj/Debug/net7.0/Demo.Net.Services.assets.cache b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/obj/Debug/net7.0/Demo.Net.Services.assets.cache index 9a50120d73c36015c52901b7f5aaeec6b604f18a..73e46f1623b2d7081526c4623d645deb8abcea82 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/obj/Debug/net7.0/Demo.Net.Services.assets.cache and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/obj/Debug/net7.0/Demo.Net.Services.assets.cache differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/obj/Debug/net7.0/Demo.Net.Services.csproj.AssemblyReference.cache b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/obj/Debug/net7.0/Demo.Net.Services.csproj.AssemblyReference.cache index a4f42869a11ba984c1a5f27f03703dd2a7cc5c42..c3fc8f10725eabb775b3817908212876d8110149 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/obj/Debug/net7.0/Demo.Net.Services.csproj.AssemblyReference.cache and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/obj/Debug/net7.0/Demo.Net.Services.csproj.AssemblyReference.cache differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/obj/Debug/net7.0/Demo.Net.Services.dll b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/obj/Debug/net7.0/Demo.Net.Services.dll index 85c05cdc5a4d0f0f370115b8f9a5397f01c33477..6e77428f66b3845be2d9486c4abaf59c726148c3 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/obj/Debug/net7.0/Demo.Net.Services.dll and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/obj/Debug/net7.0/Demo.Net.Services.dll differ diff --git a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/obj/Debug/net7.0/Demo.Net.Services.pdb b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/obj/Debug/net7.0/Demo.Net.Services.pdb index 6a76a8bcb5ad895a4de65e14eebf700e2cdaaec9..5e5917c05e746ecafb614191b361943c84472849 100644 Binary files a/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/obj/Debug/net7.0/Demo.Net.Services.pdb and b/Demo.Net.ProgramSchoolSystemAPI/Demo.Net.Services/obj/Debug/net7.0/Demo.Net.Services.pdb differ diff --git a/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/api/classroom.js b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/api/classroom.js index 09435d69ceb26c283203093631c7c32e54361698..cbb935f0a7b5db8cf31ea4a06c957c1c1df5c6a6 100644 --- a/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/api/classroom.js +++ b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/api/classroom.js @@ -24,5 +24,4 @@ export function delClassRoom(classroomnum) { method: 'post', params: { classroomnum } }) - } \ No newline at end of file diff --git a/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/api/coursesche.js b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/api/coursesche.js index 1ac5d458e9aca25611284003abea02cf4f08828e..8fe55f8600ba4eba1a8bbfb0e1250971f91929d6 100644 --- a/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/api/coursesche.js +++ b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/api/coursesche.js @@ -14,7 +14,7 @@ export function AddCourseSche(data) { console.log(data); return request({ - url: 'Coursesche/AddCourseSche', + url: 'Coursesche/addCourseSche', method: 'post', params: { teacherName:data.teacherName,courseName:data.courseName,className:data.className,courseTypeName:data.courseTypeName,classRoomNum:data.classRoomNum,StartTime:data.startTime,EndTime:data.endTime} }) diff --git a/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/04c4ca11-50a6-4028-a989-6f84b878a218.jpg b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/04c4ca11-50a6-4028-a989-6f84b878a218.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b9a18b1e5eeaa4a5aa0440ebd88065bbd4fd0234 Binary files /dev/null and b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/04c4ca11-50a6-4028-a989-6f84b878a218.jpg differ diff --git a/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/31a8a73b-db94-4dc6-9178-9a05915577a0.jpg b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/31a8a73b-db94-4dc6-9178-9a05915577a0.jpg new file mode 100644 index 0000000000000000000000000000000000000000..2fd006d9d4cc298f4b62b98e32e17462c34dfb24 Binary files /dev/null and b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/31a8a73b-db94-4dc6-9178-9a05915577a0.jpg differ diff --git a/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/3f6f1b86-c892-4a97-b6b7-9954cb3d978a.jpg b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/3f6f1b86-c892-4a97-b6b7-9954cb3d978a.jpg new file mode 100644 index 0000000000000000000000000000000000000000..2fd006d9d4cc298f4b62b98e32e17462c34dfb24 Binary files /dev/null and b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/3f6f1b86-c892-4a97-b6b7-9954cb3d978a.jpg differ diff --git a/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/4e4c2865-3cf4-4eb1-8bbb-219c06b45125.jpg b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/4e4c2865-3cf4-4eb1-8bbb-219c06b45125.jpg new file mode 100644 index 0000000000000000000000000000000000000000..2fd006d9d4cc298f4b62b98e32e17462c34dfb24 Binary files /dev/null and b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/4e4c2865-3cf4-4eb1-8bbb-219c06b45125.jpg differ diff --git a/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/57183a0c-214a-4ba4-bad2-3be4570676be.jpg b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/57183a0c-214a-4ba4-bad2-3be4570676be.jpg new file mode 100644 index 0000000000000000000000000000000000000000..2fd006d9d4cc298f4b62b98e32e17462c34dfb24 Binary files /dev/null and b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/57183a0c-214a-4ba4-bad2-3be4570676be.jpg differ diff --git a/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/790cdfaf-d520-4e8c-acdb-34524ac06417.jpg b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/790cdfaf-d520-4e8c-acdb-34524ac06417.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b9a18b1e5eeaa4a5aa0440ebd88065bbd4fd0234 Binary files /dev/null and b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/790cdfaf-d520-4e8c-acdb-34524ac06417.jpg differ diff --git a/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/7eb2726b-9776-4595-b5bc-aa0b04c3e8b1.jpg b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/7eb2726b-9776-4595-b5bc-aa0b04c3e8b1.jpg new file mode 100644 index 0000000000000000000000000000000000000000..2fd006d9d4cc298f4b62b98e32e17462c34dfb24 Binary files /dev/null and b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/7eb2726b-9776-4595-b5bc-aa0b04c3e8b1.jpg differ diff --git a/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/92205844-2fbc-48da-b7ec-6a94ffc4ce7b.jpg b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/92205844-2fbc-48da-b7ec-6a94ffc4ce7b.jpg new file mode 100644 index 0000000000000000000000000000000000000000..2fd006d9d4cc298f4b62b98e32e17462c34dfb24 Binary files /dev/null and b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/92205844-2fbc-48da-b7ec-6a94ffc4ce7b.jpg differ diff --git a/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/9229edfe-f1b4-4cec-abe4-75f8a85e3019.jpg b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/9229edfe-f1b4-4cec-abe4-75f8a85e3019.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b9a18b1e5eeaa4a5aa0440ebd88065bbd4fd0234 Binary files /dev/null and b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/9229edfe-f1b4-4cec-abe4-75f8a85e3019.jpg differ diff --git a/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/97530a19-203c-4918-86af-73d3f9b5ddcd.jpg b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/97530a19-203c-4918-86af-73d3f9b5ddcd.jpg new file mode 100644 index 0000000000000000000000000000000000000000..2fd006d9d4cc298f4b62b98e32e17462c34dfb24 Binary files /dev/null and b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/97530a19-203c-4918-86af-73d3f9b5ddcd.jpg differ diff --git a/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/98380c19-80b2-404d-8df5-b28d1b1f5851.jpg b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/98380c19-80b2-404d-8df5-b28d1b1f5851.jpg new file mode 100644 index 0000000000000000000000000000000000000000..2fd006d9d4cc298f4b62b98e32e17462c34dfb24 Binary files /dev/null and b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/98380c19-80b2-404d-8df5-b28d1b1f5851.jpg differ diff --git a/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/b442d816-2ef9-46b4-812f-f0bf4c04bc25.jpg b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/b442d816-2ef9-46b4-812f-f0bf4c04bc25.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b9a18b1e5eeaa4a5aa0440ebd88065bbd4fd0234 Binary files /dev/null and b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/b442d816-2ef9-46b4-812f-f0bf4c04bc25.jpg differ diff --git a/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/b5ed0b84-d2e8-4e69-9a45-7f25e5e5b512.jpg b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/b5ed0b84-d2e8-4e69-9a45-7f25e5e5b512.jpg new file mode 100644 index 0000000000000000000000000000000000000000..2fd006d9d4cc298f4b62b98e32e17462c34dfb24 Binary files /dev/null and b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/b5ed0b84-d2e8-4e69-9a45-7f25e5e5b512.jpg differ diff --git a/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/c1093b58-d1aa-4eb4-85a8-16efab756828.jpg b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/c1093b58-d1aa-4eb4-85a8-16efab756828.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b9a18b1e5eeaa4a5aa0440ebd88065bbd4fd0234 Binary files /dev/null and b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/c1093b58-d1aa-4eb4-85a8-16efab756828.jpg differ diff --git a/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/d4ec0d73-f254-45ca-aa1d-c4ae906b115d.jpg b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/d4ec0d73-f254-45ca-aa1d-c4ae906b115d.jpg new file mode 100644 index 0000000000000000000000000000000000000000..b9a18b1e5eeaa4a5aa0440ebd88065bbd4fd0234 Binary files /dev/null and b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/d4ec0d73-f254-45ca-aa1d-c4ae906b115d.jpg differ diff --git a/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/e17413b1-a0f1-49c0-9894-8b9f1318cfce.jpg b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/e17413b1-a0f1-49c0-9894-8b9f1318cfce.jpg new file mode 100644 index 0000000000000000000000000000000000000000..2fd006d9d4cc298f4b62b98e32e17462c34dfb24 Binary files /dev/null and b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/e17413b1-a0f1-49c0-9894-8b9f1318cfce.jpg differ diff --git a/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/f7cd826d-3b21-4941-b9ee-45a778d30bb2.jpg b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/f7cd826d-3b21-4941-b9ee-45a778d30bb2.jpg new file mode 100644 index 0000000000000000000000000000000000000000..2fd006d9d4cc298f4b62b98e32e17462c34dfb24 Binary files /dev/null and b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/assets/imgs/f7cd826d-3b21-4941-b9ee-45a778d30bb2.jpg differ diff --git a/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/router/index.js b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/router/index.js index ecfa2a5a18b196b60dcfe2508026f46b628fb3db..10b9f542a8534754035f059a4b74a8e02b2f119b 100644 --- a/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/router/index.js +++ b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/router/index.js @@ -262,7 +262,6 @@ export const constantRouterMap = [ } ] }, - { path: '*', redirect: '/404', meta: { roles: ['admin', 'teacher', 'student'] }, hidden: true } // 404 page must be placed at the end !!! ] diff --git a/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/views/classroomadmin/index.vue b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/views/classroomadmin/index.vue new file mode 100644 index 0000000000000000000000000000000000000000..0cecb7b6ca820724df10191eb88e200dd2903780 --- /dev/null +++ b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/views/classroomadmin/index.vue @@ -0,0 +1,6 @@ + \ No newline at end of file diff --git a/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/views/schoolsystem/addStudy/index.vue b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/views/schoolsystem/addStudy/index.vue new file mode 100644 index 0000000000000000000000000000000000000000..b436a26894db7e0851cf8ba15ab6bb01034473a0 --- /dev/null +++ b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/views/schoolsystem/addStudy/index.vue @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/views/schoolsystem/attendrecord/index.vue b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/views/schoolsystem/attendrecord/index.vue index 19632d90f61e8eb5437fa0bea935214600563a6d..6c41ce5cc6056dce701911807e190767f3194045 100644 --- a/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/views/schoolsystem/attendrecord/index.vue +++ b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/views/schoolsystem/attendrecord/index.vue @@ -157,8 +157,8 @@ export default { this.tableData = data.slice(startIndex, endIndex).map(item => { - const endTimeString = item.endTime; - let dateObj = new Date(endTimeString); + const startTimeString = item.startTime; + let dateObj = new Date(startTimeString); let year = dateObj.getFullYear(); let month = String(dateObj.getMonth() + 1).padStart(2, '0'); let day = String(dateObj.getDate()).padStart(2, '0'); @@ -166,15 +166,15 @@ export default { let minutes = String(dateObj.getMinutes()).padStart(2, '0'); let startTime = `${year}-${month}-${day} ${hours}:${minutes}`; - const startTimetring = item.startTime; - dateObj = new Date(startTimetring); + const endTimeString = item.endTime; + dateObj = new Date(endTimeString); year = dateObj.getFullYear(); month = String(dateObj.getMonth() + 1).padStart(2, '0'); day = String(dateObj.getDate()).padStart(2, '0'); hours = String(dateObj.getHours()).padStart(2, '0'); minutes = String(dateObj.getMinutes()).padStart(2, '0'); let endTime = `${year}-${month}-${day} ${hours}:${minutes}`; - + if (item.sex === true) { return { ...item, sex: '男', endTime: endTime, startTime: startTime } } else { diff --git a/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/views/schoolsystem/editUser/index.vue b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/views/schoolsystem/editUser/index.vue index cba8d82f314586bd70f20fbd256e4351e089e62a..faf385432cdc9519a2bbe1c7254028824c746612 100644 --- a/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/views/schoolsystem/editUser/index.vue +++ b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/views/schoolsystem/editUser/index.vue @@ -286,4 +286,4 @@ export default { .error-message { color: red; } - \ No newline at end of file + diff --git a/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/views/schoolsystem/personalcenter/Info.vue b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/views/schoolsystem/personalcenter/Info.vue index 7f4ecbfa97c01de5f01a8fec23e8135f5e6e178c..2969aab6a7d2c453b1f3876d7e5276b799ea5422 100644 --- a/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/views/schoolsystem/personalcenter/Info.vue +++ b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/views/schoolsystem/personalcenter/Info.vue @@ -195,4 +195,3 @@ export default { - diff --git a/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/views/schoolsystem/schedulelessons/index.vue b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/views/schoolsystem/schedulelessons/index.vue index a02cd07916290f6a3c02533f4c734da70eec5a4a..a5a2cba850b01824fa219b0e9fc841921823bea6 100644 --- a/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/views/schoolsystem/schedulelessons/index.vue +++ b/ProgramSchoolSystemFrontEnd/vue_admin_template_master/src/views/schoolsystem/schedulelessons/index.vue @@ -40,8 +40,8 @@ - + @@ -59,9 +59,17 @@ + + + + + + - - + @@ -73,12 +81,6 @@ - - - - - -
取 消 @@ -96,7 +98,7 @@ import { getAllClassName } from '@/api/class' import { getAllClassRoom } from '@/api/classroom' import { getAllCourseType } from '@/api/coursetype' import { getAllTeacher } from '@/api/teacher' -import { GetAllCourse, GetCourseTypeById } from '@/api/course' +import { GetCourseTypeById } from '@/api/course' export default { data() { @@ -111,9 +113,11 @@ export default { allClassRoom: [], allCourseType: [], allCourse: [], + filteredAllClass: [], courseTypeOptions: [], // 添加课程类型选项 selectedCourseTypeId: '', addFormVisible: false, + isTimeSelected: false, isFirstFieldSelected: false, // 新增 isFirstFieldSelected 属性 form: { id: '', @@ -174,9 +178,8 @@ export default { } this.tableData = data.slice(startIndex, endIndex).map(item => { - - const endTimeString = item.endTime; - let dateObj = new Date(endTimeString); + const startTimeString = item.startTime; + let dateObj = new Date(startTimeString); let year = dateObj.getFullYear(); let month = String(dateObj.getMonth() + 1).padStart(2, '0'); let day = String(dateObj.getDate()).padStart(2, '0'); @@ -184,8 +187,8 @@ export default { let minutes = String(dateObj.getMinutes()).padStart(2, '0'); let startTime = `${year}-${month}-${day} ${hours}:${minutes}`; - const startTimetring = item.startTime; - dateObj = new Date(startTimetring); + const endTimeString = item.endTime; + dateObj = new Date(endTimeString); year = dateObj.getFullYear(); month = String(dateObj.getMonth() + 1).padStart(2, '0'); day = String(dateObj.getDate()).padStart(2, '0'); @@ -193,8 +196,8 @@ export default { minutes = String(dateObj.getMinutes()).padStart(2, '0'); let endTime = `${year}-${month}-${day} ${hours}:${minutes}`; - return { ...item, endTime: endTime, startTime: startTime } - }) + return { ...item, endTime: endTime, startTime: startTime }; + }); } catch (error) { console.error(error) } @@ -217,14 +220,6 @@ export default { console.error(error); } }, - async fetchAllClassRoom() { - try { - const response = await getAllClassRoom() - this.allClassRoom = response.data - } catch (error) { - console.error(error); - } - }, async fetchAllCourseType() { try { const response = await getAllCourseType() @@ -282,7 +277,60 @@ export default { this.selectedCourseTypeId = selectedCourseType ? selectedCourseType.courseTypeId : ''; this.fetchCourse(); }, + handleStartTimeChange(value) { + // 处理开始时间选择事件 + this.form.startTime = value; + //             this.isTimeSelected = true; + this.fetchAllClassRoom(); // 获取最新的教室数据 + }, + + handleEndTimeChange(value) { + // 处理结束时间选择事件 + this.form.endTime = value + this.isTimeSelected = true; + this.fetchAllClassRoom(); // 获取最新的教室数据 + }, + async fetchAllClassRoom() { + try { + const response = await getAllClassRoom(); + const allClassRoom = response.data; + + // 根据选择的时间区间，判断教室是否可用 + const startTime = this.form.startTime; + const endTime = this.form.endTime; + + const isClassRoomAvailable = (classRoomNum, tableData) => { + const isOverlap = tableData.find(item => { + // 如果存在时间交叉，则说明该教室在选择的时间区间内已被占用 + const itemStartTime = new Date(item.startTime); + const itemEndTime = new Date(item.endTime); + const selectedStartTime = new Date(startTime); + const selectedEndTime = new Date(endTime); + return item.classRoomNum === classRoomNum && + (selectedStartTime < itemEndTime && selectedEndTime > itemStartTime) + }); + return !isOverlap; + } + + // 调用 isClassRoomAvailable 函数判断教室是否可用 + const availableClassRooms = this.tableData.filter(classRoom => { + return isClassRoomAvailable(classRoom.classRoomNum, this.tableData) + }); + + + // 使用 availableClassRooms 中的 classRoomNum 进行筛选 + this.filteredAllClass = allClassRoom.filter(classItem => { + return availableClassRooms.some(availableItem => availableItem.classRoomNum === classItem.classRoomNum); + }); + // console.log(filteredAllClass); + } catch (error) { + console.error(error); + } + }, + + }, + watch: { searchKeyword: function (newKeyword, oldKeyword) { if (newKeyword !== oldKeyword) {