From 15ab4b5c437985df71273c21a72f8216ffe38605 Mon Sep 17 00:00:00 2001 From: Guan Date: Wed, 12 Nov 2025 15:00:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BA=86=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=BD=8D=E7=BD=AE=EF=BC=8C=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BA=86=E6=9C=AC=E5=9C=B0=E5=AD=98=E5=82=A8=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=EF=BC=8C=E9=85=8D=E7=BD=AE=E4=BB=8E=20www/up?= =?UTF-8?q?loads/likeadmin-java/=20=E6=94=B9=E6=88=90=20D:/www/uploads/lik?= =?UTF-8?q?eadmin-java/=20=E5=90=A6=E5=88=99windows=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E4=B8=8B=E6=9C=AC=E5=9C=B0=E5=AD=98=E5=82=A8=E6=96=B9=E5=BC=8F?= =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mdd/admin/controller/ClassController.java | 6 +++--- .../mdd/admin/controller/CollegeController.java | 6 +++--- .../mdd/admin/controller/CourseController.java | 6 +++--- .../controller/CurriculumVersionController.java | 6 +++--- .../mdd/admin/controller/MajorController.java | 6 +++--- .../controller/MajorCurriculumController.java | 6 +++--- .../admin/controller/StudentInfoController.java | 6 +++--- .../mdd/admin/controller/TeacherController.java | 6 +++--- .../controller/TeacherCourseController.java | 4 ++-- .../controller/TeacherUnavailableController.java | 6 +++--- .../mdd/admin/controller/UploadController.java | 16 ++++++++-------- .../com/mdd/admin/service/IClassService.java | 6 +++--- .../com/mdd/admin/service/ICollegeService.java | 6 +++--- .../com/mdd/admin/service/ICourseService.java | 6 +++--- .../admin/service/ICurriculumVersionService.java | 6 +++--- .../admin/service/IMajorCurriculumService.java | 6 +++--- .../com/mdd/admin/service/IMajorService.java | 6 +++--- .../mdd/admin/service/IStudentInfoService.java | 6 +++--- .../mdd/admin/service/ITeacherCourseService.java | 6 +++--- .../com/mdd/admin/service/ITeacherService.java | 6 +++--- .../service/ITeacherUnavailableService.java | 6 +++--- .../mdd/admin/service/impl/ClassServiceImpl.java | 6 +++--- .../admin/service/impl/CollegeServiceImpl.java | 6 +++--- .../admin/service/impl/CourseServiceImpl.java | 6 +++--- .../impl/CurriculumVersionServiceImpl.java | 6 +++--- .../service/impl/MajorCurriculumServiceImpl.java | 6 +++--- .../mdd/admin/service/impl/MajorServiceImpl.java | 6 +++--- .../service/impl/StudentInfoServiceImpl.java | 6 +++--- .../service/impl/TeacherCourseServiceImpl.java | 6 +++--- .../admin/service/impl/TeacherServiceImpl.java | 10 +++++----- .../impl/TeacherUnavailableServiceImpl.java | 6 +++--- .../service/impl/admin/AdminServiceImpl.java | 16 ++++++++++++++++ .../ClassCreateValidate.java | 3 +-- .../ClassSearchValidate.java | 2 +- .../ClassUpdateValidate.java | 4 ++-- .../{ => college}/CollegeCreateValidate.java | 2 +- .../{ => college}/CollegeSearchValidate.java | 2 +- .../{ => college}/CollegeUpdateValidate.java | 2 +- .../{ => course}/CourseCreateValidate.java | 3 +-- .../{ => course}/CourseSearchValidate.java | 3 +-- .../{ => course}/CourseUpdateValidate.java | 3 +-- .../CurriculumVersionCreateValidate.java | 3 +-- .../CurriculumVersionSearchValidate.java | 2 +- .../CurriculumVersionUpdateValidate.java | 4 ++-- .../{ => major}/MajorCreateValidate.java | 3 +-- .../MajorCurriculumCreateValidate.java | 3 +-- .../MajorCurriculumSearchValidate.java | 2 +- .../MajorCurriculumUpdateValidate.java | 3 +-- .../{ => major}/MajorSearchValidate.java | 3 +-- .../{ => major}/MajorUpdateValidate.java | 3 +-- .../{ => student}/StudentInfoCreateValidate.java | 3 +-- .../{ => student}/StudentInfoSearchValidate.java | 3 +-- .../{ => student}/StudentInfoUpdateValidate.java | 2 +- .../TeacherCourseCreateValidate.java | 2 +- .../TeacherCourseSearchValidate.java | 2 +- .../TeacherCourseUpdateValidate.java | 4 ++-- .../{ => teacher}/TeacherCreateValidate.java | 2 +- .../{ => teacher}/TeacherSearchValidate.java | 2 +- .../TeacherUnavailableCreateValidate.java | 2 +- .../TeacherUnavailableSearchValidate.java | 2 +- .../TeacherUnavailableUpdateValidate.java | 2 +- .../{ => teacher}/TeacherUpdateValidate.java | 4 ++-- .../src/main/resources/application.yml | 2 +- .../com/mdd/common/mapper/TeacherMapper.java | 8 ++++++++ .../plugin/storage/engine/LocalStorage.java | 1 + 65 files changed, 159 insertions(+), 146 deletions(-) rename server/like-admin/src/main/java/com/mdd/admin/validate/{ => administrativeClass}/ClassCreateValidate.java (93%) rename server/like-admin/src/main/java/com/mdd/admin/validate/{ => administrativeClass}/ClassSearchValidate.java (94%) rename server/like-admin/src/main/java/com/mdd/admin/validate/{ => administrativeClass}/ClassUpdateValidate.java (94%) rename server/like-admin/src/main/java/com/mdd/admin/validate/{ => college}/CollegeCreateValidate.java (96%) rename server/like-admin/src/main/java/com/mdd/admin/validate/{ => college}/CollegeSearchValidate.java (93%) rename server/like-admin/src/main/java/com/mdd/admin/validate/{ => college}/CollegeUpdateValidate.java (97%) rename server/like-admin/src/main/java/com/mdd/admin/validate/{ => course}/CourseCreateValidate.java (94%) rename server/like-admin/src/main/java/com/mdd/admin/validate/{ => course}/CourseSearchValidate.java (91%) rename server/like-admin/src/main/java/com/mdd/admin/validate/{ => course}/CourseUpdateValidate.java (95%) rename server/like-admin/src/main/java/com/mdd/admin/validate/{ => major}/CurriculumVersionCreateValidate.java (91%) rename server/like-admin/src/main/java/com/mdd/admin/validate/{ => major}/CurriculumVersionSearchValidate.java (94%) rename server/like-admin/src/main/java/com/mdd/admin/validate/{ => major}/CurriculumVersionUpdateValidate.java (92%) rename server/like-admin/src/main/java/com/mdd/admin/validate/{ => major}/MajorCreateValidate.java (95%) rename server/like-admin/src/main/java/com/mdd/admin/validate/{ => major}/MajorCurriculumCreateValidate.java (94%) rename server/like-admin/src/main/java/com/mdd/admin/validate/{ => major}/MajorCurriculumSearchValidate.java (95%) rename server/like-admin/src/main/java/com/mdd/admin/validate/{ => major}/MajorCurriculumUpdateValidate.java (95%) rename server/like-admin/src/main/java/com/mdd/admin/validate/{ => major}/MajorSearchValidate.java (93%) rename server/like-admin/src/main/java/com/mdd/admin/validate/{ => major}/MajorUpdateValidate.java (96%) rename server/like-admin/src/main/java/com/mdd/admin/validate/{ => student}/StudentInfoCreateValidate.java (98%) rename server/like-admin/src/main/java/com/mdd/admin/validate/{ => student}/StudentInfoSearchValidate.java (97%) rename server/like-admin/src/main/java/com/mdd/admin/validate/{ => student}/StudentInfoUpdateValidate.java (98%) rename server/like-admin/src/main/java/com/mdd/admin/validate/{ => teacher}/TeacherCourseCreateValidate.java (93%) rename server/like-admin/src/main/java/com/mdd/admin/validate/{ => teacher}/TeacherCourseSearchValidate.java (93%) rename server/like-admin/src/main/java/com/mdd/admin/validate/{ => teacher}/TeacherCourseUpdateValidate.java (88%) rename server/like-admin/src/main/java/com/mdd/admin/validate/{ => teacher}/TeacherCreateValidate.java (95%) rename server/like-admin/src/main/java/com/mdd/admin/validate/{ => teacher}/TeacherSearchValidate.java (94%) rename server/like-admin/src/main/java/com/mdd/admin/validate/{ => teacher}/TeacherUnavailableCreateValidate.java (96%) rename server/like-admin/src/main/java/com/mdd/admin/validate/{ => teacher}/TeacherUnavailableSearchValidate.java (93%) rename server/like-admin/src/main/java/com/mdd/admin/validate/{ => teacher}/TeacherUnavailableUpdateValidate.java (97%) rename server/like-admin/src/main/java/com/mdd/admin/validate/{ => teacher}/TeacherUpdateValidate.java (93%) diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/ClassController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/ClassController.java index a1a2832c..60935aaa 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/ClassController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/ClassController.java @@ -3,9 +3,9 @@ package com.mdd.admin.controller; import com.mdd.admin.aop.Log; import com.mdd.admin.service.IClassService; import com.mdd.admin.validate.commons.IdValidate; -import com.mdd.admin.validate.ClassCreateValidate; -import com.mdd.admin.validate.ClassUpdateValidate; -import com.mdd.admin.validate.ClassSearchValidate; +import com.mdd.admin.validate.administrativeClass.ClassCreateValidate; +import com.mdd.admin.validate.administrativeClass.ClassUpdateValidate; +import com.mdd.admin.validate.administrativeClass.ClassSearchValidate; import com.mdd.admin.validate.commons.PageValidate; import com.mdd.admin.vo.administrativeClass.ClassListedVo; import com.mdd.admin.vo.administrativeClass.ClassDetailVo; diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/CollegeController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/CollegeController.java index c1a01a5a..cf575c53 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/CollegeController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/CollegeController.java @@ -3,9 +3,9 @@ package com.mdd.admin.controller; import com.mdd.admin.aop.Log; import com.mdd.admin.service.ICollegeService; import com.mdd.admin.validate.commons.IdValidate; -import com.mdd.admin.validate.CollegeCreateValidate; -import com.mdd.admin.validate.CollegeUpdateValidate; -import com.mdd.admin.validate.CollegeSearchValidate; +import com.mdd.admin.validate.college.CollegeCreateValidate; +import com.mdd.admin.validate.college.CollegeUpdateValidate; +import com.mdd.admin.validate.college.CollegeSearchValidate; import com.mdd.admin.validate.commons.PageValidate; import com.mdd.admin.vo.college.CollegeListedVo; import com.mdd.admin.vo.college.CollegeDetailVo; diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/CourseController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/CourseController.java index 099a3411..bc0e853f 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/CourseController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/CourseController.java @@ -3,9 +3,9 @@ package com.mdd.admin.controller; import com.mdd.admin.aop.Log; import com.mdd.admin.service.ICourseService; import com.mdd.admin.validate.commons.IdValidate; -import com.mdd.admin.validate.CourseCreateValidate; -import com.mdd.admin.validate.CourseUpdateValidate; -import com.mdd.admin.validate.CourseSearchValidate; +import com.mdd.admin.validate.course.CourseCreateValidate; +import com.mdd.admin.validate.course.CourseUpdateValidate; +import com.mdd.admin.validate.course.CourseSearchValidate; import com.mdd.admin.validate.commons.PageValidate; import com.mdd.admin.vo.course.CourseListedVo; import com.mdd.admin.vo.course.CourseDetailVo; diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/CurriculumVersionController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/CurriculumVersionController.java index 0ef6da7d..41445790 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/CurriculumVersionController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/CurriculumVersionController.java @@ -3,9 +3,9 @@ package com.mdd.admin.controller; import com.mdd.admin.aop.Log; import com.mdd.admin.service.ICurriculumVersionService; import com.mdd.admin.validate.commons.IdValidate; -import com.mdd.admin.validate.CurriculumVersionCreateValidate; -import com.mdd.admin.validate.CurriculumVersionUpdateValidate; -import com.mdd.admin.validate.CurriculumVersionSearchValidate; +import com.mdd.admin.validate.major.CurriculumVersionCreateValidate; +import com.mdd.admin.validate.major.CurriculumVersionUpdateValidate; +import com.mdd.admin.validate.major.CurriculumVersionSearchValidate; import com.mdd.admin.validate.commons.PageValidate; import com.mdd.admin.vo.major.CurriculumVersionListedVo; import com.mdd.admin.vo.major.CurriculumVersionDetailVo; diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/MajorController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/MajorController.java index a9b210c2..091cadd0 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/MajorController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/MajorController.java @@ -3,9 +3,9 @@ package com.mdd.admin.controller; import com.mdd.admin.aop.Log; import com.mdd.admin.service.IMajorService; import com.mdd.admin.validate.commons.IdValidate; -import com.mdd.admin.validate.MajorCreateValidate; -import com.mdd.admin.validate.MajorUpdateValidate; -import com.mdd.admin.validate.MajorSearchValidate; +import com.mdd.admin.validate.major.MajorCreateValidate; +import com.mdd.admin.validate.major.MajorUpdateValidate; +import com.mdd.admin.validate.major.MajorSearchValidate; import com.mdd.admin.validate.commons.PageValidate; import com.mdd.admin.vo.major.MajorListedVo; import com.mdd.admin.vo.major.MajorDetailVo; diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/MajorCurriculumController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/MajorCurriculumController.java index ae9241c2..d3575335 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/MajorCurriculumController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/MajorCurriculumController.java @@ -3,9 +3,9 @@ package com.mdd.admin.controller; import com.mdd.admin.aop.Log; import com.mdd.admin.service.IMajorCurriculumService; import com.mdd.admin.validate.commons.IdValidate; -import com.mdd.admin.validate.MajorCurriculumCreateValidate; -import com.mdd.admin.validate.MajorCurriculumUpdateValidate; -import com.mdd.admin.validate.MajorCurriculumSearchValidate; +import com.mdd.admin.validate.major.MajorCurriculumCreateValidate; +import com.mdd.admin.validate.major.MajorCurriculumUpdateValidate; +import com.mdd.admin.validate.major.MajorCurriculumSearchValidate; import com.mdd.admin.validate.commons.PageValidate; import com.mdd.admin.vo.major.MajorCurriculumListedVo; import com.mdd.admin.vo.major.MajorCurriculumDetailVo; diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/StudentInfoController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/StudentInfoController.java index b4f3cc0e..5edb2a72 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/StudentInfoController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/StudentInfoController.java @@ -3,9 +3,9 @@ package com.mdd.admin.controller; import com.mdd.admin.aop.Log; import com.mdd.admin.service.IStudentInfoService; import com.mdd.admin.validate.commons.IdValidate; -import com.mdd.admin.validate.StudentInfoCreateValidate; -import com.mdd.admin.validate.StudentInfoUpdateValidate; -import com.mdd.admin.validate.StudentInfoSearchValidate; +import com.mdd.admin.validate.student.StudentInfoCreateValidate; +import com.mdd.admin.validate.student.StudentInfoUpdateValidate; +import com.mdd.admin.validate.student.StudentInfoSearchValidate; import com.mdd.admin.validate.commons.PageValidate; import com.mdd.admin.vo.student.StudentInfoListedVo; import com.mdd.admin.vo.student.StudentInfoDetailVo; diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/TeacherController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/TeacherController.java index e385d601..4711df92 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/TeacherController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/TeacherController.java @@ -3,9 +3,9 @@ package com.mdd.admin.controller; import com.mdd.admin.aop.Log; import com.mdd.admin.service.ITeacherService; import com.mdd.admin.validate.commons.IdValidate; -import com.mdd.admin.validate.TeacherCreateValidate; -import com.mdd.admin.validate.TeacherUpdateValidate; -import com.mdd.admin.validate.TeacherSearchValidate; +import com.mdd.admin.validate.teacher.TeacherCreateValidate; +import com.mdd.admin.validate.teacher.TeacherUpdateValidate; +import com.mdd.admin.validate.teacher.TeacherSearchValidate; import com.mdd.admin.validate.commons.PageValidate; import com.mdd.admin.vo.teacher.TeacherListedVo; import com.mdd.admin.vo.teacher.TeacherDetailVo; diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/TeacherCourseController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/TeacherCourseController.java index 9b908e86..41607bbd 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/TeacherCourseController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/TeacherCourseController.java @@ -3,8 +3,8 @@ package com.mdd.admin.controller; import com.mdd.admin.aop.Log; import com.mdd.admin.service.ITeacherCourseService; import com.mdd.admin.validate.commons.IdValidate; -import com.mdd.admin.validate.TeacherCourseCreateValidate; -import com.mdd.admin.validate.TeacherCourseSearchValidate; +import com.mdd.admin.validate.teacher.TeacherCourseCreateValidate; +import com.mdd.admin.validate.teacher.TeacherCourseSearchValidate; import com.mdd.admin.validate.commons.PageValidate; import com.mdd.admin.vo.teacher.TeacherCourseListedVo; import com.mdd.admin.vo.teacher.TeacherCourseDetailVo; diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/TeacherUnavailableController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/TeacherUnavailableController.java index a550770d..b8e7640e 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/TeacherUnavailableController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/TeacherUnavailableController.java @@ -3,9 +3,9 @@ package com.mdd.admin.controller; import com.mdd.admin.aop.Log; import com.mdd.admin.service.ITeacherUnavailableService; import com.mdd.admin.validate.commons.IdValidate; -import com.mdd.admin.validate.TeacherUnavailableCreateValidate; -import com.mdd.admin.validate.TeacherUnavailableUpdateValidate; -import com.mdd.admin.validate.TeacherUnavailableSearchValidate; +import com.mdd.admin.validate.teacher.TeacherUnavailableCreateValidate; +import com.mdd.admin.validate.teacher.TeacherUnavailableUpdateValidate; +import com.mdd.admin.validate.teacher.TeacherUnavailableSearchValidate; import com.mdd.admin.validate.commons.PageValidate; import com.mdd.admin.vo.teacher.TeacherUnavailableListedVo; import com.mdd.admin.vo.teacher.TeacherUnavailableDetailVo; diff --git a/server/like-admin/src/main/java/com/mdd/admin/controller/UploadController.java b/server/like-admin/src/main/java/com/mdd/admin/controller/UploadController.java index 983a0f77..c886c858 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/controller/UploadController.java +++ b/server/like-admin/src/main/java/com/mdd/admin/controller/UploadController.java @@ -37,7 +37,7 @@ public class UploadController { @PostMapping("/image") @NotPower @ApiOperation(value="上传图片") - public AjaxResult image(@RequestParam("file") MultipartFile[] files, @RequestParam("cid") String requestCid) { + public AjaxResult image(@RequestParam("file") MultipartFile[] files, @RequestParam("cid") String requestCid) { String cid = StringUtils.isNotEmpty(requestCid) ? requestCid : "0"; @@ -46,9 +46,9 @@ public class UploadController { } - for (int i = 0; i < files.length; i++) { + for (MultipartFile file : files) { StorageDriver storageDriver = new StorageDriver(); - UploadFilesVo vo = storageDriver.upload(files[i], "image", AlbumEnum.IMAGE.getCode()); + UploadFilesVo vo = storageDriver.upload(file, "image", AlbumEnum.IMAGE.getCode()); Map album = new LinkedHashMap<>(); album.put("aid", String.valueOf(LikeAdminThreadLocal.getAdminId())); album.put("cid", cid); @@ -64,11 +64,11 @@ public class UploadController { return AjaxResult.success(); } - @Log(title = "上传图片", requestType = RequestType.File) + @Log(title = "上传文件", requestType = RequestType.File) @PostMapping("/file") @NotPower @ApiOperation(value="上传文件") - public AjaxResult file(@RequestParam("file") MultipartFile[] files, @RequestParam("cid") String requestCid) { + public AjaxResult file(@RequestParam("file") MultipartFile[] files, @RequestParam("cid") String requestCid) { String cid = StringUtils.isNotEmpty(requestCid) ? requestCid : "0"; @@ -77,9 +77,9 @@ public class UploadController { } - for (int i = 0; i < files.length; i++) { + for (MultipartFile file : files) { StorageDriver storageDriver = new StorageDriver(); - UploadFilesVo vo = storageDriver.upload(files[i], "image", AlbumEnum.Doc.getCode()); + UploadFilesVo vo = storageDriver.upload(file, "image", AlbumEnum.Doc.getCode()); Map album = new LinkedHashMap<>(); album.put("aid", String.valueOf(LikeAdminThreadLocal.getAdminId())); album.put("cid", cid); @@ -99,7 +99,7 @@ public class UploadController { @PostMapping("/video") @NotPower @ApiOperation(value="上传视频") - public AjaxResult video(@RequestParam("file") MultipartFile[] files, @RequestParam("cid") String requestCid) { + public AjaxResult video(@RequestParam("file") MultipartFile[] files, @RequestParam("cid") String requestCid) { String cid = StringUtils.isNotEmpty(requestCid) ? requestCid : "0"; diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/IClassService.java b/server/like-admin/src/main/java/com/mdd/admin/service/IClassService.java index cdb79538..e50a614c 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/IClassService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/IClassService.java @@ -1,9 +1,9 @@ package com.mdd.admin.service; import com.mdd.admin.validate.commons.PageValidate; -import com.mdd.admin.validate.ClassCreateValidate; -import com.mdd.admin.validate.ClassUpdateValidate; -import com.mdd.admin.validate.ClassSearchValidate; +import com.mdd.admin.validate.administrativeClass.ClassCreateValidate; +import com.mdd.admin.validate.administrativeClass.ClassUpdateValidate; +import com.mdd.admin.validate.administrativeClass.ClassSearchValidate; import com.mdd.admin.vo.administrativeClass.ClassListedVo; import com.mdd.admin.vo.administrativeClass.ClassDetailVo; import com.mdd.common.core.PageResult; diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/ICollegeService.java b/server/like-admin/src/main/java/com/mdd/admin/service/ICollegeService.java index 987bbd31..3241d495 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/ICollegeService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/ICollegeService.java @@ -1,9 +1,9 @@ package com.mdd.admin.service; import com.mdd.admin.validate.commons.PageValidate; -import com.mdd.admin.validate.CollegeCreateValidate; -import com.mdd.admin.validate.CollegeUpdateValidate; -import com.mdd.admin.validate.CollegeSearchValidate; +import com.mdd.admin.validate.college.CollegeCreateValidate; +import com.mdd.admin.validate.college.CollegeUpdateValidate; +import com.mdd.admin.validate.college.CollegeSearchValidate; import com.mdd.admin.vo.college.CollegeListedVo; import com.mdd.admin.vo.college.CollegeDetailVo; import com.mdd.common.core.PageResult; diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/ICourseService.java b/server/like-admin/src/main/java/com/mdd/admin/service/ICourseService.java index 3c4c249b..1bdd0b3e 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/ICourseService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/ICourseService.java @@ -1,9 +1,9 @@ package com.mdd.admin.service; import com.mdd.admin.validate.commons.PageValidate; -import com.mdd.admin.validate.CourseCreateValidate; -import com.mdd.admin.validate.CourseUpdateValidate; -import com.mdd.admin.validate.CourseSearchValidate; +import com.mdd.admin.validate.course.CourseCreateValidate; +import com.mdd.admin.validate.course.CourseUpdateValidate; +import com.mdd.admin.validate.course.CourseSearchValidate; import com.mdd.admin.vo.course.CourseListedVo; import com.mdd.admin.vo.course.CourseDetailVo; import com.mdd.common.core.PageResult; diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/ICurriculumVersionService.java b/server/like-admin/src/main/java/com/mdd/admin/service/ICurriculumVersionService.java index d6ca8828..43da562b 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/ICurriculumVersionService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/ICurriculumVersionService.java @@ -1,9 +1,9 @@ package com.mdd.admin.service; import com.mdd.admin.validate.commons.PageValidate; -import com.mdd.admin.validate.CurriculumVersionCreateValidate; -import com.mdd.admin.validate.CurriculumVersionUpdateValidate; -import com.mdd.admin.validate.CurriculumVersionSearchValidate; +import com.mdd.admin.validate.major.CurriculumVersionCreateValidate; +import com.mdd.admin.validate.major.CurriculumVersionUpdateValidate; +import com.mdd.admin.validate.major.CurriculumVersionSearchValidate; import com.mdd.admin.vo.major.CurriculumVersionListedVo; import com.mdd.admin.vo.major.CurriculumVersionDetailVo; import com.mdd.common.core.PageResult; diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/IMajorCurriculumService.java b/server/like-admin/src/main/java/com/mdd/admin/service/IMajorCurriculumService.java index df456ce4..2a7342df 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/IMajorCurriculumService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/IMajorCurriculumService.java @@ -1,9 +1,9 @@ package com.mdd.admin.service; import com.mdd.admin.validate.commons.PageValidate; -import com.mdd.admin.validate.MajorCurriculumCreateValidate; -import com.mdd.admin.validate.MajorCurriculumUpdateValidate; -import com.mdd.admin.validate.MajorCurriculumSearchValidate; +import com.mdd.admin.validate.major.MajorCurriculumCreateValidate; +import com.mdd.admin.validate.major.MajorCurriculumUpdateValidate; +import com.mdd.admin.validate.major.MajorCurriculumSearchValidate; import com.mdd.admin.vo.major.MajorCurriculumListedVo; import com.mdd.admin.vo.major.MajorCurriculumDetailVo; import com.mdd.common.core.PageResult; diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/IMajorService.java b/server/like-admin/src/main/java/com/mdd/admin/service/IMajorService.java index aed272a2..473c4167 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/IMajorService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/IMajorService.java @@ -1,9 +1,9 @@ package com.mdd.admin.service; import com.mdd.admin.validate.commons.PageValidate; -import com.mdd.admin.validate.MajorCreateValidate; -import com.mdd.admin.validate.MajorUpdateValidate; -import com.mdd.admin.validate.MajorSearchValidate; +import com.mdd.admin.validate.major.MajorCreateValidate; +import com.mdd.admin.validate.major.MajorUpdateValidate; +import com.mdd.admin.validate.major.MajorSearchValidate; import com.mdd.admin.vo.major.MajorListedVo; import com.mdd.admin.vo.major.MajorDetailVo; import com.mdd.common.core.PageResult; diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/IStudentInfoService.java b/server/like-admin/src/main/java/com/mdd/admin/service/IStudentInfoService.java index 80483f65..916fb3b2 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/IStudentInfoService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/IStudentInfoService.java @@ -1,9 +1,9 @@ package com.mdd.admin.service; import com.mdd.admin.validate.commons.PageValidate; -import com.mdd.admin.validate.StudentInfoCreateValidate; -import com.mdd.admin.validate.StudentInfoUpdateValidate; -import com.mdd.admin.validate.StudentInfoSearchValidate; +import com.mdd.admin.validate.student.StudentInfoCreateValidate; +import com.mdd.admin.validate.student.StudentInfoUpdateValidate; +import com.mdd.admin.validate.student.StudentInfoSearchValidate; import com.mdd.admin.vo.student.StudentInfoListedVo; import com.mdd.admin.vo.student.StudentInfoDetailVo; import com.mdd.common.core.PageResult; diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/ITeacherCourseService.java b/server/like-admin/src/main/java/com/mdd/admin/service/ITeacherCourseService.java index 3febf978..3fe06f8d 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/ITeacherCourseService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/ITeacherCourseService.java @@ -1,9 +1,9 @@ package com.mdd.admin.service; import com.mdd.admin.validate.commons.PageValidate; -import com.mdd.admin.validate.TeacherCourseCreateValidate; -import com.mdd.admin.validate.TeacherCourseUpdateValidate; -import com.mdd.admin.validate.TeacherCourseSearchValidate; +import com.mdd.admin.validate.teacher.TeacherCourseCreateValidate; +import com.mdd.admin.validate.teacher.TeacherCourseUpdateValidate; +import com.mdd.admin.validate.teacher.TeacherCourseSearchValidate; import com.mdd.admin.vo.teacher.TeacherCourseListedVo; import com.mdd.admin.vo.teacher.TeacherCourseDetailVo; import com.mdd.common.core.PageResult; diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/ITeacherService.java b/server/like-admin/src/main/java/com/mdd/admin/service/ITeacherService.java index cc1571d2..b6198031 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/ITeacherService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/ITeacherService.java @@ -1,9 +1,9 @@ package com.mdd.admin.service; import com.mdd.admin.validate.commons.PageValidate; -import com.mdd.admin.validate.TeacherCreateValidate; -import com.mdd.admin.validate.TeacherUpdateValidate; -import com.mdd.admin.validate.TeacherSearchValidate; +import com.mdd.admin.validate.teacher.TeacherCreateValidate; +import com.mdd.admin.validate.teacher.TeacherUpdateValidate; +import com.mdd.admin.validate.teacher.TeacherSearchValidate; import com.mdd.admin.vo.teacher.TeacherListedVo; import com.mdd.admin.vo.teacher.TeacherDetailVo; import com.mdd.common.core.PageResult; diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/ITeacherUnavailableService.java b/server/like-admin/src/main/java/com/mdd/admin/service/ITeacherUnavailableService.java index 73e277d3..e8c19571 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/ITeacherUnavailableService.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/ITeacherUnavailableService.java @@ -1,9 +1,9 @@ package com.mdd.admin.service; import com.mdd.admin.validate.commons.PageValidate; -import com.mdd.admin.validate.TeacherUnavailableCreateValidate; -import com.mdd.admin.validate.TeacherUnavailableUpdateValidate; -import com.mdd.admin.validate.TeacherUnavailableSearchValidate; +import com.mdd.admin.validate.teacher.TeacherUnavailableCreateValidate; +import com.mdd.admin.validate.teacher.TeacherUnavailableUpdateValidate; +import com.mdd.admin.validate.teacher.TeacherUnavailableSearchValidate; import com.mdd.admin.vo.teacher.TeacherUnavailableListedVo; import com.mdd.admin.vo.teacher.TeacherUnavailableDetailVo; import com.mdd.common.core.PageResult; diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/ClassServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/ClassServiceImpl.java index b8bb0ef3..6262477e 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/ClassServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/ClassServiceImpl.java @@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.mdd.admin.validate.commons.PageValidate; import com.mdd.admin.service.IClassService; -import com.mdd.admin.validate.ClassCreateValidate; -import com.mdd.admin.validate.ClassUpdateValidate; -import com.mdd.admin.validate.ClassSearchValidate; +import com.mdd.admin.validate.administrativeClass.ClassCreateValidate; +import com.mdd.admin.validate.administrativeClass.ClassUpdateValidate; +import com.mdd.admin.validate.administrativeClass.ClassSearchValidate; import com.mdd.admin.vo.administrativeClass.ClassListedVo; import com.mdd.admin.vo.administrativeClass.ClassDetailVo; import com.mdd.common.core.PageResult; diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/CollegeServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/CollegeServiceImpl.java index 7b90a0a1..724ce78d 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/CollegeServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/CollegeServiceImpl.java @@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.mdd.admin.validate.commons.PageValidate; import com.mdd.admin.service.ICollegeService; -import com.mdd.admin.validate.CollegeCreateValidate; -import com.mdd.admin.validate.CollegeUpdateValidate; -import com.mdd.admin.validate.CollegeSearchValidate; +import com.mdd.admin.validate.college.CollegeCreateValidate; +import com.mdd.admin.validate.college.CollegeUpdateValidate; +import com.mdd.admin.validate.college.CollegeSearchValidate; import com.mdd.admin.vo.college.CollegeListedVo; import com.mdd.admin.vo.college.CollegeDetailVo; import com.mdd.common.core.PageResult; diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/CourseServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/CourseServiceImpl.java index e1451cdf..7f342c77 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/CourseServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/CourseServiceImpl.java @@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.mdd.admin.validate.commons.PageValidate; import com.mdd.admin.service.ICourseService; -import com.mdd.admin.validate.CourseCreateValidate; -import com.mdd.admin.validate.CourseUpdateValidate; -import com.mdd.admin.validate.CourseSearchValidate; +import com.mdd.admin.validate.course.CourseCreateValidate; +import com.mdd.admin.validate.course.CourseUpdateValidate; +import com.mdd.admin.validate.course.CourseSearchValidate; import com.mdd.admin.vo.course.CourseListedVo; import com.mdd.admin.vo.course.CourseDetailVo; import com.mdd.common.core.PageResult; diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/CurriculumVersionServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/CurriculumVersionServiceImpl.java index d9dcb98d..3ca84c5e 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/CurriculumVersionServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/CurriculumVersionServiceImpl.java @@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.mdd.admin.validate.commons.PageValidate; import com.mdd.admin.service.ICurriculumVersionService; -import com.mdd.admin.validate.CurriculumVersionCreateValidate; -import com.mdd.admin.validate.CurriculumVersionUpdateValidate; -import com.mdd.admin.validate.CurriculumVersionSearchValidate; +import com.mdd.admin.validate.major.CurriculumVersionCreateValidate; +import com.mdd.admin.validate.major.CurriculumVersionUpdateValidate; +import com.mdd.admin.validate.major.CurriculumVersionSearchValidate; import com.mdd.admin.vo.major.CurriculumVersionListedVo; import com.mdd.admin.vo.major.CurriculumVersionDetailVo; import com.mdd.common.core.PageResult; diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/MajorCurriculumServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/MajorCurriculumServiceImpl.java index 27d43598..bf7dee9c 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/MajorCurriculumServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/MajorCurriculumServiceImpl.java @@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.mdd.admin.validate.commons.PageValidate; import com.mdd.admin.service.IMajorCurriculumService; -import com.mdd.admin.validate.MajorCurriculumCreateValidate; -import com.mdd.admin.validate.MajorCurriculumUpdateValidate; -import com.mdd.admin.validate.MajorCurriculumSearchValidate; +import com.mdd.admin.validate.major.MajorCurriculumCreateValidate; +import com.mdd.admin.validate.major.MajorCurriculumUpdateValidate; +import com.mdd.admin.validate.major.MajorCurriculumSearchValidate; import com.mdd.admin.vo.major.MajorCurriculumListedVo; import com.mdd.admin.vo.major.MajorCurriculumDetailVo; import com.mdd.common.core.PageResult; diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/MajorServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/MajorServiceImpl.java index fb11f65c..28725e2d 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/MajorServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/MajorServiceImpl.java @@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.mdd.admin.validate.commons.PageValidate; import com.mdd.admin.service.IMajorService; -import com.mdd.admin.validate.MajorCreateValidate; -import com.mdd.admin.validate.MajorUpdateValidate; -import com.mdd.admin.validate.MajorSearchValidate; +import com.mdd.admin.validate.major.MajorCreateValidate; +import com.mdd.admin.validate.major.MajorUpdateValidate; +import com.mdd.admin.validate.major.MajorSearchValidate; import com.mdd.admin.vo.major.MajorListedVo; import com.mdd.admin.vo.major.MajorDetailVo; import com.mdd.common.core.PageResult; diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/StudentInfoServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/StudentInfoServiceImpl.java index beee5983..915ae51c 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/StudentInfoServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/StudentInfoServiceImpl.java @@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.mdd.admin.validate.commons.PageValidate; import com.mdd.admin.service.IStudentInfoService; -import com.mdd.admin.validate.StudentInfoCreateValidate; -import com.mdd.admin.validate.StudentInfoUpdateValidate; -import com.mdd.admin.validate.StudentInfoSearchValidate; +import com.mdd.admin.validate.student.StudentInfoCreateValidate; +import com.mdd.admin.validate.student.StudentInfoUpdateValidate; +import com.mdd.admin.validate.student.StudentInfoSearchValidate; import com.mdd.admin.vo.student.StudentInfoListedVo; import com.mdd.admin.vo.student.StudentInfoDetailVo; import com.mdd.common.core.PageResult; diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/TeacherCourseServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/TeacherCourseServiceImpl.java index 01939235..dc1ffc63 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/TeacherCourseServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/TeacherCourseServiceImpl.java @@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.mdd.admin.validate.commons.PageValidate; import com.mdd.admin.service.ITeacherCourseService; -import com.mdd.admin.validate.TeacherCourseCreateValidate; -import com.mdd.admin.validate.TeacherCourseUpdateValidate; -import com.mdd.admin.validate.TeacherCourseSearchValidate; +import com.mdd.admin.validate.teacher.TeacherCourseCreateValidate; +import com.mdd.admin.validate.teacher.TeacherCourseUpdateValidate; +import com.mdd.admin.validate.teacher.TeacherCourseSearchValidate; import com.mdd.admin.vo.teacher.TeacherCourseListedVo; import com.mdd.admin.vo.teacher.TeacherCourseDetailVo; import com.mdd.common.core.PageResult; diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/TeacherServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/TeacherServiceImpl.java index 82018185..a0ffd0e2 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/TeacherServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/TeacherServiceImpl.java @@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.mdd.admin.validate.commons.PageValidate; import com.mdd.admin.service.ITeacherService; -import com.mdd.admin.validate.TeacherCreateValidate; -import com.mdd.admin.validate.TeacherUpdateValidate; -import com.mdd.admin.validate.TeacherSearchValidate; +import com.mdd.admin.validate.teacher.TeacherCreateValidate; +import com.mdd.admin.validate.teacher.TeacherUpdateValidate; +import com.mdd.admin.validate.teacher.TeacherSearchValidate; import com.mdd.admin.vo.teacher.TeacherListedVo; import com.mdd.admin.vo.teacher.TeacherDetailVo; import com.mdd.common.core.PageResult; @@ -72,6 +72,8 @@ public class TeacherServiceImpl implements ITeacherService { BeanUtils.copyProperties(item, vo); vo.setCreateTime(TimeUtils.timestampToDate(item.getCreateTime())); vo.setUpdateTime(TimeUtils.timestampToDate(item.getUpdateTime())); + College college = collegeMapper.selectById(vo.getCollegeId()); + if(college != null) vo.setCollegeName(college.getCollegeName()); list.add(vo); } @@ -97,8 +99,6 @@ public class TeacherServiceImpl implements ITeacherService { TeacherDetailVo vo = new TeacherDetailVo(); BeanUtils.copyProperties(model, vo); - Admin admin = adminMapper.selectById(vo.getAdminId()); - if(admin != null) vo.setName(admin.getName()); College college = collegeMapper.selectById(vo.getCollegeId()); if(college != null) vo.setCollegeName(college.getCollegeName()); return vo; diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/TeacherUnavailableServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/TeacherUnavailableServiceImpl.java index 13f8c216..e5609275 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/TeacherUnavailableServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/TeacherUnavailableServiceImpl.java @@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.mdd.admin.validate.commons.PageValidate; import com.mdd.admin.service.ITeacherUnavailableService; -import com.mdd.admin.validate.TeacherUnavailableCreateValidate; -import com.mdd.admin.validate.TeacherUnavailableUpdateValidate; -import com.mdd.admin.validate.TeacherUnavailableSearchValidate; +import com.mdd.admin.validate.teacher.TeacherUnavailableCreateValidate; +import com.mdd.admin.validate.teacher.TeacherUnavailableUpdateValidate; +import com.mdd.admin.validate.teacher.TeacherUnavailableSearchValidate; import com.mdd.admin.vo.teacher.TeacherUnavailableListedVo; import com.mdd.admin.vo.teacher.TeacherUnavailableDetailVo; import com.mdd.common.core.PageResult; diff --git a/server/like-admin/src/main/java/com/mdd/admin/service/impl/admin/AdminServiceImpl.java b/server/like-admin/src/main/java/com/mdd/admin/service/impl/admin/AdminServiceImpl.java index abd50d80..1138caf5 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/service/impl/admin/AdminServiceImpl.java +++ b/server/like-admin/src/main/java/com/mdd/admin/service/impl/admin/AdminServiceImpl.java @@ -24,6 +24,7 @@ import com.mdd.admin.vo.system.*; import com.mdd.admin.vo.user.UserListExportVo; import com.mdd.admin.vo.user.UserVo; import com.mdd.common.core.PageResult; +import com.mdd.common.entity.Teacher; import com.mdd.common.entity.admin.Admin; import com.mdd.common.entity.admin.Dept; import com.mdd.common.entity.system.Jobs; @@ -313,6 +314,20 @@ public class AdminServiceImpl implements IAdminService { this.iAdminRoleService.batchInsert(model.getId(), roleIds); + + // 附加：若role是教师，则为其添加教师实体信息 + for(Integer roleId : roleIds) { + // 目前判断教师的方式是查看角色表中教师角色的id + if(roleId == 2) { + Teacher teacher = new Teacher(); + teacher.setAdminId(model.getId()); + teacher.setName(model.getName()); + teacher.setTeacherCode(model.getAccount()); + teacher.setCreateTime(model.getCreateTime()); + teacher.setUpdateTime(model.getUpdateTime()); + teacher.setTeacherStatus(1); // 设置账号状态 1-在职，2-休假，3-离职 + } + } } /** @@ -386,6 +401,7 @@ public class AdminServiceImpl implements IAdminService { systemAuthAdminMapper.updateById(model); teacherMapper.updateNameByAdminId(model.getId(), model.getName()); + teacherMapper.updateCodeByAdminId(model.getId(),model.getAccount()); if (isEditInfo) { diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/ClassCreateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/administrativeClass/ClassCreateValidate.java similarity index 93% rename from server/like-admin/src/main/java/com/mdd/admin/validate/ClassCreateValidate.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/administrativeClass/ClassCreateValidate.java index e39bacf0..cd594344 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/ClassCreateValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/administrativeClass/ClassCreateValidate.java @@ -1,10 +1,9 @@ -package com.mdd.admin.validate; +package com.mdd.admin.validate.administrativeClass; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; -import javax.validation.constraints.*; @Data @ApiModel("班级创建参数") diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/ClassSearchValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/administrativeClass/ClassSearchValidate.java similarity index 94% rename from server/like-admin/src/main/java/com/mdd/admin/validate/ClassSearchValidate.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/administrativeClass/ClassSearchValidate.java index 71c2ffe1..593d1d8c 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/ClassSearchValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/administrativeClass/ClassSearchValidate.java @@ -1,4 +1,4 @@ -package com.mdd.admin.validate; +package com.mdd.admin.validate.administrativeClass; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/ClassUpdateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/administrativeClass/ClassUpdateValidate.java similarity index 94% rename from server/like-admin/src/main/java/com/mdd/admin/validate/ClassUpdateValidate.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/administrativeClass/ClassUpdateValidate.java index d07357f9..21671bdd 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/ClassUpdateValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/administrativeClass/ClassUpdateValidate.java @@ -1,10 +1,10 @@ -package com.mdd.admin.validate; +package com.mdd.admin.validate.administrativeClass; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; -import javax.validation.constraints.*; + import com.mdd.common.validator.annotation.IDMust; /** diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/CollegeCreateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/college/CollegeCreateValidate.java similarity index 96% rename from server/like-admin/src/main/java/com/mdd/admin/validate/CollegeCreateValidate.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/college/CollegeCreateValidate.java index 5bbec65c..d2cafbf5 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/CollegeCreateValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/college/CollegeCreateValidate.java @@ -1,4 +1,4 @@ -package com.mdd.admin.validate; +package com.mdd.admin.validate.college; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/CollegeSearchValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/college/CollegeSearchValidate.java similarity index 93% rename from server/like-admin/src/main/java/com/mdd/admin/validate/CollegeSearchValidate.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/college/CollegeSearchValidate.java index bd17bd32..ff9455ab 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/CollegeSearchValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/college/CollegeSearchValidate.java @@ -1,4 +1,4 @@ -package com.mdd.admin.validate; +package com.mdd.admin.validate.college; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/CollegeUpdateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/college/CollegeUpdateValidate.java similarity index 97% rename from server/like-admin/src/main/java/com/mdd/admin/validate/CollegeUpdateValidate.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/college/CollegeUpdateValidate.java index 0daa4ed4..13fc32de 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/CollegeUpdateValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/college/CollegeUpdateValidate.java @@ -1,4 +1,4 @@ -package com.mdd.admin.validate; +package com.mdd.admin.validate.college; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/CourseCreateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/course/CourseCreateValidate.java similarity index 94% rename from server/like-admin/src/main/java/com/mdd/admin/validate/CourseCreateValidate.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/course/CourseCreateValidate.java index 04befb91..bf0ef788 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/CourseCreateValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/course/CourseCreateValidate.java @@ -1,11 +1,10 @@ -package com.mdd.admin.validate; +package com.mdd.admin.validate.course; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; -import javax.validation.constraints.*; @Data @ApiModel("课程创建参数") diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/CourseSearchValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/course/CourseSearchValidate.java similarity index 91% rename from server/like-admin/src/main/java/com/mdd/admin/validate/CourseSearchValidate.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/course/CourseSearchValidate.java index 41fb4d19..03bf4b96 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/CourseSearchValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/course/CourseSearchValidate.java @@ -1,10 +1,9 @@ -package com.mdd.admin.validate; +package com.mdd.admin.validate.course; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; -import java.math.BigDecimal; @Data @ApiModel("课程搜素参数") diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/CourseUpdateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/course/CourseUpdateValidate.java similarity index 95% rename from server/like-admin/src/main/java/com/mdd/admin/validate/CourseUpdateValidate.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/course/CourseUpdateValidate.java index 1f619e85..fefc5d0c 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/CourseUpdateValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/course/CourseUpdateValidate.java @@ -1,10 +1,9 @@ -package com.mdd.admin.validate; +package com.mdd.admin.validate.course; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; -import javax.validation.constraints.*; import java.math.BigDecimal; import com.mdd.common.validator.annotation.IDMust; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/CurriculumVersionCreateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/major/CurriculumVersionCreateValidate.java similarity index 91% rename from server/like-admin/src/main/java/com/mdd/admin/validate/CurriculumVersionCreateValidate.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/major/CurriculumVersionCreateValidate.java index 87bbe373..1c6b9061 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/CurriculumVersionCreateValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/major/CurriculumVersionCreateValidate.java @@ -1,10 +1,9 @@ -package com.mdd.admin.validate; +package com.mdd.admin.validate.major; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; -import javax.validation.constraints.*; @Data @ApiModel("培养方案版本创建参数") diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/CurriculumVersionSearchValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/major/CurriculumVersionSearchValidate.java similarity index 94% rename from server/like-admin/src/main/java/com/mdd/admin/validate/CurriculumVersionSearchValidate.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/major/CurriculumVersionSearchValidate.java index dc44e2f1..4b696025 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/CurriculumVersionSearchValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/major/CurriculumVersionSearchValidate.java @@ -1,4 +1,4 @@ -package com.mdd.admin.validate; +package com.mdd.admin.validate.major; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/CurriculumVersionUpdateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/major/CurriculumVersionUpdateValidate.java similarity index 92% rename from server/like-admin/src/main/java/com/mdd/admin/validate/CurriculumVersionUpdateValidate.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/major/CurriculumVersionUpdateValidate.java index f845c481..03ea8919 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/CurriculumVersionUpdateValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/major/CurriculumVersionUpdateValidate.java @@ -1,10 +1,10 @@ -package com.mdd.admin.validate; +package com.mdd.admin.validate.major; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; -import javax.validation.constraints.*; + import com.mdd.common.validator.annotation.IDMust; /** diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/MajorCreateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/major/MajorCreateValidate.java similarity index 95% rename from server/like-admin/src/main/java/com/mdd/admin/validate/MajorCreateValidate.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/major/MajorCreateValidate.java index 5596b2da..5e7d59ff 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/MajorCreateValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/major/MajorCreateValidate.java @@ -1,11 +1,10 @@ -package com.mdd.admin.validate; +package com.mdd.admin.validate.major; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; -import javax.validation.constraints.*; @Data @ApiModel("专业创建参数") diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/MajorCurriculumCreateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/major/MajorCurriculumCreateValidate.java similarity index 94% rename from server/like-admin/src/main/java/com/mdd/admin/validate/MajorCurriculumCreateValidate.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/major/MajorCurriculumCreateValidate.java index d38dc8dd..4b7a99b9 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/MajorCurriculumCreateValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/major/MajorCurriculumCreateValidate.java @@ -1,11 +1,10 @@ -package com.mdd.admin.validate; +package com.mdd.admin.validate.major; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; -import javax.validation.constraints.*; @Data @ApiModel("专业培养计划创建参数") diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/MajorCurriculumSearchValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/major/MajorCurriculumSearchValidate.java similarity index 95% rename from server/like-admin/src/main/java/com/mdd/admin/validate/MajorCurriculumSearchValidate.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/major/MajorCurriculumSearchValidate.java index b7a9eb18..78d95470 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/MajorCurriculumSearchValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/major/MajorCurriculumSearchValidate.java @@ -1,4 +1,4 @@ -package com.mdd.admin.validate; +package com.mdd.admin.validate.major; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/MajorCurriculumUpdateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/major/MajorCurriculumUpdateValidate.java similarity index 95% rename from server/like-admin/src/main/java/com/mdd/admin/validate/MajorCurriculumUpdateValidate.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/major/MajorCurriculumUpdateValidate.java index 962eb41a..24a81c91 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/MajorCurriculumUpdateValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/major/MajorCurriculumUpdateValidate.java @@ -1,10 +1,9 @@ -package com.mdd.admin.validate; +package com.mdd.admin.validate.major; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; -import javax.validation.constraints.*; import java.math.BigDecimal; import com.mdd.common.validator.annotation.IDMust; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/MajorSearchValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/major/MajorSearchValidate.java similarity index 93% rename from server/like-admin/src/main/java/com/mdd/admin/validate/MajorSearchValidate.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/major/MajorSearchValidate.java index 4d389112..35a47393 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/MajorSearchValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/major/MajorSearchValidate.java @@ -1,10 +1,9 @@ -package com.mdd.admin.validate; +package com.mdd.admin.validate.major; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; -import java.math.BigDecimal; @Data @ApiModel("专业搜素参数") diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/MajorUpdateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/major/MajorUpdateValidate.java similarity index 96% rename from server/like-admin/src/main/java/com/mdd/admin/validate/MajorUpdateValidate.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/major/MajorUpdateValidate.java index 958fb58a..4c5b0134 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/MajorUpdateValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/major/MajorUpdateValidate.java @@ -1,10 +1,9 @@ -package com.mdd.admin.validate; +package com.mdd.admin.validate.major; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; -import javax.validation.constraints.*; import java.math.BigDecimal; import com.mdd.common.validator.annotation.IDMust; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/StudentInfoCreateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/student/StudentInfoCreateValidate.java similarity index 98% rename from server/like-admin/src/main/java/com/mdd/admin/validate/StudentInfoCreateValidate.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/student/StudentInfoCreateValidate.java index 06062480..a6589ebd 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/StudentInfoCreateValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/student/StudentInfoCreateValidate.java @@ -1,11 +1,10 @@ -package com.mdd.admin.validate; +package com.mdd.admin.validate.student; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; -import java.math.BigDecimal; import javax.validation.constraints.*; @Data diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/StudentInfoSearchValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/student/StudentInfoSearchValidate.java similarity index 97% rename from server/like-admin/src/main/java/com/mdd/admin/validate/StudentInfoSearchValidate.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/student/StudentInfoSearchValidate.java index ca0bb78a..0b16cb8a 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/StudentInfoSearchValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/student/StudentInfoSearchValidate.java @@ -1,11 +1,10 @@ -package com.mdd.admin.validate; +package com.mdd.admin.validate.student; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; -import java.math.BigDecimal; @Data @ApiModel("学生信息搜素参数") diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/StudentInfoUpdateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/student/StudentInfoUpdateValidate.java similarity index 98% rename from server/like-admin/src/main/java/com/mdd/admin/validate/StudentInfoUpdateValidate.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/student/StudentInfoUpdateValidate.java index 9d13ae23..a966bd6b 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/StudentInfoUpdateValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/student/StudentInfoUpdateValidate.java @@ -1,4 +1,4 @@ -package com.mdd.admin.validate; +package com.mdd.admin.validate.student; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/TeacherCourseCreateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/teacher/TeacherCourseCreateValidate.java similarity index 93% rename from server/like-admin/src/main/java/com/mdd/admin/validate/TeacherCourseCreateValidate.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/teacher/TeacherCourseCreateValidate.java index f5c0df92..82f904d1 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/TeacherCourseCreateValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/teacher/TeacherCourseCreateValidate.java @@ -1,4 +1,4 @@ -package com.mdd.admin.validate; +package com.mdd.admin.validate.teacher; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/TeacherCourseSearchValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/teacher/TeacherCourseSearchValidate.java similarity index 93% rename from server/like-admin/src/main/java/com/mdd/admin/validate/TeacherCourseSearchValidate.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/teacher/TeacherCourseSearchValidate.java index 19077bad..05fb2e62 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/TeacherCourseSearchValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/teacher/TeacherCourseSearchValidate.java @@ -1,4 +1,4 @@ -package com.mdd.admin.validate; +package com.mdd.admin.validate.teacher; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/TeacherCourseUpdateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/teacher/TeacherCourseUpdateValidate.java similarity index 88% rename from server/like-admin/src/main/java/com/mdd/admin/validate/TeacherCourseUpdateValidate.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/teacher/TeacherCourseUpdateValidate.java index 8c1009de..62b58e59 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/TeacherCourseUpdateValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/teacher/TeacherCourseUpdateValidate.java @@ -1,10 +1,10 @@ -package com.mdd.admin.validate; +package com.mdd.admin.validate.teacher; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; -import javax.validation.constraints.*; + import com.mdd.common.validator.annotation.IDMust; /** diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/TeacherCreateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/teacher/TeacherCreateValidate.java similarity index 95% rename from server/like-admin/src/main/java/com/mdd/admin/validate/TeacherCreateValidate.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/teacher/TeacherCreateValidate.java index d17c985a..cb38e5a4 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/TeacherCreateValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/teacher/TeacherCreateValidate.java @@ -1,4 +1,4 @@ -package com.mdd.admin.validate; +package com.mdd.admin.validate.teacher; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/TeacherSearchValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/teacher/TeacherSearchValidate.java similarity index 94% rename from server/like-admin/src/main/java/com/mdd/admin/validate/TeacherSearchValidate.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/teacher/TeacherSearchValidate.java index f6c1a36b..ffbc6309 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/TeacherSearchValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/teacher/TeacherSearchValidate.java @@ -1,4 +1,4 @@ -package com.mdd.admin.validate; +package com.mdd.admin.validate.teacher; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/TeacherUnavailableCreateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/teacher/TeacherUnavailableCreateValidate.java similarity index 96% rename from server/like-admin/src/main/java/com/mdd/admin/validate/TeacherUnavailableCreateValidate.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/teacher/TeacherUnavailableCreateValidate.java index f3166eeb..a92d1a47 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/TeacherUnavailableCreateValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/teacher/TeacherUnavailableCreateValidate.java @@ -1,4 +1,4 @@ -package com.mdd.admin.validate; +package com.mdd.admin.validate.teacher; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/TeacherUnavailableSearchValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/teacher/TeacherUnavailableSearchValidate.java similarity index 93% rename from server/like-admin/src/main/java/com/mdd/admin/validate/TeacherUnavailableSearchValidate.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/teacher/TeacherUnavailableSearchValidate.java index 90d7c01c..3666bda1 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/TeacherUnavailableSearchValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/teacher/TeacherUnavailableSearchValidate.java @@ -1,4 +1,4 @@ -package com.mdd.admin.validate; +package com.mdd.admin.validate.teacher; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/TeacherUnavailableUpdateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/teacher/TeacherUnavailableUpdateValidate.java similarity index 97% rename from server/like-admin/src/main/java/com/mdd/admin/validate/TeacherUnavailableUpdateValidate.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/teacher/TeacherUnavailableUpdateValidate.java index 439b2ef0..9aa1c78e 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/TeacherUnavailableUpdateValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/teacher/TeacherUnavailableUpdateValidate.java @@ -1,4 +1,4 @@ -package com.mdd.admin.validate; +package com.mdd.admin.validate.teacher; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/server/like-admin/src/main/java/com/mdd/admin/validate/TeacherUpdateValidate.java b/server/like-admin/src/main/java/com/mdd/admin/validate/teacher/TeacherUpdateValidate.java similarity index 93% rename from server/like-admin/src/main/java/com/mdd/admin/validate/TeacherUpdateValidate.java rename to server/like-admin/src/main/java/com/mdd/admin/validate/teacher/TeacherUpdateValidate.java index 5e6a0083..63965d33 100644 --- a/server/like-admin/src/main/java/com/mdd/admin/validate/TeacherUpdateValidate.java +++ b/server/like-admin/src/main/java/com/mdd/admin/validate/teacher/TeacherUpdateValidate.java @@ -1,10 +1,10 @@ -package com.mdd.admin.validate; +package com.mdd.admin.validate.teacher; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; -import javax.validation.constraints.*; + import com.mdd.common.validator.annotation.IDMust; /** diff --git a/server/like-admin/src/main/resources/application.yml b/server/like-admin/src/main/resources/application.yml index a287ba5c..23d16cc9 100644 --- a/server/like-admin/src/main/resources/application.yml +++ b/server/like-admin/src/main/resources/application.yml @@ -1,6 +1,6 @@ # 项目配置 like: - upload-directory: /www/uploads/likeadmin-java/ # 上传目录 + upload-directory: D:/www/uploads/likeadmin-java/ # 上传目录 # 验证码配置 captcha: # 是否开启验证码 diff --git a/server/like-common/src/main/java/com/mdd/common/mapper/TeacherMapper.java b/server/like-common/src/main/java/com/mdd/common/mapper/TeacherMapper.java index cfea3762..51147505 100644 --- a/server/like-common/src/main/java/com/mdd/common/mapper/TeacherMapper.java +++ b/server/like-common/src/main/java/com/mdd/common/mapper/TeacherMapper.java @@ -19,4 +19,12 @@ public interface TeacherMapper extends IBaseMapper { */ @Update("UPDATE la_teacher SET name = #{name} WHERE admin_id = #{adminId} AND delete_time IS NULL") void updateNameByAdminId(@Param("adminId") Integer adminId, @Param("name") String name); + + /** + * 根据管理员ID和工号更新教师信息 + * @param adminId 管理员ID + * @param code 教师工号 + */ + @Update("UPDATE la_teacher SET teacher_code = #{code} WHERE admin_id = #{adminId} AND delete_time IS NULL") + void updateCodeByAdminId(@Param("adminId")Integer adminId, @Param("code")String code); } diff --git a/server/like-common/src/main/java/com/mdd/common/plugin/storage/engine/LocalStorage.java b/server/like-common/src/main/java/com/mdd/common/plugin/storage/engine/LocalStorage.java index 078b2789..553d6315 100644 --- a/server/like-common/src/main/java/com/mdd/common/plugin/storage/engine/LocalStorage.java +++ b/server/like-common/src/main/java/com/mdd/common/plugin/storage/engine/LocalStorage.java @@ -6,6 +6,7 @@ import org.springframework.web.multipart.MultipartFile; import java.io.File; + /** * 本地存储 */