Browse Source

同步配置加学校id

wangliang 2 years ago
parent
commit
4635a7a1d1

+ 2 - 2
distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/SsoServiceImpl.java

@@ -160,7 +160,7 @@ public class SsoServiceImpl implements SsoService {
         map.computeIfAbsent("time", v -> timestamp);
         map.computeIfAbsent("time", v -> timestamp);
         map.computeIfAbsent("authorization", v -> accessToken);
         map.computeIfAbsent("authorization", v -> accessToken);
 
 
-        SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.TEACHCLOUD_REPORT_HOST_URL);
+        SysConfig sysConfig = commonCacheService.addSysConfigCache(basicSchool.getId(), SystemConstant.TEACHCLOUD_REPORT_HOST_URL);
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置教研分析地址"));
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置教研分析地址"));
         String hostUrl = sysConfig.getConfigValue();
         String hostUrl = sysConfig.getConfigValue();
 
 
@@ -203,7 +203,7 @@ public class SsoServiceImpl implements SsoService {
         Optional.ofNullable(sysUserRole).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("用户没有该角色"));
         Optional.ofNullable(sysUserRole).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("用户没有该角色"));
 
 
         long timestamp = System.currentTimeMillis();
         long timestamp = System.currentTimeMillis();
-        SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.QUESTION_HOST_URL);
+        SysConfig sysConfig = commonCacheService.addSysConfigCache(basicSchool.getId(), SystemConstant.QUESTION_HOST_URL);
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置题库地址"));
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置题库地址"));
         String questionLoginUrl = sysConfig.getConfigValue();
         String questionLoginUrl = sysConfig.getConfigValue();
         if (questionLoginUrl.contains("*")) {
         if (questionLoginUrl.contains("*")) {

+ 6 - 6
teachcloud-common/src/main/java/com/qmth/teachcloud/common/contant/SystemConstant.java

@@ -92,7 +92,7 @@ public class SystemConstant {
     public static final String TEACHCLOUD_REPORT_OPEN_EXAM_EDIT_API = "/api/report/open/exam_edit";
     public static final String TEACHCLOUD_REPORT_OPEN_EXAM_EDIT_API = "/api/report/open/exam_edit";
     public static final String TEACHCLOUD_REPORT_OPEN_EXAM_DELETE_API = "/api/report/open/exam_delete";
     public static final String TEACHCLOUD_REPORT_OPEN_EXAM_DELETE_API = "/api/report/open/exam_delete";
     public static final String TEACHCLOUD_REPORT_OPEN_COURSE_EDIT_API = "/api/report/open/course_edit";
     public static final String TEACHCLOUD_REPORT_OPEN_COURSE_EDIT_API = "/api/report/open/course_edit";
-//    public static final String TEACHCLOUD_REPORT_OPEN_COURSE_DEL_API = "/api/report/open/course_del";
+    //    public static final String TEACHCLOUD_REPORT_OPEN_COURSE_DEL_API = "/api/report/open/course_del";
     public static final String TEACHCLOUD_REPORT_OPEN_CALCULATE_API = "/api/report/open/calculate";
     public static final String TEACHCLOUD_REPORT_OPEN_CALCULATE_API = "/api/report/open/calculate";
     public static final String TEACHCLOUD_REPORT_OPEN_PUBLISH_API = "/api/report/open/publish";
     public static final String TEACHCLOUD_REPORT_OPEN_PUBLISH_API = "/api/report/open/publish";
     public static final String TEACHCLOUD_REPORT_SSO_LOGIN_API = "/api/report/sso/login";
     public static final String TEACHCLOUD_REPORT_SSO_LOGIN_API = "/api/report/sso/login";
@@ -117,11 +117,11 @@ public class SystemConstant {
      * 系统配置
      * 系统配置
      */
      */
     public static final String PRINT_DELETE_DATA_FILE_NAME = "db/4、delete-data.sql";
     public static final String PRINT_DELETE_DATA_FILE_NAME = "db/4、delete-data.sql";
-    public static final String SYS_USER_INIT_PASSWORD = "sys.user.initPassword";
-    public static final String SYS_WARNING_DAYS = "sys.warning.days";
+    //    public static final String SYS_USER_INIT_PASSWORD = "sys.user.initPassword";
+//    public static final String SYS_WARNING_DAYS = "sys.warning.days";
     public static final String SYS_CODE_ENABLE = "sys.code.enable";
     public static final String SYS_CODE_ENABLE = "sys.code.enable";
-    public static final String SYS_MESSAGE_ENABLE = "sys.message.enable";
-    public static final String SYS_MESSAGE_RESEND_COUNT = "sys.message.resendCount";
+    //    public static final String SYS_MESSAGE_ENABLE = "sys.message.enable";
+//    public static final String SYS_MESSAGE_RESEND_COUNT = "sys.message.resendCount";
     public static final String SYS_CONFIG_KEY_CHARSETS = "sys.txt.charset";
     public static final String SYS_CONFIG_KEY_CHARSETS = "sys.txt.charset";
     public static final String SYS_PDF_SIZE_LIST = "sys.pdf.size.list";
     public static final String SYS_PDF_SIZE_LIST = "sys.pdf.size.list";
     public static final String ADMIN_LOGO_URL = "admin.logo.url";
     public static final String ADMIN_LOGO_URL = "admin.logo.url";
@@ -270,7 +270,7 @@ public class SystemConstant {
     public static final String ROLE_PRIVILEGE_CACHE = "role:privilege:cache";
     public static final String ROLE_PRIVILEGE_CACHE = "role:privilege:cache";
     public static final String USER_ROLE_PRIVILEGE_CACHE = "user:role:privilege:cache";
     public static final String USER_ROLE_PRIVILEGE_CACHE = "user:role:privilege:cache";
     public static final String ROLE_CACHE = "role:cache";
     public static final String ROLE_CACHE = "role:cache";
-//    public static final String AUTH_INFO_CACHE = "auth:info:cache";
+    //    public static final String AUTH_INFO_CACHE = "auth:info:cache";
     public static final String SYS_CONFIG_CACHE = "sys:config:cache";
     public static final String SYS_CONFIG_CACHE = "sys:config:cache";
     public static final String CUSTOM_PRIVILEGE_CACHE = "custom:privilege:cache";
     public static final String CUSTOM_PRIVILEGE_CACHE = "custom:privilege:cache";
     public static final String NUMBER_CACHE = "school:number:cache:";
     public static final String NUMBER_CACHE = "school:number:cache:";

+ 14 - 14
teachcloud-common/src/main/java/com/qmth/teachcloud/common/sync/CloudMarkingTaskUtils.java

@@ -69,7 +69,7 @@ public class CloudMarkingTaskUtils {
      * @return 考试ID
      * @return 考试ID
      */
      */
     public Long syncExam(Long schoolId, String code, String name, String examTime) {
     public Long syncExam(Long schoolId, String code, String name, String examTime) {
-        SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.CLOUDMARK_HOST_URL);
+        SysConfig sysConfig = commonCacheService.addSysConfigCache(schoolId, SystemConstant.CLOUDMARK_HOST_URL);
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置云阅卷地址"));
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置云阅卷地址"));
         String hostUrl = sysConfig.getConfigValue();
         String hostUrl = sysConfig.getConfigValue();
         String examSaveUrl = SystemConstant.CLOUD_MARK_EXAM_SAVE_API;
         String examSaveUrl = SystemConstant.CLOUD_MARK_EXAM_SAVE_API;
@@ -103,7 +103,7 @@ public class CloudMarkingTaskUtils {
         Boolean enable = userPushParam.getEnable();
         Boolean enable = userPushParam.getEnable();
         Long schoolId = userPushParam.getSchoolId();
         Long schoolId = userPushParam.getSchoolId();
 
 
-        SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.CLOUDMARK_HOST_URL);
+        SysConfig sysConfig = commonCacheService.addSysConfigCache(schoolId, SystemConstant.CLOUDMARK_HOST_URL);
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置云阅卷地址"));
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置云阅卷地址"));
         String hostUrl = sysConfig.getConfigValue();
         String hostUrl = sysConfig.getConfigValue();
         String userSaveUrl = SystemConstant.CLOUD_MARK_USER_EXTERNAL_SAVE_API;
         String userSaveUrl = SystemConstant.CLOUD_MARK_USER_EXTERNAL_SAVE_API;
@@ -155,7 +155,7 @@ public class CloudMarkingTaskUtils {
     public boolean syncStudent(Long schoolId, String examId, String examNumber, String studentCode, String name, String college,
     public boolean syncStudent(Long schoolId, String examId, String examNumber, String studentCode, String name, String college,
                                String className, String teacher, String subjectCode, String subjectName,
                                String className, String teacher, String subjectCode, String subjectName,
                                String packageCode, String paperType, String examSite, String examRoom) {
                                String packageCode, String paperType, String examSite, String examRoom) {
-        SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.CLOUDMARK_HOST_URL);
+        SysConfig sysConfig = commonCacheService.addSysConfigCache(schoolId, SystemConstant.CLOUDMARK_HOST_URL);
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置云阅卷地址"));
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置云阅卷地址"));
         String hostUrl = sysConfig.getConfigValue();
         String hostUrl = sysConfig.getConfigValue();
         String studentSaveUrl = SystemConstant.CLOUD_MARK_EXAM_STUDENT_SAVE_API;
         String studentSaveUrl = SystemConstant.CLOUD_MARK_EXAM_STUDENT_SAVE_API;
@@ -200,7 +200,7 @@ public class CloudMarkingTaskUtils {
      * @param file        文件
      * @param file        文件
      */
      */
     public String syncFile(Long schoolId, String examId, String subjectCode, SyncFileTypeEnum type, File file) {
     public String syncFile(Long schoolId, String examId, String subjectCode, SyncFileTypeEnum type, File file) {
-        SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.CLOUDMARK_HOST_URL);
+        SysConfig sysConfig = commonCacheService.addSysConfigCache(schoolId, SystemConstant.CLOUDMARK_HOST_URL);
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置云阅卷地址"));
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置云阅卷地址"));
         String hostUrl = sysConfig.getConfigValue();
         String hostUrl = sysConfig.getConfigValue();
         String fileUploadUrl = SystemConstant.CLOUD_MARK_FILE_UPLOAD_API;
         String fileUploadUrl = SystemConstant.CLOUD_MARK_FILE_UPLOAD_API;
@@ -268,7 +268,7 @@ public class CloudMarkingTaskUtils {
      */
      */
     public boolean syncPaperStructure(Long schoolId, String examId, String subjectCode, Boolean objective,
     public boolean syncPaperStructure(Long schoolId, String examId, String subjectCode, Boolean objective,
                                       String paperType, List<QuestionDTO> questions) {
                                       String paperType, List<QuestionDTO> questions) {
-        SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.CLOUDMARK_HOST_URL);
+        SysConfig sysConfig = commonCacheService.addSysConfigCache(schoolId, SystemConstant.CLOUDMARK_HOST_URL);
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置云阅卷地址"));
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置云阅卷地址"));
         String hostUrl = sysConfig.getConfigValue();
         String hostUrl = sysConfig.getConfigValue();
         String structureUrl = SystemConstant.CLOUD_MARK_EXAM_PAPER_SAVE_API;
         String structureUrl = SystemConstant.CLOUD_MARK_EXAM_PAPER_SAVE_API;
@@ -302,7 +302,7 @@ public class CloudMarkingTaskUtils {
      * @param paperType   试卷编号
      * @param paperType   试卷编号
      */
      */
     public String queryPaperStructure(Long schoolId, String examId, String subjectCode, String paperType) {
     public String queryPaperStructure(Long schoolId, String examId, String subjectCode, String paperType) {
-        SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.CLOUDMARK_HOST_URL);
+        SysConfig sysConfig = commonCacheService.addSysConfigCache(schoolId, SystemConstant.CLOUDMARK_HOST_URL);
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置云阅卷地址"));
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置云阅卷地址"));
         String hostUrl = sysConfig.getConfigValue();
         String hostUrl = sysConfig.getConfigValue();
         String queryPaperStructure = SystemConstant.CLOUD_MARK_EXAM_PAPER_QUERY_API;
         String queryPaperStructure = SystemConstant.CLOUD_MARK_EXAM_PAPER_QUERY_API;
@@ -330,7 +330,7 @@ public class CloudMarkingTaskUtils {
      * @param groups      试卷结构JSON
      * @param groups      试卷结构JSON
      */
      */
     public boolean saveMarkerGroup(Long schoolId, String examId, String subjectCode, Integer trialCount, List<GroupDetailDTO> groups) {
     public boolean saveMarkerGroup(Long schoolId, String examId, String subjectCode, Integer trialCount, List<GroupDetailDTO> groups) {
-        SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.CLOUDMARK_HOST_URL);
+        SysConfig sysConfig = commonCacheService.addSysConfigCache(schoolId, SystemConstant.CLOUDMARK_HOST_URL);
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置云阅卷地址"));
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置云阅卷地址"));
         String hostUrl = sysConfig.getConfigValue();
         String hostUrl = sysConfig.getConfigValue();
         String groupSaveUrl = SystemConstant.CLOUD_MARK_EXAM_MARK_GROUP_SAVE_API;
         String groupSaveUrl = SystemConstant.CLOUD_MARK_EXAM_MARK_GROUP_SAVE_API;
@@ -362,7 +362,7 @@ public class CloudMarkingTaskUtils {
      * @param subjectCode 科目代码
      * @param subjectCode 科目代码
      */
      */
     public int countGroup(Long schoolId, String examId, String subjectCode) {
     public int countGroup(Long schoolId, String examId, String subjectCode) {
-        SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.CLOUDMARK_HOST_URL);
+        SysConfig sysConfig = commonCacheService.addSysConfigCache(schoolId, SystemConstant.CLOUDMARK_HOST_URL);
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置云阅卷地址"));
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置云阅卷地址"));
         String hostUrl = sysConfig.getConfigValue();
         String hostUrl = sysConfig.getConfigValue();
         String groupCountUrl = SystemConstant.CLOUD_MARK_EXAM_MARK_GROUP_COUNT_API;
         String groupCountUrl = SystemConstant.CLOUD_MARK_EXAM_MARK_GROUP_COUNT_API;
@@ -393,7 +393,7 @@ public class CloudMarkingTaskUtils {
      * @param subjectCode 科目代码
      * @param subjectCode 科目代码
      */
      */
     public boolean deleteGroup(Long schoolId, String examId, String subjectCode) {
     public boolean deleteGroup(Long schoolId, String examId, String subjectCode) {
-        SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.CLOUDMARK_HOST_URL);
+        SysConfig sysConfig = commonCacheService.addSysConfigCache(schoolId, SystemConstant.CLOUDMARK_HOST_URL);
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置云阅卷地址"));
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置云阅卷地址"));
         String hostUrl = sysConfig.getConfigValue();
         String hostUrl = sysConfig.getConfigValue();
         String groupDeleteUrl = SystemConstant.CLOUD_MARK_EXAM_MARK_GROUP_DELETE_API;
         String groupDeleteUrl = SystemConstant.CLOUD_MARK_EXAM_MARK_GROUP_DELETE_API;
@@ -423,7 +423,7 @@ public class CloudMarkingTaskUtils {
      * @param loginName   用户名
      * @param loginName   用户名
      */
      */
     public boolean saveMarker(Long schoolId, String examId, String subjectCode, Integer groupNumber, String loginName) {
     public boolean saveMarker(Long schoolId, String examId, String subjectCode, Integer groupNumber, String loginName) {
-        SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.CLOUDMARK_HOST_URL);
+        SysConfig sysConfig = commonCacheService.addSysConfigCache(schoolId, SystemConstant.CLOUDMARK_HOST_URL);
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置云阅卷地址"));
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置云阅卷地址"));
         String hostUrl = sysConfig.getConfigValue();
         String hostUrl = sysConfig.getConfigValue();
         String markerSaveUrl = SystemConstant.CLOUD_MARK_EXAM_MARKER_SAVE_API;
         String markerSaveUrl = SystemConstant.CLOUD_MARK_EXAM_MARKER_SAVE_API;
@@ -453,7 +453,7 @@ public class CloudMarkingTaskUtils {
      * @param loginName   用户名
      * @param loginName   用户名
      */
      */
     public boolean saveMarkLeader(Long schoolId, String subjectCode, String loginName) {
     public boolean saveMarkLeader(Long schoolId, String subjectCode, String loginName) {
-        SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.CLOUDMARK_HOST_URL);
+        SysConfig sysConfig = commonCacheService.addSysConfigCache(schoolId, SystemConstant.CLOUDMARK_HOST_URL);
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置云阅卷地址"));
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置云阅卷地址"));
         String hostUrl = sysConfig.getConfigValue();
         String hostUrl = sysConfig.getConfigValue();
         String markLeaderSaveUrl = SystemConstant.CLOUD_MARK_EXAM_SUBJECT_HEADER_SAVE_API;
         String markLeaderSaveUrl = SystemConstant.CLOUD_MARK_EXAM_SUBJECT_HEADER_SAVE_API;
@@ -506,7 +506,7 @@ public class CloudMarkingTaskUtils {
      * @param prefix   账号前缀
      * @param prefix   账号前缀
      */
      */
     private Map<String, Object> openLogin(SysUser sysUser, String loginUrl, String prefix) {
     private Map<String, Object> openLogin(SysUser sysUser, String loginUrl, String prefix) {
-        SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.CLOUDMARK_HOST_URL);
+        SysConfig sysConfig = commonCacheService.addSysConfigCache(sysUser.getSchoolId(), SystemConstant.CLOUDMARK_HOST_URL);
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置云阅卷地址"));
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置云阅卷地址"));
         String hostUrl = sysConfig.getConfigValue();
         String hostUrl = sysConfig.getConfigValue();
         validUrl(hostUrl, loginUrl);
         validUrl(hostUrl, loginUrl);
@@ -664,7 +664,7 @@ public class CloudMarkingTaskUtils {
         map.put("examId", validParam(String.valueOf(examId), null, true, "考试ID"));
         map.put("examId", validParam(String.valueOf(examId), null, true, "考试ID"));
         map.put("withMarkTrack", validParam(withMarkTrack, true, false, "评分标记"));
         map.put("withMarkTrack", validParam(withMarkTrack, true, false, "评分标记"));
 
 
-        SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.CLOUDMARK_HOST_URL);
+        SysConfig sysConfig = commonCacheService.addSysConfigCache(schoolId, SystemConstant.CLOUDMARK_HOST_URL);
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置云阅卷地址"));
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置云阅卷地址"));
         String hostUrl = sysConfig.getConfigValue();
         String hostUrl = sysConfig.getConfigValue();
         String studentCountUrl = SystemConstant.CLOUD_MARK_EXAM_STUDENT_COUNT_API;
         String studentCountUrl = SystemConstant.CLOUD_MARK_EXAM_STUDENT_COUNT_API;
@@ -711,7 +711,7 @@ public class CloudMarkingTaskUtils {
         map.put("pageNumber", validParam(String.valueOf(pageNo), null, true, "页码"));
         map.put("pageNumber", validParam(String.valueOf(pageNo), null, true, "页码"));
         map.put("pageSize", validParam(String.valueOf(pageSize), null, true, "数量"));
         map.put("pageSize", validParam(String.valueOf(pageSize), null, true, "数量"));
 
 
-        SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.CLOUDMARK_HOST_URL);
+        SysConfig sysConfig = commonCacheService.addSysConfigCache(schoolId, SystemConstant.CLOUDMARK_HOST_URL);
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置云阅卷地址"));
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置云阅卷地址"));
         String hostUrl = sysConfig.getConfigValue();
         String hostUrl = sysConfig.getConfigValue();
         String studentScoreUrl = SystemConstant.CLOUD_MARK_EXAM_STUDENT_SCORE_API;
         String studentScoreUrl = SystemConstant.CLOUD_MARK_EXAM_STUDENT_SCORE_API;

+ 6 - 6
teachcloud-common/src/main/java/com/qmth/teachcloud/common/sync/TeachCloudReportTaskUtils.java

@@ -47,7 +47,7 @@ public class TeachCloudReportTaskUtils {
      * @param enable          启用/禁用,ture:启用,false:禁用,默认启用
      * @param enable          启用/禁用,ture:启用,false:禁用,默认启用
      */
      */
     public Long syncSemester(Long schoolId, Long thirdSemesterId, String semesterName, Long startTime, Long endTime, Boolean enable) {
     public Long syncSemester(Long schoolId, Long thirdSemesterId, String semesterName, Long startTime, Long endTime, Boolean enable) {
-        SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.TEACHCLOUD_REPORT_HOST_URL);
+        SysConfig sysConfig = commonCacheService.addSysConfigCache(schoolId, SystemConstant.TEACHCLOUD_REPORT_HOST_URL);
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置教研分析地址"));
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置教研分析地址"));
         String hostUrl = sysConfig.getConfigValue();
         String hostUrl = sysConfig.getConfigValue();
         BasicSchool basicSchool = commonCacheService.schoolCache(schoolId);
         BasicSchool basicSchool = commonCacheService.schoolCache(schoolId);
@@ -96,7 +96,7 @@ public class TeachCloudReportTaskUtils {
      * @param enable     启用/禁用,ture:启用,false:禁用,默认启用
      * @param enable     启用/禁用,ture:启用,false:禁用,默认启用
      */
      */
     public Long syncExam(Long schoolId, Long id, String examName, Long examTime, String semesterId, Boolean enable) {
     public Long syncExam(Long schoolId, Long id, String examName, Long examTime, String semesterId, Boolean enable) {
-        SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.TEACHCLOUD_REPORT_HOST_URL);
+        SysConfig sysConfig = commonCacheService.addSysConfigCache(schoolId, SystemConstant.TEACHCLOUD_REPORT_HOST_URL);
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置教研分析地址"));
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置教研分析地址"));
         String hostUrl = sysConfig.getConfigValue();
         String hostUrl = sysConfig.getConfigValue();
         BasicSchool basicSchool = commonCacheService.schoolCache(schoolId);
         BasicSchool basicSchool = commonCacheService.schoolCache(schoolId);
@@ -142,7 +142,7 @@ public class TeachCloudReportTaskUtils {
      * @return 结果
      * @return 结果
      */
      */
     public Boolean syncDeleteExam(Long schoolId, Long id) {
     public Boolean syncDeleteExam(Long schoolId, Long id) {
-        SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.TEACHCLOUD_REPORT_HOST_URL);
+        SysConfig sysConfig = commonCacheService.addSysConfigCache(schoolId, SystemConstant.TEACHCLOUD_REPORT_HOST_URL);
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置教研分析地址"));
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置教研分析地址"));
         String hostUrl = sysConfig.getConfigValue();
         String hostUrl = sysConfig.getConfigValue();
         BasicSchool basicSchool = commonCacheService.schoolCache(schoolId);
         BasicSchool basicSchool = commonCacheService.schoolCache(schoolId);
@@ -187,7 +187,7 @@ public class TeachCloudReportTaskUtils {
      */
      */
     public boolean syncCourse(Long schoolId, String examId, String courseCode, String courseName,
     public boolean syncCourse(Long schoolId, String examId, String courseCode, String courseName,
                               String paperType, String teachCollegeName, Boolean enable) {
                               String paperType, String teachCollegeName, Boolean enable) {
-        SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.TEACHCLOUD_REPORT_HOST_URL);
+        SysConfig sysConfig = commonCacheService.addSysConfigCache(schoolId, SystemConstant.TEACHCLOUD_REPORT_HOST_URL);
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置教研分析地址"));
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置教研分析地址"));
         String hostUrl = sysConfig.getConfigValue();
         String hostUrl = sysConfig.getConfigValue();
         BasicSchool basicSchool = commonCacheService.schoolCache(schoolId);
         BasicSchool basicSchool = commonCacheService.schoolCache(schoolId);
@@ -233,7 +233,7 @@ public class TeachCloudReportTaskUtils {
      * @param courseCodes 分析试卷的唯一标识
      * @param courseCodes 分析试卷的唯一标识
      */
      */
     public boolean startCalc(Long schoolId, Long examId, List<String> courseCodes) {
     public boolean startCalc(Long schoolId, Long examId, List<String> courseCodes) {
-        SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.TEACHCLOUD_REPORT_HOST_URL);
+        SysConfig sysConfig = commonCacheService.addSysConfigCache(schoolId, SystemConstant.TEACHCLOUD_REPORT_HOST_URL);
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置教研分析地址"));
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置教研分析地址"));
         String hostUrl = sysConfig.getConfigValue();
         String hostUrl = sysConfig.getConfigValue();
         BasicSchool basicSchool = commonCacheService.schoolCache(schoolId);
         BasicSchool basicSchool = commonCacheService.schoolCache(schoolId);
@@ -279,7 +279,7 @@ public class TeachCloudReportTaskUtils {
      * @return
      * @return
      */
      */
     public boolean publish(Long schoolId, Long thirdExamId, String gradeCourseCode, boolean publishStatus) {
     public boolean publish(Long schoolId, Long thirdExamId, String gradeCourseCode, boolean publishStatus) {
-        SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.TEACHCLOUD_REPORT_HOST_URL);
+        SysConfig sysConfig = commonCacheService.addSysConfigCache(schoolId, SystemConstant.TEACHCLOUD_REPORT_HOST_URL);
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置教研分析地址"));
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置教研分析地址"));
         String hostUrl = sysConfig.getConfigValue();
         String hostUrl = sysConfig.getConfigValue();
         BasicSchool basicSchool = commonCacheService.schoolCache(schoolId);
         BasicSchool basicSchool = commonCacheService.schoolCache(schoolId);

+ 5 - 5
teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/impl/CallPrintOpenApiServiceImpl.java

@@ -49,7 +49,7 @@ public class CallPrintOpenApiServiceImpl implements CallPrintOpenApiService {
 
 
         String accessToken = SignatureEntity.build(SignatureType.SECRET, SystemConstant.METHOD, SystemConstant.TEACHCLOUD_PRINT_OPEN_PAPER_CONFIG_API, timestamp, basicSchool.getAccessKey(), basicSchool.getAccessSecret());
         String accessToken = SignatureEntity.build(SignatureType.SECRET, SystemConstant.METHOD, SystemConstant.TEACHCLOUD_PRINT_OPEN_PAPER_CONFIG_API, timestamp, basicSchool.getAccessKey(), basicSchool.getAccessSecret());
 
 
-        SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.TEACHCLOUD_PRINT_HOST_URL);
+        SysConfig sysConfig = commonCacheService.addSysConfigCache(schoolId, SystemConstant.TEACHCLOUD_PRINT_HOST_URL);
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置分布式印刷地址"));
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置分布式印刷地址"));
         String hostUrl = sysConfig.getConfigValue();
         String hostUrl = sysConfig.getConfigValue();
         if (hostUrl.contains("*")) {
         if (hostUrl.contains("*")) {
@@ -76,7 +76,7 @@ public class CallPrintOpenApiServiceImpl implements CallPrintOpenApiService {
         long timestamp = System.currentTimeMillis();
         long timestamp = System.currentTimeMillis();
 
 
         String accessToken = SignatureEntity.build(SignatureType.SECRET, SystemConstant.METHOD, SystemConstant.TEACHCLOUD_PRINT_OPEN_PAPER_DIMENSION_API, timestamp, basicSchool.getAccessKey(), basicSchool.getAccessSecret());
         String accessToken = SignatureEntity.build(SignatureType.SECRET, SystemConstant.METHOD, SystemConstant.TEACHCLOUD_PRINT_OPEN_PAPER_DIMENSION_API, timestamp, basicSchool.getAccessKey(), basicSchool.getAccessSecret());
-        SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.TEACHCLOUD_PRINT_HOST_URL);
+        SysConfig sysConfig = commonCacheService.addSysConfigCache(schoolId, SystemConstant.TEACHCLOUD_PRINT_HOST_URL);
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置分布式印刷地址"));
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置分布式印刷地址"));
         String hostUrl = sysConfig.getConfigValue();
         String hostUrl = sysConfig.getConfigValue();
         if (hostUrl.contains("*")) {
         if (hostUrl.contains("*")) {
@@ -103,7 +103,7 @@ public class CallPrintOpenApiServiceImpl implements CallPrintOpenApiService {
         long timestamp = System.currentTimeMillis();
         long timestamp = System.currentTimeMillis();
 
 
         String accessToken = SignatureEntity.build(SignatureType.SECRET, SystemConstant.METHOD, SystemConstant.TEACHCLOUD_PRINT_OPEN_PAPER_STRUCTURE_API, timestamp, basicSchool.getAccessKey(), basicSchool.getAccessSecret());
         String accessToken = SignatureEntity.build(SignatureType.SECRET, SystemConstant.METHOD, SystemConstant.TEACHCLOUD_PRINT_OPEN_PAPER_STRUCTURE_API, timestamp, basicSchool.getAccessKey(), basicSchool.getAccessSecret());
-        SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.TEACHCLOUD_PRINT_HOST_URL);
+        SysConfig sysConfig = commonCacheService.addSysConfigCache(schoolId, SystemConstant.TEACHCLOUD_PRINT_HOST_URL);
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置分布式印刷地址"));
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置分布式印刷地址"));
         String hostUrl = sysConfig.getConfigValue();
         String hostUrl = sysConfig.getConfigValue();
         if (hostUrl.contains("*")) {
         if (hostUrl.contains("*")) {
@@ -130,7 +130,7 @@ public class CallPrintOpenApiServiceImpl implements CallPrintOpenApiService {
         long timestamp = System.currentTimeMillis();
         long timestamp = System.currentTimeMillis();
 
 
         String accessToken = SignatureEntity.build(SignatureType.SECRET, SystemConstant.METHOD, SystemConstant.TEACHCLOUD_PRINT_OPEN_PAPER_EVALUATION_API, timestamp, basicSchool.getAccessKey(), basicSchool.getAccessSecret());
         String accessToken = SignatureEntity.build(SignatureType.SECRET, SystemConstant.METHOD, SystemConstant.TEACHCLOUD_PRINT_OPEN_PAPER_EVALUATION_API, timestamp, basicSchool.getAccessKey(), basicSchool.getAccessSecret());
-        SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.TEACHCLOUD_PRINT_HOST_URL);
+        SysConfig sysConfig = commonCacheService.addSysConfigCache(schoolId, SystemConstant.TEACHCLOUD_PRINT_HOST_URL);
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置分布式印刷地址"));
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置分布式印刷地址"));
         String hostUrl = sysConfig.getConfigValue();
         String hostUrl = sysConfig.getConfigValue();
         if (hostUrl.contains("*")) {
         if (hostUrl.contains("*")) {
@@ -158,7 +158,7 @@ public class CallPrintOpenApiServiceImpl implements CallPrintOpenApiService {
         List<ExamStudentScore> examStudentScoreList = new ArrayList<>();
         List<ExamStudentScore> examStudentScoreList = new ArrayList<>();
         List<ExamStudentScore> examStudentScoreCell = new ArrayList<>();
         List<ExamStudentScore> examStudentScoreCell = new ArrayList<>();
 
 
-        SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.TEACHCLOUD_PRINT_HOST_URL);
+        SysConfig sysConfig = commonCacheService.addSysConfigCache(schoolId, SystemConstant.TEACHCLOUD_PRINT_HOST_URL);
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置分布式印刷地址"));
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置分布式印刷地址"));
         String hostUrl = sysConfig.getConfigValue();
         String hostUrl = sysConfig.getConfigValue();
         if (hostUrl.contains("*")) {
         if (hostUrl.contains("*")) {

+ 4 - 3
teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/impl/NewCallApiServiceImpl.java

@@ -46,9 +46,6 @@ public class NewCallApiServiceImpl implements NewCallApiService {
      */
      */
     @Override
     @Override
     public List<Map> callStudentScore(Long examId, String examCode) throws IOException {
     public List<Map> callStudentScore(Long examId, String examCode) throws IOException {
-        SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.CLOUDMARK_HOST_URL);
-        Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置云阅卷地址"));
-        String url = sysConfig.getConfigValue();
         Map<String, Object> params = new HashMap<>();
         Map<String, Object> params = new HashMap<>();
         if (Objects.nonNull(examId)) {
         if (Objects.nonNull(examId)) {
             params.put("examId", examId);
             params.put("examId", examId);
@@ -59,6 +56,10 @@ public class NewCallApiServiceImpl implements NewCallApiService {
         if (Objects.isNull(tbCloudExam)) {
         if (Objects.isNull(tbCloudExam)) {
             throw ExceptionResultEnum.ERROR.exception("找不到该考试");
             throw ExceptionResultEnum.ERROR.exception("找不到该考试");
         }
         }
+        SysConfig sysConfig = commonCacheService.addSysConfigCache(tbCloudExam.getSchoolId(), SystemConstant.CLOUDMARK_HOST_URL);
+        Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置云阅卷地址"));
+        String url = sysConfig.getConfigValue();
+
         int pageNumber = 1;
         int pageNumber = 1;
         int pageSize = 100;
         int pageSize = 100;
         List<Map> students = null;
         List<Map> students = null;

+ 1 - 3
teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/templete/strategy/CalculateTaskTemplate.java

@@ -3,7 +3,6 @@ package com.qmth.teachcloud.report.business.templete.strategy;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qmth.boot.api.exception.ApiException;
 import com.qmth.boot.api.exception.ApiException;
-import com.qmth.teachcloud.common.config.DictionaryConfig;
 import com.qmth.teachcloud.common.contant.SpringContextHolder;
 import com.qmth.teachcloud.common.contant.SpringContextHolder;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.BasicSchool;
 import com.qmth.teachcloud.common.entity.BasicSchool;
@@ -135,7 +134,6 @@ public abstract class CalculateTaskTemplate {
      */
      */
     protected void callback(CalculateParams calculateParams) throws IOException {
     protected void callback(CalculateParams calculateParams) throws IOException {
         log.info("callback come in");
         log.info("callback come in");
-        DictionaryConfig dictionaryConfig = SpringContextHolder.getBean(DictionaryConfig.class);
         CommonCacheService commonCacheService = SpringContextHolder.getBean(CommonCacheService.class);
         CommonCacheService commonCacheService = SpringContextHolder.getBean(CommonCacheService.class);
         TBSyncTask tbSyncTask = calculateParams.getTbSyncTask();
         TBSyncTask tbSyncTask = calculateParams.getTbSyncTask();
 
 
@@ -152,7 +150,7 @@ public abstract class CalculateTaskTemplate {
         Optional.ofNullable(sysConfigCallPwd).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置分布式印刷回调密码"));
         Optional.ofNullable(sysConfigCallPwd).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置分布式印刷回调密码"));
         String sign = URLEncoder.encode(Base64Util.encode(ShaUtils.sha1(sysConfigCallPwd.getConfigValue() + jsonObject.toJSONString())), SystemConstant.CHARSET_NAME);
         String sign = URLEncoder.encode(Base64Util.encode(ShaUtils.sha1(sysConfigCallPwd.getConfigValue() + jsonObject.toJSONString())), SystemConstant.CHARSET_NAME);
 
 
-        SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.TEACHCLOUD_PRINT_HOST_URL);
+        SysConfig sysConfig = commonCacheService.addSysConfigCache(calculateParams.getSchoolId(), SystemConstant.TEACHCLOUD_PRINT_HOST_URL);
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置分布式印刷地址"));
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置分布式印刷地址"));
         String hostUrl = sysConfig.getConfigValue();
         String hostUrl = sysConfig.getConfigValue();
         BasicSchool basicSchool = commonCacheService.schoolCache(calculateParams.getSchoolId());
         BasicSchool basicSchool = commonCacheService.schoolCache(calculateParams.getSchoolId());