merge from examcloud-R

src/main/java/cn/com/qmth/examcloud/app/controller/ExamController.java

@@ -1,65 +0,0 @@
-package cn.com.qmth.examcloud.app.controller;
-
-import static cn.com.qmth.examcloud.app.model.Constants.PARAM_APP_KEY;
-import static cn.com.qmth.examcloud.app.model.Constants.PARAM_APP_TOKEN;
-
-import javax.validation.Valid;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import cn.com.qmth.examcloud.app.model.GetYunSignatureReq;
-import cn.com.qmth.examcloud.app.model.Result;
-import cn.com.qmth.examcloud.app.service.CoreOeService;
-import cn.com.qmth.examcloud.web.support.ControllerSupport;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-@RestController
-@RequestMapping("${$rmp}/v2/exam")
-@Api(tags = "考试相关接口")
-public class ExamController extends ControllerSupport {
-
-    @Autowired
-    private CoreOeService oeService;
-
-	@ApiOperation(value = "查询考生的考试批次属性集")
-	@GetMapping("getExamProperty/{examId}/{keys}")
-	public Result getExamPropertyFromCacheByStudentSession(@RequestHeader(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token,@PathVariable Long examId,
-			@PathVariable String keys) throws Exception{
-	    return oeService.getExamPropertyFromCacheByStudentSession(key, token, examId, keys);
-	}
-	/**
-     * 获取云存储上传签名（微信小程序调用）
-     */
-    @ApiOperation(value = "获取文件上传签名")
-    @PostMapping("/yunSignature")
-    public Result getYunSignature(@RequestHeader(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token,@ModelAttribute @Valid GetYunSignatureReq req) throws Exception{
-        return oeService.getYunSignature(key, token, req);
-    }
-    
-    @ApiOperation(value = "获取在线考试待考列表")
-    @GetMapping("/queryExamList")
-    public Result queryExamList(@RequestHeader(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token) throws Exception{
-        return oeService.queryExamList(key, token);
-    }
-    
-    @ApiOperation(value = "获取考试记录信息")
-    @GetMapping("/getEndExamInfo/{examRecordDataId}")
-    public Result getEndExamInfo(@RequestHeader(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token,@PathVariable Long examRecordDataId) throws Exception{
-        return oeService.getEndExamInfo(key, token,examRecordDataId);
-    }
-    
-    @ApiOperation(value = "根据examStudentId获取客观分信息")
-    @GetMapping("/queryObjectiveScoreList/{examStudentId}")
-    public Result queryObjectiveScoreList(@RequestHeader(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token,@PathVariable Long examStudentId) throws Exception{
-        return oeService.queryObjectiveScoreList(key, token,examStudentId);
-    }
-
-}

src/main/java/cn/com/qmth/examcloud/app/controller/PaperController.java

@@ -1,35 +0,0 @@
-package cn.com.qmth.examcloud.app.controller;
-
-import static cn.com.qmth.examcloud.app.model.Constants.PARAM_APP_KEY;
-import static cn.com.qmth.examcloud.app.model.Constants.PARAM_APP_TOKEN;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import cn.com.qmth.examcloud.app.model.Result;
-import cn.com.qmth.examcloud.app.service.CoreOeService;
-import cn.com.qmth.examcloud.web.support.ControllerSupport;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-@RestController
-@RequestMapping("${$rmp}/v2/paper")
-@Api(tags = "试卷相关接口")
-public class PaperController extends ControllerSupport {
-
-    @Autowired
-    private CoreOeService oeService;
-
-	@ApiOperation(value = "根据Id获取试卷")
-	@GetMapping("{paperId}")
-	public Result getPaperById(@RequestHeader(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token,
-			@PathVariable String paperId) throws Exception{
-	    return oeService.getPaperById(key, token,paperId);
-	}
-
-
-}

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

@@ -61,15 +61,10 @@ public class PracticeExamRestController {
         return oeService.startPracticeExamRecord(key, token, examStudentId);
     }
 
-    @ApiOperation(value = "获取结束练习的试卷大题结构信息接口")
-    @RequestMapping(value = "/exam/admin/record/paper/struct/list", method = {RequestMethod.POST})
-    public Result getExamAdminRecordPaperStructList(@RequestHeader(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token, @RequestParam String examRecordId,@RequestParam(required = false) String fromCache) throws Exception {
-        return oeService.getAdminExamPaperStructList(key, token, examRecordId,fromCache);
-    }
     @ApiOperation(value = "获取当前练习的试卷大题结构信息接口")
-    @RequestMapping(value = "/exam/student/record/paper/struct/list", method = {RequestMethod.POST})
-    public Result getExamStudentRecordPaperStructList(@RequestHeader(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token, @RequestParam String examRecordId) throws Exception {
-        return oeService.getStudentExamPaperStructList(key, token, examRecordId);
+    @RequestMapping(value = "/exam/record/paper/struct/list", method = {RequestMethod.POST})
+    public Result getExamRecordPaperStructList(@RequestHeader(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token, @RequestParam String examRecordId) throws Exception {
+        return oeService.getExamRecordPaperStructList(key, token, examRecordId);
     }
 
     @ApiOperation(value = "获取当前练习的考试基本信息接口")
@@ -116,8 +111,8 @@ public class PracticeExamRestController {
 
     @ApiOperation(value = "获取成绩报告的答题情况统计接口")
     @RequestMapping(value = "/exam/record/total", method = {RequestMethod.POST})
-    public Result getExamRecordTotalInfo(@RequestHeader(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token, @RequestParam String examRecordId,@RequestParam(required = false) String fromCache) throws Exception {
-        return oeService.getExamRecordTotalInfo(key, token, examRecordId,fromCache);
+    public Result getExamRecordTotalInfo(@RequestHeader(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token, @RequestParam String examRecordId) throws Exception {
+        return oeService.getExamRecordTotalInfo(key, token, examRecordId);
     }
 
     @ApiOperation(value = "获取作答的题列表接口")
@@ -146,14 +141,14 @@ public class PracticeExamRestController {
 
     @ApiOperation(value = "查询练习记录配置信息")
     @RequestMapping(value = "/exam/practice/end/findExamRecordDataEntity/{examRecordDataId}", method = {RequestMethod.POST})
-    public Result findExamRecordDataEntity(@RequestHeader(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token, @PathVariable Long examRecordDataId,@RequestParam(required = false) String fromCache) throws Exception {
-        return oeService.findExamRecordDataEntity(key, token, examRecordDataId, fromCache);
+    public Result findExamRecordDataEntity(@RequestHeader(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token, @PathVariable Long examRecordDataId) throws Exception {
+        return oeService.findExamRecordDataEntity(key, token, examRecordDataId);
     }
 
     @ApiOperation(value = "查询练习记录试题列表")
     @RequestMapping(value = "/exam/practice/end/getExamRecordQuestions/{examRecordDataId}", method = {RequestMethod.POST})
-    public Result getExamRecordQuestions(@RequestHeader(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token, @PathVariable Long examRecordDataId,@RequestParam(required = false) String fromCache) throws Exception {
-        return oeService.getExamRecordQuestions(key, token, examRecordDataId,fromCache);
+    public Result getExamRecordQuestions(@RequestHeader(name = PARAM_APP_KEY) String key, @RequestHeader(name = PARAM_APP_TOKEN) String token, @PathVariable Long examRecordDataId) throws Exception {
+        return oeService.getExamRecordQuestions(key, token, examRecordDataId);
     }
 
     @ApiOperation(value = "查询某个试题内容")

src/main/java/cn/com/qmth/examcloud/app/core/config/TokenFilter.java

@@ -145,13 +145,13 @@ public class TokenFilter implements Filter {
                     return null;
                 }
 
-//                boolean isDoing = authService.isDoingExam(loginInfo.getRootOrgId(), loginInfo.getAccountType(), loginInfo.getAccount());
-//                log.info("[Check Doing Exam] result is " + isDoing);
-//                if (isDoing) {
-//                    reqContinue.yes = false;
-//                    this.renderError(response, new Result().error("尚在考试中不允许登录！").toString());
-//                    return null;
-//                }
+                boolean isDoing = authService.isDoingExam(loginInfo.getRootOrgId(), loginInfo.getAccountType(), loginInfo.getAccount());
+                log.info("[Check Doing Exam] result is " + isDoing);
+                if (isDoing) {
+                    reqContinue.yes = false;
+                    this.renderError(response, new Result().error("尚在考试中不允许登录！").toString());
+                    return null;
+                }
 
                 //判断原始登录Token是否在有效时间内，否则自动登录续期
                 this.reLogin(loginInfo);

src/main/java/cn/com/qmth/examcloud/app/model/GetYunSignatureReq.java

@@ -1,68 +0,0 @@
-package cn.com.qmth.examcloud.app.model;
-
-import cn.com.qmth.examcloud.api.commons.exchange.JsonSerializable;
-import io.swagger.annotations.ApiModelProperty;
-
-import javax.validation.constraints.NotNull;
-
-public class GetYunSignatureReq implements JsonSerializable {
-	/**
-     * 
-     */
-    private static final long serialVersionUID = 4523536593807014828L;
-    @NotNull(message = "考试记录DataID不能为空")
-    @ApiModelProperty(required = true, value = "考试记录DataID")
-    private String examRecordDataId;
-    @NotNull(message = "题号不能为空")
-    @ApiModelProperty(required = true, value = "考试试题号")
-    private String order;
-    @NotNull(message = "文件MD5不能为空")
-    @ApiModelProperty(required = true, value = "文件MD5")
-    private String fileMd5;
-    @NotNull(message = "文件后缀不能为空")
-    @ApiModelProperty(required = true, value = "文件后缀")
-    private String fileSuffix;
-    @ApiModelProperty(value = "文件名自定义参数")
-    private String ext;
-
-    public String getExamRecordDataId() {
-        return examRecordDataId;
-    }
-
-    public void setExamRecordDataId(String examRecordDataId) {
-        this.examRecordDataId = examRecordDataId;
-    }
-
-    public String getOrder() {
-        return order;
-    }
-
-    public void setOrder(String order) {
-        this.order = order;
-    }
-
-    public String getFileMd5() {
-        return fileMd5;
-    }
-
-    public void setFileMd5(String fileMd5) {
-        this.fileMd5 = fileMd5;
-    }
-
-    public String getFileSuffix() {
-        return fileSuffix;
-    }
-
-    public void setFileSuffix(String fileSuffix) {
-        this.fileSuffix = fileSuffix;
-    }
-
-    public String getExt() {
-        return ext;
-    }
-
-    public void setExt(String ext) {
-        this.ext = ext;
-    }
-
-}

src/main/java/cn/com/qmth/examcloud/app/service/CoreOeService.java

@@ -1,12 +1,12 @@
 /*
- * ************************************************* Copyright (c) 2018 QMTH.
- * All Rights Reserved. Created by Deason on 2018-07-31 17:31:34.
+ * *************************************************
+ * Copyright (c) 2018 QMTH. All Rights Reserved.
+ * Created by Deason on 2018-07-31 17:31:34.
  * *************************************************
  */
 
 package cn.com.qmth.examcloud.app.service;
 
-import cn.com.qmth.examcloud.app.model.GetYunSignatureReq;
 import cn.com.qmth.examcloud.app.model.Result;
 
 /**
@@ -60,8 +60,7 @@ public interface CoreOeService {
      * @return
      * @throws Exception
      */
-    Result uploadPaperAnswer(String key, String token, String examRecordId, byte[] fileBytes, String fileName,
-            String md5) throws Exception;
+    Result uploadPaperAnswer(String key, String token, String examRecordId, byte[] fileBytes, String fileName, String md5) throws Exception;
 
     /**
      * 获取某考试批次下的课程列表
@@ -104,19 +103,7 @@ public interface CoreOeService {
      * @return
      * @throws Exception
      */
-    Result getAdminExamPaperStructList(String key, String token, String examRecordId, String fromCache)
-            throws Exception;
-
-    /**
-     * 获取当前练习的试卷大题结构信息
-     *
-     * @param key
-     * @param token
-     * @param examRecordId
-     * @return
-     * @throws Exception
-     */
-    Result getStudentExamPaperStructList(String key, String token, String examRecordId) throws Exception;
+    Result getExamRecordPaperStructList(String key, String token, String examRecordId) throws Exception;
 
     /**
      * 获取当前练习的试卷试题列表
@@ -137,8 +124,7 @@ public interface CoreOeService {
      * @return
      * @throws Exception
      */
-    Result getExamRecordPaperQuestionDetail(String key, String token, String questionId, String examRecordId)
-            throws Exception;
+    Result getExamRecordPaperQuestionDetail(String key, String token, String questionId, String examRecordId) throws Exception;
 
     /**
      * 保存或更新考生作答的某个试题答案
@@ -149,8 +135,7 @@ public interface CoreOeService {
      * @return
      * @throws Exception
      */
-    Result updateExamRecordPaperQuestionAnswer(String key, String token, Integer order, String studentAnswer)
-            throws Exception;
+    Result updateExamRecordPaperQuestionAnswer(String key, String token, Integer order, String studentAnswer) throws Exception;
 
     /**
      * 当前练习的交卷
@@ -192,7 +177,7 @@ public interface CoreOeService {
      * @return
      * @throws Exception
      */
-    Result getExamRecordTotalInfo(String key, String token, String examRecordId, String fromCache) throws Exception;
+    Result getExamRecordTotalInfo(String key, String token, String examRecordId) throws Exception;
 
     /**
      * 获取作答的题列表
@@ -226,8 +211,7 @@ public interface CoreOeService {
      * @return
      * @throws Exception
      */
-    Result updateExamRecordQuestionAudioPlayTimes(String key, String token, String questionId, String mediaName)
-            throws Exception;
+    Result updateExamRecordQuestionAudioPlayTimes(String key, String token, String questionId, String mediaName) throws Exception;
 
     /**
      * 练习记录配置信息
@@ -238,7 +222,7 @@ public interface CoreOeService {
      * @return
      * @throws Exception
      */
-    Result findExamRecordDataEntity(String key, String token, Long examRecordDataId, String fromCache) throws Exception;
+    Result findExamRecordDataEntity(String key, String token, Long examRecordDataId) throws Exception;
 
     /**
      * 练习记录试题列表
@@ -249,61 +233,6 @@ public interface CoreOeService {
      * @return
      * @throws Exception
      */
-    Result getExamRecordQuestions(String key, String token, Long examRecordDataId, String fromCache) throws Exception;
-
-    /**
-     * 查询考生的考试批次属性集
-     * 
-     * @param key
-     * @param token
-     * @param examId
-     * @param keys
-     * @return
-     * @throws Exception
-     */
-    Result getExamPropertyFromCacheByStudentSession(String key, String token, Long examId, String keys)
-            throws Exception;
-
-    /**
-     * 根据Id获取试卷
-     * 
-     * @param key
-     * @param token
-     * @param paperId
-     * @return
-     */
-    Result getPaperById(String key, String token, String paperId) throws Exception;
-
-    /**获取文件上传签名
-     * @param key
-     * @param token
-     * @param req
-     * @return
-     * @throws Exception
-     */
-    Result getYunSignature(String key, String token, GetYunSignatureReq req) throws Exception;
-
-    /**获取在线考试待考列表
-     * @param key
-     * @param token
-     * @return
-     */
-    Result queryExamList(String key, String token) throws Exception;
-
-    /**获取考试记录信息
-     * @param key
-     * @param token
-     * @param examRecordDataId
-     * @return
-     */
-    Result getEndExamInfo(String key, String token, Long examRecordDataId) throws Exception;
-
-    /**根据examStudentId获取客观分信息
-     * @param key
-     * @param token
-     * @param examStudentId
-     * @return
-     */
-    Result queryObjectiveScoreList(String key, String token, Long examStudentId) throws Exception;
+    Result getExamRecordQuestions(String key, String token, Long examRecordDataId) throws Exception;
 
 }

src/main/java/cn/com/qmth/examcloud/app/service/impl/CoreOeServiceImpl.java

@@ -12,17 +12,14 @@ import cn.com.qmth.examcloud.app.core.utils.DateUtils;
 import cn.com.qmth.examcloud.app.core.utils.HttpUtils;
 import cn.com.qmth.examcloud.app.core.utils.JsonMapper;
 import cn.com.qmth.examcloud.app.model.Constants;
-import cn.com.qmth.examcloud.app.model.GetYunSignatureReq;
 import cn.com.qmth.examcloud.app.model.Result;
 import cn.com.qmth.examcloud.app.service.CoreOeService;
 import cn.com.qmth.examcloud.app.core.SysProperty;
 import okhttp3.FormBody;
-import okhttp3.FormBody.Builder;
 import okhttp3.MediaType;
 import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
 import org.apache.commons.io.FilenameUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -64,14 +61,14 @@ public class CoreOeServiceImpl implements CoreOeService {
     @Override
     public Result getOfflineExamCourseList(String key, String token) throws Exception {
         //封装请求参数									
-        final String requestUrl = String.format("%s/api/ecs_oe_admin/offlineExam/getOfflineCourse", sysProperty.getCoreOeAdminUrl());
+        final String requestUrl = String.format("%s/api/ecs_oe_student/offlineExam/getOfflineCourse", sysProperty.getCoreOeStudentUrl());
         return HttpUtils.doGet(requestUrl, key, token);
     }
 
     @Override
     public Result startOfflineExamRecord(String key, String token, String examStudentId) throws Exception {
         //封装请求参数									
-        final String requestUrl = String.format("%s/api/ecs_oe_admin/offlineExam/startOfflineExam?examStudentId=%s", sysProperty.getCoreOeAdminUrl(), examStudentId);
+        final String requestUrl = String.format("%s/api/ecs_oe_student/offlineExam/startOfflineExam?examStudentId=%s", sysProperty.getCoreOeStudentUrl(), examStudentId);
         return HttpUtils.doGet(requestUrl, key, token);
     }
 
@@ -87,7 +84,7 @@ public class CoreOeServiceImpl implements CoreOeService {
             throw new ApiException("File must be not empty.");
         }
         //封装请求参数									
-        final String requestUrl = String.format("%s/api/ecs_oe_admin/offlineExam/submitPaper?examRecordDataId=%s", sysProperty.getCoreOeAdminUrl(), examRecordId);
+        final String requestUrl = String.format("%s/api/ecs_oe_student/offlineExam/submitPaper?examRecordDataId=%s", sysProperty.getCoreOeStudentUrl(), examRecordId);
         MultipartBody.Builder form = new MultipartBody.Builder().setType(MultipartBody.FORM);
         RequestBody body = RequestBody.create(MediaType.parse("application/octet-stream"), fileBytes);
         form.addFormDataPart("file", fileName, body);
@@ -99,7 +96,7 @@ public class CoreOeServiceImpl implements CoreOeService {
     @Override
     public Result getPracticeExamCourseList(String key, String token, String examId) throws Exception {
         //封装请求参数
-        final String requestUrl = String.format("%s/api/ecs_oe_admin/practice/queryPracticeCourseList?examId=%s", sysProperty.getCoreOeAdminUrl(), examId);
+        final String requestUrl = String.format("%s/api/ecs_oe_student/practice/queryPracticeCourseList?examId=%s", sysProperty.getCoreOeStudentUrl(), examId);
         return HttpUtils.doGet(requestUrl, key, token);
     }
 
@@ -118,20 +115,9 @@ public class CoreOeServiceImpl implements CoreOeService {
     }
 
     @Override
-    public Result getAdminExamPaperStructList(String key, String token, String examRecordId,String fromCache) throws Exception {
+    public Result getExamRecordPaperStructList(String key, String token, String examRecordId) throws Exception {
         //封装请求参数
-        String requestUrl=null;
-        if("1".equals(fromCache)) {
-            requestUrl = String.format("%s/api/ecs_oe_admin/examRecordPaperStruct/getExamRecordPaperStruct?fromCache=1&examRecordDataId=%s", sysProperty.getCoreOeAdminUrl(), examRecordId);
-        }else {
-            requestUrl = String.format("%s/api/ecs_oe_admin/examRecordPaperStruct/getExamRecordPaperStruct?examRecordDataId=%s", sysProperty.getCoreOeAdminUrl(), examRecordId);
-        }
-        return HttpUtils.doGet(requestUrl, key, token);
-    }
-    @Override
-    public Result getStudentExamPaperStructList(String key, String token, String examRecordId) throws Exception {
-        //封装请求参数
-        String requestUrl = String.format("%s/api/ecs_oe_student/examRecordPaperStruct/getExamRecordPaperStruct?fromCache=1&examRecordDataId=%s", sysProperty.getCoreOeStudentUrl(), examRecordId);
+        final String requestUrl = String.format("%s/api/ecs_oe_student/examRecordPaperStruct/getExamRecordPaperStruct?examRecordDataId=%s", sysProperty.getCoreOeStudentUrl(), examRecordId);
         return HttpUtils.doGet(requestUrl, key, token);
     }
 
@@ -180,19 +166,14 @@ public class CoreOeServiceImpl implements CoreOeService {
     @Override
     public Result getExamRecordPracticeHistoryList(String key, String token, String examStudentId) throws Exception {
         //封装请求参数
-        final String requestUrl = String.format("%s/api/ecs_oe_admin/practice/queryPracticeRecordList?examStudentId=%s", sysProperty.getCoreOeAdminUrl(), examStudentId);
+        final String requestUrl = String.format("%s/api/ecs_oe_student/practice/queryPracticeRecordList?examStudentId=%s", sysProperty.getCoreOeStudentUrl(), examStudentId);
         return HttpUtils.doGet(requestUrl, key, token);
     }
 
     @Override
-    public Result getExamRecordTotalInfo(String key, String token, String examRecordId,String fromCache) throws Exception {
+    public Result getExamRecordTotalInfo(String key, String token, String examRecordId) throws Exception {
         //封装请求参数
-        String requestUrl=null;
-        if("1".equals(fromCache)) {
-            requestUrl = String.format("%s/api/ecs_oe_admin/practice/getPracticeDetailInfo?fromCache=1&examRecordDataId=%s", sysProperty.getCoreOeAdminUrl(), examRecordId);
-        }else {
-            requestUrl = String.format("%s/api/ecs_oe_admin/practice/getPracticeDetailInfo?examRecordDataId=%s", sysProperty.getCoreOeAdminUrl(), examRecordId);
-        }
+        final String requestUrl = String.format("%s/api/ecs_oe_student/practice/getPracticeDetailInfo?examRecordDataId=%s", sysProperty.getCoreOeStudentUrl(), examRecordId);
         return HttpUtils.doGet(requestUrl, key, token);
     }
 
@@ -222,14 +203,9 @@ public class CoreOeServiceImpl implements CoreOeService {
     }
 
     @Override
-    public Result findExamRecordDataEntity(String key, String token, Long examRecordDataId,String fromCache) throws Exception {
+    public Result findExamRecordDataEntity(String key, String token, Long examRecordDataId) throws Exception {
         //封装请求参数
-        String requestUrl=null;
-        if("1".equals(fromCache)) {
-            requestUrl = String.format("%s/api/ecs_oe_admin/exam/record/data/findExamRecordDataEntity?fromCache=1&examRecordDataId=%s", sysProperty.getCoreOeAdminUrl(), examRecordDataId);
-        }else {
-            requestUrl = String.format("%s/api/ecs_oe_admin/exam/record/data/findExamRecordDataEntity?examRecordDataId=%s", sysProperty.getCoreOeAdminUrl(), examRecordDataId);
-        }
+        final String requestUrl = String.format("%s/api/ecs_oe_admin/exam/record/data/findExamRecordDataEntity?examRecordDataId=%s", sysProperty.getCoreOeAdminUrl(), examRecordDataId);
         Result<String> result = HttpUtils.doGet(requestUrl, key, token);
         if (result.isSuccess()) {
             //过滤掉为空的属性
@@ -239,14 +215,9 @@ public class CoreOeServiceImpl implements CoreOeService {
     }
 
     @Override
-    public Result getExamRecordQuestions(String key, String token, Long examRecordDataId,String fromCache) throws Exception {
+    public Result getExamRecordQuestions(String key, String token, Long examRecordDataId) throws Exception {
         //封装请求参数
-        String requestUrl=null;
-        if("1".equals(fromCache)) {
-            requestUrl = String.format("%s/api/ecs_oe_admin/examRecordQuestions/getExamRecordQuestions?fromCache=1&examRecordDataId=%s", sysProperty.getCoreOeAdminUrl(), examRecordDataId);
-        }else {
-            requestUrl = String.format("%s/api/ecs_oe_admin/examRecordQuestions/getExamRecordQuestions?examRecordDataId=%s", sysProperty.getCoreOeAdminUrl(), examRecordDataId);
-        }
+        final String requestUrl = String.format("%s/api/ecs_oe_admin/examRecordQuestions/getExamRecordQuestions?examRecordDataId=%s", sysProperty.getCoreOeAdminUrl(), examRecordDataId);
         Result<String> result = HttpUtils.doGet(requestUrl, key, token);
         if (result.isSuccess()) {
             //过滤掉为空的属性
@@ -255,54 +226,4 @@ public class CoreOeServiceImpl implements CoreOeService {
         return result;
     }
 
-    @Override
-    public Result getExamPropertyFromCacheByStudentSession(String key, String token,Long examId,String keys) throws Exception {
-        //封装请求参数
-        final String requestUrl = String.format("%s/api/ecs_exam_work/exam/getExamPropertyFromCacheByStudentSession/"+examId+"/"+keys, sysProperty.getCoreExamWorkUrl());
-        Result<String> result = HttpUtils.doGet(requestUrl, key, token);
-        return result;
-    }
-
-    @Override
-    public Result getPaperById(String key, String token, String paperId) throws Exception {
-        final String requestUrl = String.format("%s/api/ecs_ques/paper/"+paperId, sysProperty.getCoreQuestionUrl());
-        Result<String> result = HttpUtils.doGet(requestUrl, key, token);
-        return result;
-    }
-    
-    @Override
-    public Result getYunSignature(String key, String token, GetYunSignatureReq req) throws Exception {
-        //封装请求参数
-        final String requestUrl = String.format("%s/api/ecs_oe_student/examControl/yunSignature", sysProperty.getCoreOeStudentUrl());
-        Builder b= new FormBody.Builder()
-                .add("examRecordDataId", req.getExamRecordDataId())
-                .add("order", req.getOrder())
-                .add("fileMd5", req.getFileMd5())
-                .add("fileSuffix", req.getFileSuffix());
-        if(StringUtils.isNotBlank(req.getExt())) {
-                b.add("ext", req.getExt());
-        }
-        RequestBody formBody =b.build();
-                 
-        return HttpUtils.doPost(requestUrl, formBody, key, token);
-    }
-
-    @Override
-    public Result queryExamList(String key, String token) throws Exception {
-        final String requestUrl = String.format("%s/api/ecs_oe_admin/examControl/queryExamList", sysProperty.getCoreOeAdminUrl());
-        return HttpUtils.doGet(requestUrl, key, token);
-    }
-
-    @Override
-    public Result getEndExamInfo(String key, String token, Long examRecordDataId) throws Exception {
-        final String requestUrl = String.format("%s/api/ecs_oe_student/examControl/getEndExamInfo?examRecordDataId="+examRecordDataId, sysProperty.getCoreOeStudentUrl());
-        return HttpUtils.doGet(requestUrl, key, token);
-    }
-
-    @Override
-    public Result queryObjectiveScoreList(String key, String token, Long examStudentId) throws Exception {
-        final String requestUrl = String.format("%s/api/ecs_oe_admin/exam/score/queryObjectiveScoreList?examStudentId="+examStudentId, sysProperty.getCoreOeAdminUrl());
-        return HttpUtils.doGet(requestUrl, key, token);
-    }
-
 }