deason 6 жил өмнө
parent
commit
4f4a9a7a21

+ 1 - 1
src/main/java/cn/com/qmth/examcloud/app/controller/PracticeExamRestController.java

@@ -169,7 +169,7 @@ public class PracticeExamRestController {
     public Result getFreezeTime(@RequestHeader(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token, @RequestParam Long examId) throws Exception {
         return examAdminService.getFreezeTime(key, token, examId);
     }
-    
+
     @ApiOperation(value = "获取文件上传类型")
     @RequestMapping(value = "/exam/practice/getUpLoadType/{examId}", method = {RequestMethod.GET, RequestMethod.POST})
     public Result getUpLoadType(@RequestHeader(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token, @PathVariable Long examId) throws Exception {

+ 6 - 6
src/main/java/cn/com/qmth/examcloud/app/model/LoginInfo.java

@@ -162,12 +162,12 @@ public class LoginInfo implements Serializable {
         this.createTime = createTime;
     }
 
-	public String getSmsCode() {
-		return smsCode;
-	}
+    public String getSmsCode() {
+        return smsCode;
+    }
 
-	public void setSmsCode(String smsCode) {
-		this.smsCode = smsCode;
-	}
+    public void setSmsCode(String smsCode) {
+        this.smsCode = smsCode;
+    }
 
 }

+ 7 - 6
src/main/java/cn/com/qmth/examcloud/app/service/ExamAdminService.java

@@ -38,21 +38,21 @@ public interface ExamAdminService {
      * @throws Exception
      */
     Result getExamInfo(String key, String token, Long examId) throws Exception;
-    
+
     /**
      * 查询考试说明
-     * 
+     *
      * @param key
      * @param token
      * @param examId
      * @return
      * @throws Exception
      */
-    Result getBeforeExamRemark(String key, String token, Long examId,String type) throws Exception;
-    
+    Result getBeforeExamRemark(String key, String token, Long examId, String type) throws Exception;
+
     /**
-     * 
      * 获取冻结时间
+     *
      * @param key
      * @param token
      * @param examId
@@ -60,9 +60,10 @@ public interface ExamAdminService {
      * @throws Exception
      */
     Result getFreezeTime(String key, String token, Long examId) throws Exception;
-    
+
     /**
      * 获取文件上传类型
+     *
      * @param key
      * @param token
      * @param examId

+ 4 - 4
src/main/java/cn/com/qmth/examcloud/app/service/NetExamService.java

@@ -228,10 +228,10 @@ public interface NetExamService {
      * @throws Exception
      */
     Result updateExamRecordQuestionAudioPlayTimes(String key, String token, String questionId, String mediaName) throws Exception;
-    
+
     /**
      * 练习记录配置信息
-     * 
+     *
      * @param key
      * @param token
      * @param examId
@@ -240,10 +240,10 @@ public interface NetExamService {
      * @throws Exception
      */
     Result findExamRecordDataEntity(String key, String token, Long examRecordDataId) throws Exception;
-    
+
     /**
      * 练习记录试题列表
-     * 
+     *
      * @param key
      * @param token
      * @param examRecordDataId

+ 7 - 7
src/main/java/cn/com/qmth/examcloud/app/service/PropertyService.java

@@ -75,12 +75,12 @@ public class PropertyService {
         return smsTemplate;
     }
 
-	public String getNetAdminExamUrl() {
-		return netAdminExamUrl;
-	}
+    public String getNetAdminExamUrl() {
+        return netAdminExamUrl;
+    }
+
+    public void setNetAdminExamUrl(String netAdminExamUrl) {
+        this.netAdminExamUrl = netAdminExamUrl;
+    }
 
-	public void setNetAdminExamUrl(String netAdminExamUrl) {
-		this.netAdminExamUrl = netAdminExamUrl;
-	}
-    
 }

+ 2 - 2
src/main/java/cn/com/qmth/examcloud/app/service/QuestionPoolService.java

@@ -37,10 +37,10 @@ public interface QuestionPoolService {
      * @throws Exception
      */
     Result getPaperDetail(String key, String token, String paperId) throws Exception;
-    
+
     /**
      * 获取某个试题的详细信息
-     * 
+     *
      * @param key
      * @param token
      * @return

+ 3 - 3
src/main/java/cn/com/qmth/examcloud/app/service/UserAuthService.java

@@ -61,10 +61,10 @@ public interface UserAuthService {
      * @throws Exception
      */
     Result updateStudentPassword(String key, String token, Long studentId, String password, String newPassword) throws Exception;
-    
+
     /**
      * 重置密码
-     * 
+     *
      * @param key
      * @param token
      * @param newPassword
@@ -83,7 +83,7 @@ public interface UserAuthService {
      * @throws Exception
      */
     Result sendSmsCode(String key, String token, String phone) throws Exception;
-    
+
     /**
      * 获取短信验证码
      *

+ 12 - 12
src/main/java/cn/com/qmth/examcloud/app/service/impl/ExamAdminServiceImpl.java

@@ -57,9 +57,9 @@ public class ExamAdminServiceImpl implements ExamAdminService {
         return result;
     }
 
-	@Override
-	public Result getBeforeExamRemark(String key, String token, Long examId, String type) throws Exception {
-		//封装请求参数
+    @Override
+    public Result getBeforeExamRemark(String key, String token, Long examId, String type) throws Exception {
+        //封装请求参数
         final String requestUrl = String.format("%s/api/ecs_exam_work/exam/examOrgProperty/%s/%s", propertyService.getExamAdminUrl(), examId, type);
         Result<String> result = HttpUtils.doGet(requestUrl, key, token);
         if (result.isSuccess()) {
@@ -67,11 +67,11 @@ public class ExamAdminServiceImpl implements ExamAdminService {
             result.setData(HttpUtils.filterNullAttributes(result.getData()));
         }
         return result;
-	}
+    }
 
-	@Override
-	public Result getFreezeTime(String key, String token, Long examId) throws Exception {
-		//封装请求参数
+    @Override
+    public Result getFreezeTime(String key, String token, Long examId) throws Exception {
+        //封装请求参数
         final String requestUrl = String.format("%s/api/ecs_exam_work/exam/examOrgProperty/%s/FREEZE_TIME", propertyService.getExamAdminUrl(), examId);
         Result<String> result = HttpUtils.doGet(requestUrl, key, token);
         if (result.isSuccess()) {
@@ -79,11 +79,11 @@ public class ExamAdminServiceImpl implements ExamAdminService {
             result.setData(HttpUtils.filterNullAttributes(result.getData()));
         }
         return result;
-	}
+    }
 
-	@Override
-	public Result getUpLoadType(String key, String token, Long examId) throws Exception {
-		//封装请求参数
+    @Override
+    public Result getUpLoadType(String key, String token, Long examId) throws Exception {
+        //封装请求参数
         final String requestUrl = String.format("%s/api/ecs_exam_work/exam/examOrgProperty/%s/OFFLINE_UPLOAD_FILE_TYPE", propertyService.getExamAdminUrl(), examId);
         Result<String> result = HttpUtils.doGet(requestUrl, key, token);
         if (result.isSuccess()) {
@@ -91,6 +91,6 @@ public class ExamAdminServiceImpl implements ExamAdminService {
             result.setData(HttpUtils.filterNullAttributes(result.getData()));
         }
         return result;
-	}
+    }
 
 }

+ 8 - 8
src/main/java/cn/com/qmth/examcloud/app/service/impl/NetExamServiceImpl.java

@@ -132,7 +132,7 @@ public class NetExamServiceImpl implements NetExamService {
     @Override
     public Result getExamRecordPaperQuestionDetail(String key, String token, String questionId, String examRecordId) throws Exception {
         //封装请求参数
-        final String requestUrl = String.format("%s/api/ecs_oe_student/examQuestion/getQuestionContent?questionId=%s&exam_record_id=%s", propertyService.getNetExamUrl(), questionId,examRecordId);
+        final String requestUrl = String.format("%s/api/ecs_oe_student/examQuestion/getQuestionContent?questionId=%s&exam_record_id=%s", propertyService.getNetExamUrl(), questionId, examRecordId);
         return HttpUtils.doGet(requestUrl, key, token);
     }
 
@@ -211,8 +211,8 @@ public class NetExamServiceImpl implements NetExamService {
     }
 
     @Override
-	public Result findExamRecordDataEntity(String key, String token, Long examRecordDataId) throws Exception {
-		//封装请求参数
+    public Result findExamRecordDataEntity(String key, String token, Long examRecordDataId) throws Exception {
+        //封装请求参数
         final String requestUrl = String.format("%s/api/ecs_oe_admin/exam/record/data/findExamRecordDataEntity?examRecordDataId=%s", propertyService.getNetAdminExamUrl(), examRecordDataId);
         Result<String> result = HttpUtils.doGet(requestUrl, key, token);
         if (result.isSuccess()) {
@@ -220,11 +220,11 @@ public class NetExamServiceImpl implements NetExamService {
             result.setData(HttpUtils.filterNullAttributes(result.getData()));
         }
         return result;
-	}
-    
+    }
+
     @Override
-	public Result getExamRecordQuestions(String key, String token, Long examRecordDataId) throws Exception {
-		//封装请求参数
+    public Result getExamRecordQuestions(String key, String token, Long examRecordDataId) throws Exception {
+        //封装请求参数
         final String requestUrl = String.format("%s/api/ecs_oe_admin/examRecordQuestions/getExamRecordQuestions?examRecordDataId=%s", propertyService.getNetAdminExamUrl(), examRecordDataId);
         Result<String> result = HttpUtils.doGet(requestUrl, key, token);
         if (result.isSuccess()) {
@@ -232,5 +232,5 @@ public class NetExamServiceImpl implements NetExamService {
             result.setData(HttpUtils.filterNullAttributes(result.getData()));
         }
         return result;
-	}
+    }
 }

+ 6 - 6
src/main/java/cn/com/qmth/examcloud/app/service/impl/QuestionPoolServiceImpl.java

@@ -58,9 +58,9 @@ public class QuestionPoolServiceImpl implements QuestionPoolService {
         return result;
     }
 
-	@Override
-	public Result getQuestion(String key, String token, String courseCode, Long examId, String groupCode, String questionId) throws Exception {
-		//封装请求参数
+    @Override
+    public Result getQuestion(String key, String token, String courseCode, Long examId, String groupCode, String questionId) throws Exception {
+        //封装请求参数
         final String requestUrl = String.format("%s/api/ecs_ques/default_question/question", propertyService.getQuestionPoolUrl());
         Map<String, Object> params = new HashMap<>();
         params.put("courseCode", courseCode);
@@ -72,9 +72,9 @@ public class QuestionPoolServiceImpl implements QuestionPoolService {
         //发送短信
         Result<String> result = HttpUtils.doPost(requestUrl, formBody, key, token);
         return this.parseResult(result);
-	}
-	
-	private Result<String> parseResult(Result<String> result) {
+    }
+
+    private Result<String> parseResult(Result<String> result) {
         if (!result.isSuccess()) {
             return result;
         }