修改为openCollege

src/main/java/com/qmth/eds/api/SysController.java

@@ -13,6 +13,7 @@ import com.qmth.eds.common.enums.ExceptionResultEnum;
 import com.qmth.eds.common.util.Result;
 import com.qmth.eds.common.util.ResultUtil;
 import com.qmth.eds.common.util.ServletUtil;
+import com.qmth.eds.service.CommonService;
 import com.qmth.eds.service.ExamSyncStudentService;
 import com.qmth.eds.service.SysUserService;
 import com.qmth.eds.service.TeachcloudCommonService;
@@ -44,6 +45,9 @@ public class SysController {
     @Resource
     ExamSyncStudentService examSyncStudentService;
 
+    @Resource
+    CommonService commonService;
+
     /**
      * 登录
      *

src/main/java/com/qmth/eds/service/CommonService.java

@@ -77,15 +77,5 @@ public interface CommonService {
      */
     String getSysSettingValue(Long schoolId, String code);
 
-    /**
-     * 查询云阅卷科目代码
-     *
-     * @param semesterId
-     * @param examTypeId
-     * @param courseCode
-     * @return
-     */
-    Set<String> findCloudMarkSubjectCode(Long semesterId, Long examTypeId, String courseCode);
-
     List<ExamSyncStudent> conditionCourseQuery(Long semesterId, Long examTypeId);
 }

src/main/java/com/qmth/eds/service/impl/CommonServiceImpl.java

@@ -21,7 +21,6 @@ import com.qmth.eds.service.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
 import org.springframework.util.LinkedMultiValueMap;
 
 import javax.annotation.Resource;
@@ -245,27 +244,11 @@ public class CommonServiceImpl implements CommonService {
         return simpleObject.getValue();
     }
 
-    /**
-     * 查询云阅卷科目代码
-     *
-     * @param semesterId
-     * @param examTypeId
-     * @param courseCode
-     * @return
-     */
-    @Override
-    public List<String> findCloudMarkSubjectCode(Long semesterId, Long examTypeId, String courseCode) {
-        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        //先查询云阅卷科目代码
-        List<String> courseCodeList = cloudMarkingScoreService.queryBySyncCourseCode(schoolId, semesterId, examTypeId, courseCode);
-        return !CollectionUtils.isEmpty(courseCodeList) ? courseCodeList : Collections.emptyList();
-    }
-
     @Override
     public List<ExamSyncStudent> conditionCourseQuery(Long semesterId, Long examTypeId) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         ExamSyncTotal examSyncTotal = examSyncTotalService.getBySemesterIdAndExamTypeIdAndUseFile(schoolId, semesterId, examTypeId, true);
-        if(examSyncTotal != null){
+        if (examSyncTotal != null) {
             return examSyncStudentService.listByExamSyncTotalId(examSyncTotal);
         }
         return null;