Merge remote-tracking branch 'origin/dev_v2.1.0' into dev_v2.1.0

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/CacheService.java

@@ -157,41 +157,21 @@ public interface CacheService {
 
     /**
      * 删除考生个人报告缓存
-     *
-     * @param schoolId
-     * @param studentCode
-     * @param examId
-     * @param courseCode
      */
-    public void removeExamStudentReportCache(Long schoolId, String studentCode, String examId, String courseCode);
+    public void removeExamStudentReportCache();
 
     /**
      * 删除院长缓存
-     *
-     * @param schoolId
-     * @param semester
-     * @param examId
-     * @param collegeId
      */
-    public void removeCollegeDeanCache(Long schoolId, String semester, Long examId, Long collegeId);
+    public void removeCollegeDeanCache();
 
     /**
      * 删除学院学科缓存
-     *
-     * @param schoolId
-     * @param semester
-     * @param examId
-     * @param courseCode
      */
-    public void removeCollegeCourseCache(Long schoolId, String semester, Long examId, String courseCode);
+    public void removeCollegeCourseCache();
 
     /**
      * 删除开课课程考试总览图表缓存
-     *
-     * @param schoolId
-     * @param semester
-     * @param examId
-     * @param courseCode
      */
-    public void removeSurveyTeacherViewCache(Long schoolId, String semester, Long examId, String courseCode);
+    public void removeSurveyTeacherViewCache();
 }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/CacheServiceImpl.java

@@ -254,57 +254,37 @@ public class CacheServiceImpl implements CacheService {
 
     /**
      * 删除考生个人报告缓存
-     *
-     * @param schoolId
-     * @param studentCode
-     * @param examId
-     * @param courseCode
      */
     @Override
-    @CacheEvict(value = SystemConstant.EXAM_STUDENT_REPORT, key = "#schoolId + '-' + #studentCode + '-' + #examId + '-' + #courseCode")
-    public void removeExamStudentReportCache(Long schoolId, String studentCode, String examId, String courseCode) {
+    @CacheEvict(value = SystemConstant.EXAM_STUDENT_REPORT, allEntries = true)
+    public void removeExamStudentReportCache() {
 
     }
 
     /**
      * 删除院长缓存
-     *
-     * @param schoolId
-     * @param semester
-     * @param examId
-     * @param collegeId
      */
     @Override
-    @CacheEvict(value = SystemConstant.COLLEGE_DEAN_REPORT, key = "#schoolId + '-' + #semester + '-' + #examId + '-' +#collegeId")
-    public void removeCollegeDeanCache(Long schoolId, String semester, Long examId, Long collegeId) {
+    @CacheEvict(value = SystemConstant.COLLEGE_DEAN_REPORT, allEntries = true)
+    public void removeCollegeDeanCache() {
 
     }
 
     /**
      * 删除学院学科缓存
-     *
-     * @param schoolId
-     * @param semester
-     * @param examId
-     * @param courseCode
      */
     @Override
-    @CacheEvict(value = SystemConstant.COLLEGE_COURSE_REPORT, key = "#schoolId + '-' + #semester + '-' + #examId + '-' + #courseCode")
-    public void removeCollegeCourseCache(Long schoolId, String semester, Long examId, String courseCode) {
+    @CacheEvict(value = SystemConstant.COLLEGE_COURSE_REPORT, allEntries = true)
+    public void removeCollegeCourseCache() {
 
     }
 
     /**
      * 删除开课课程考试总览图表缓存
-     *
-     * @param schoolId
-     * @param semester
-     * @param examId
-     * @param courseCode
      */
     @Override
-    @CacheEvict(value = SystemConstant.SURVEY_TEACHER_VIEW_REPORT, key = "#schoolId + '-' + #semester + '-' + #examId + '-' + #courseCode")
-    public void removeSurveyTeacherViewCache(Long schoolId, String semester, Long examId, String courseCode) {
+    @CacheEvict(value = SystemConstant.SURVEY_TEACHER_VIEW_REPORT, allEntries = true)
+    public void removeSurveyTeacherViewCache() {
 
     }
 }