deason 7 年 前
コミット
6d4be2dfcd

+ 0 - 1
src/main/java/cn/com/qmth/examcloud/app/controller/v1/OfflineExamRestController.java

@@ -67,7 +67,6 @@ public class OfflineExamRestController {
     @ApiOperation(value = "获取某份试卷的详细信息接口")
     @RequestMapping(value = "/paper/detail", method = {RequestMethod.GET, RequestMethod.POST})
     public Result getPaperDetail(@RequestHeader String key, @RequestHeader String token, @RequestParam String paperId) throws Exception {
-        //todo format result
         return questionPoolService.getPaperDetail(key, token, paperId);
     }
 

+ 0 - 2
src/main/java/cn/com/qmth/examcloud/app/controller/v1/PracticeExamRestController.java

@@ -32,7 +32,6 @@ public class PracticeExamRestController {
     @ApiOperation(value = "获取某考生的“考试批次”列表接口")
     @RequestMapping(value = "/exam/practice/list", method = {RequestMethod.GET, RequestMethod.POST})
     public Result getPracticeExamList(@RequestHeader String key, @RequestHeader String token, @RequestParam String studentId) throws Exception {
-        //todo format result
         return examAdminService.getPracticeExamList(key, token, studentId);
     }
 
@@ -63,7 +62,6 @@ public class PracticeExamRestController {
     @ApiOperation(value = "获取当前练习的考试基本信息接口")
     @RequestMapping(value = "/exam/info/{examId}", method = {RequestMethod.GET, RequestMethod.POST})
     public Result getExamInfo(@RequestHeader String key, @RequestHeader String token, @PathVariable Long examId) throws Exception {
-        //todo format result
         return examAdminService.getExamInfo(key, token, examId);
     }
 

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

@@ -26,13 +26,23 @@ public class ExamAdminService {
     public Result getPracticeExamList(String key, String token, String studentId) throws Exception {
         //封装请求参数
         final String requestUrl = String.format("%s/api/ecs_exam_work/exam_student/query?student_id=%s", propertyService.getExamAdminUrl(), studentId);
-        return HttpUtils.doGet(requestUrl, key, token);
+        Result<String> result = HttpUtils.doGet(requestUrl, key, token);
+        if (result.isSuccess()) {
+            //过滤掉为空的属性
+            result.setData(HttpUtils.filterNullAttributes(result.getData()));
+        }
+        return result;
     }
 
     public Result getExamInfo(String key, String token, Long examId) throws Exception {
         //封装请求参数
         final String requestUrl = String.format("%s/api/ecs_exam_work/exam/%s", propertyService.getExamAdminUrl(), examId);
-        return HttpUtils.doGet(requestUrl, key, token);
+        Result<String> result = HttpUtils.doGet(requestUrl, key, token);
+        if (result.isSuccess()) {
+            //过滤掉为空的属性
+            result.setData(HttpUtils.filterNullAttributes(result.getData()));
+        }
+        return result;
     }
 
 }

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

@@ -31,7 +31,12 @@ public class QuestionPoolService {
     public Result getPaperDetail(String key, String token, String paperId) throws Exception {
         //封装请求参数
         final String requestUrl = String.format("%s/api/ecs_ques/paper/%s", propertyService.getQuestionPoolUrl(), paperId);
-        return HttpUtils.doGet(requestUrl, key, token);
+        Result<String> result = HttpUtils.doGet(requestUrl, key, token);
+        if (result.isSuccess()) {
+            //过滤掉为空的属性
+            result.setData(HttpUtils.filterNullAttributes(result.getData()));
+        }
+        return result;
     }
 
 }