|
@@ -7,12 +7,7 @@ import com.nuliji.tools.Transform;
|
|
|
import com.nuliji.tools.exception.AuthException;
|
|
|
import com.qxgmat.data.constants.enums.SettingKey;
|
|
|
import com.qxgmat.data.constants.enums.logic.SentenceLogic;
|
|
|
-import com.qxgmat.data.constants.enums.module.PaperModule;
|
|
|
-import com.qxgmat.data.constants.enums.module.PaperOrigin;
|
|
|
import com.qxgmat.data.dao.entity.*;
|
|
|
-import com.qxgmat.data.relation.entity.UserReportRelation;
|
|
|
-import com.qxgmat.dto.extend.QuestionExtendDto;
|
|
|
-import com.qxgmat.dto.extend.SentenceQuestionBaseExtendDto;
|
|
|
import com.qxgmat.dto.request.*;
|
|
|
import com.qxgmat.dto.response.*;
|
|
|
import com.qxgmat.help.ShiroHelp;
|
|
@@ -74,7 +69,7 @@ public class SentenceController
|
|
|
|
|
|
@RequestMapping(value = "/info", method = RequestMethod.GET)
|
|
|
@ApiOperation(value = "所有长难句信息", httpMethod = "GET")
|
|
|
- public Response<JSONObject> sentenceInfo(HttpSession session) {
|
|
|
+ public Response<JSONObject> info(HttpSession session) {
|
|
|
Setting entity = settingService.getByKey(SettingKey.SENTENCE);
|
|
|
JSONObject value = entity.getValue();
|
|
|
|
|
@@ -138,6 +133,25 @@ public class SentenceController
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ @RequestMapping(value = "/article/detail", method = RequestMethod.PUT)
|
|
|
+ @ApiOperation(value = "长难句文章详情", httpMethod = "PUT")
|
|
|
+ public Response<UserSentenceArticleDetailDto> detailArticle(
|
|
|
+ @RequestParam(required = true, name="id") Integer articleId
|
|
|
+ ) {
|
|
|
+ User user = (User) shiroHelp.getLoginUser();
|
|
|
+ if (user == null) throw new AuthException("需要登录");
|
|
|
+
|
|
|
+ SentenceArticle article = sentenceArticleService.get(articleId);
|
|
|
+ // 查询文章进度
|
|
|
+ UserSentenceProcess process = userSentenceProcessService.get(user.getId(), article.getChapter(), article.getPart());
|
|
|
+
|
|
|
+ UserSentenceArticleDetailDto dto = Transform.convert(article, UserSentenceArticleDetailDto.class);
|
|
|
+
|
|
|
+ dto.setProcess(process.getProcess());
|
|
|
+
|
|
|
+ return ResponseHelp.success(dto);
|
|
|
+ }
|
|
|
+
|
|
|
@RequestMapping(value = "/article/process", method = RequestMethod.PUT)
|
|
|
@ApiOperation(value = "更新长难句文章进度", httpMethod = "PUT")
|
|
|
public Response<Boolean> articleProcess(@RequestBody @Validated UserSentenceProcessDto dto) {
|
|
@@ -180,26 +194,6 @@ public class SentenceController
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- @RequestMapping(value = "/question/detail", method = RequestMethod.GET)
|
|
|
- @ApiOperation(value = "获取题目详情", notes = "获取题目详情", httpMethod = "GET")
|
|
|
- public Response<UserSentenceQuestionDetailDto> detailQuestion(
|
|
|
- @RequestParam(required = true) Integer userQuestionId,
|
|
|
- @RequestParam(required = true) Integer userReportId,
|
|
|
- @RequestParam(required = true) Integer no
|
|
|
- ) {
|
|
|
- User user = (User) shiroHelp.getLoginUser();
|
|
|
- if (userQuestionId != null && userQuestionId > 0){
|
|
|
-
|
|
|
- }else if(userReportId != null && userReportId > 0){
|
|
|
- if (no == null || no == 0){
|
|
|
- no = 1;
|
|
|
- }
|
|
|
- // 根据题目序号获取
|
|
|
- }
|
|
|
-
|
|
|
- return ResponseHelp.success(null);
|
|
|
- }
|
|
|
-
|
|
|
@RequestMapping(value = "/paper", method = RequestMethod.GET)
|
|
|
@ApiOperation(value = "获取练习卷", notes = "获取练习卷", httpMethod = "GET")
|
|
|
public Response<PaperBaseDto> detailPaper(
|
|
@@ -212,105 +206,105 @@ public class SentenceController
|
|
|
|
|
|
return ResponseHelp.success(paperDto);
|
|
|
}
|
|
|
-
|
|
|
- @RequestMapping(value = "/report/detail", method = RequestMethod.GET)
|
|
|
- @ApiOperation(value = "获取详细记录", notes = "获取报告", httpMethod = "GET")
|
|
|
- public Response<UserReportDetailDto> detailReport(
|
|
|
- @RequestParam(required = true, name="id") Integer userReportId
|
|
|
- ) {
|
|
|
- User user = (User) shiroHelp.getLoginUser();
|
|
|
- UserReportRelation report = questionFlowService.baseReport(user.getId(), userReportId);
|
|
|
-
|
|
|
- UserReportDetailDto userReportDto = Transform.convert(report, UserReportDetailDto.class);
|
|
|
-
|
|
|
- // todo 绑定数据
|
|
|
-
|
|
|
- return ResponseHelp.success(userReportDto);
|
|
|
- }
|
|
|
-
|
|
|
- @RequestMapping(value = "/report/question", method = RequestMethod.GET)
|
|
|
- @ApiOperation(value = "获取练习做题记录", notes = "获取报告题目", httpMethod = "GET")
|
|
|
- public Response<List<UserSentenceQuestionDetailDto>> detailReportQuestion(
|
|
|
- @RequestParam(required = true, name="id") Integer userReportId
|
|
|
- ) {
|
|
|
- User user = (User) shiroHelp.getLoginUser();
|
|
|
- List<UserQuestion> userQuestionList = questionFlowService.listByReport(user.getId(), userReportId);
|
|
|
-
|
|
|
- List<UserSentenceQuestionDetailDto> userQuestionDetailDtos = Transform.convert(userQuestionList, UserSentenceQuestionDetailDto.class);
|
|
|
-
|
|
|
- // todo 绑定数据
|
|
|
-
|
|
|
- return ResponseHelp.success(userQuestionDetailDtos);
|
|
|
- }
|
|
|
-
|
|
|
- @RequestMapping(value = "/start", method = RequestMethod.POST)
|
|
|
- @ApiOperation(value = "开始做题", notes = "提交考试设置", httpMethod = "POST")
|
|
|
- public Response<UserReportBaseDto> start(@RequestBody @Validated SentenceStartDto dto) {
|
|
|
- User user = (User) shiroHelp.getLoginUser();
|
|
|
- JSONObject setting = new JSONObject();
|
|
|
- UserReportRelation report = questionFlowService.start(user.getId(), PaperOrigin.SENTENCE, dto.getPaperId(), setting);
|
|
|
-
|
|
|
- UserReportBaseDto userReportBaseDto = Transform.convert(report, UserReportBaseDto.class);
|
|
|
-
|
|
|
- return ResponseHelp.success(userReportBaseDto);
|
|
|
- }
|
|
|
-
|
|
|
- @RequestMapping(value = "/continue", method = RequestMethod.POST)
|
|
|
- @ApiOperation(value = "继续做题", notes = "获取报告信息", httpMethod = "POST")
|
|
|
- public Response<UserReportBaseDto> continueReport(@RequestBody @Validated ReportContinueDto dto) {
|
|
|
- User user = (User) shiroHelp.getLoginUser();
|
|
|
- UserReportRelation report = questionFlowService.continueReport(user.getId(), dto.getUserReportId());
|
|
|
-
|
|
|
- UserReportBaseDto userReportBaseDto = Transform.convert(report, UserReportBaseDto.class);
|
|
|
-
|
|
|
- return ResponseHelp.success(userReportBaseDto);
|
|
|
- }
|
|
|
-
|
|
|
- @RequestMapping(value = "/next", method = RequestMethod.POST)
|
|
|
- @ApiOperation(value = "获取下一题", notes = "获取下一题", httpMethod = "POST")
|
|
|
- public Response<UserSentenceQuestionBaseDto> next(@RequestBody @Validated ReportNextDto dto) {
|
|
|
- User user = (User) shiroHelp.getLoginUser();
|
|
|
-
|
|
|
- UserQuestion userQuestion = questionFlowService.next(user.getId(), dto.getUserReportId());
|
|
|
-
|
|
|
- UserSentenceQuestionBaseDto baseDto = Transform.convert(userQuestion, UserSentenceQuestionBaseDto.class);
|
|
|
-
|
|
|
- // 绑定question
|
|
|
- baseDto.setQuestion(Transform.convert(questionService.get(userQuestion.getQuestionId()), QuestionExtendDto.class));
|
|
|
-
|
|
|
- // 绑定sentenceQuestion
|
|
|
- baseDto.setSentence(Transform.convert(sentenceQuestionService.get(userQuestion.getQuestionNoId()), SentenceQuestionBaseExtendDto.class));
|
|
|
-
|
|
|
- // 绑定collect
|
|
|
- baseDto.setCollect(userCollectQuestionService.getByUserAndQuestion(user.getId(), userQuestion.getQuestionId()) != null);
|
|
|
-
|
|
|
- return ResponseHelp.success(null);
|
|
|
- }
|
|
|
-
|
|
|
- @RequestMapping(value = "/submit", method = RequestMethod.POST)
|
|
|
- @ApiOperation(value = "提交题目答案", notes = "提交题目", httpMethod = "POST")
|
|
|
- public Response<Boolean> submit(@RequestBody @Validated QuestionSubmitDto dto) {
|
|
|
- User user = (User) shiroHelp.getLoginUser();
|
|
|
- Boolean result = questionFlowService.submit(user.getId(), dto.getUserQuestionId(), dto.getTime(), dto.getAnswer(), dto.getSetting());
|
|
|
- return ResponseHelp.success(result);
|
|
|
- }
|
|
|
-
|
|
|
- @RequestMapping(value = "/finish", method = RequestMethod.POST)
|
|
|
- @ApiOperation(value = "完成考试", notes = "完成考试", httpMethod = "POST")
|
|
|
- public Response<Boolean> finish(@RequestBody @Validated ReportFinishDto dto) {
|
|
|
- User user = (User) shiroHelp.getLoginUser();
|
|
|
-
|
|
|
- Boolean result = questionFlowService.finish(user.getId(), dto.getUserReportId());
|
|
|
- return ResponseHelp.success(result);
|
|
|
- }
|
|
|
-
|
|
|
- @RequestMapping(value = "/restart", method = RequestMethod.POST)
|
|
|
- @ApiOperation(value = "重置考试", notes = "重置考试", httpMethod = "POST")
|
|
|
- public Response<Boolean> restart(@RequestBody @Validated PaperRestartDto dto) {
|
|
|
- User user = (User) shiroHelp.getLoginUser();
|
|
|
-
|
|
|
- questionFlowService.restart(dto.getUserPaperId(), user.getId());
|
|
|
-
|
|
|
- return ResponseHelp.success(true);
|
|
|
- }
|
|
|
+//
|
|
|
+// @RequestMapping(value = "/report/detail", method = RequestMethod.GET)
|
|
|
+// @ApiOperation(value = "获取详细记录", notes = "获取报告", httpMethod = "GET")
|
|
|
+// public Response<UserReportDetailDto> detailReport(
|
|
|
+// @RequestParam(required = true, name="id") Integer userReportId
|
|
|
+// ) {
|
|
|
+// User user = (User) shiroHelp.getLoginUser();
|
|
|
+// UserReportRelation report = questionFlowService.baseReport(user.getId(), userReportId);
|
|
|
+//
|
|
|
+// UserReportDetailDto userReportDto = Transform.convert(report, UserReportDetailDto.class);
|
|
|
+//
|
|
|
+// // todo 绑定数据
|
|
|
+//
|
|
|
+// return ResponseHelp.success(userReportDto);
|
|
|
+// }
|
|
|
+//
|
|
|
+// @RequestMapping(value = "/report/question", method = RequestMethod.GET)
|
|
|
+// @ApiOperation(value = "获取做题记录", notes = "获取报告题目", httpMethod = "GET")
|
|
|
+// public Response<List<UserSentenceQuestionDetailDto>> detailReportQuestion(
|
|
|
+// @RequestParam(required = true, name="id") Integer userReportId
|
|
|
+// ) {
|
|
|
+// User user = (User) shiroHelp.getLoginUser();
|
|
|
+// List<UserQuestion> userQuestionList = questionFlowService.listByReport(user.getId(), userReportId);
|
|
|
+//
|
|
|
+// List<UserSentenceQuestionDetailDto> userQuestionDetailDtos = Transform.convert(userQuestionList, UserSentenceQuestionDetailDto.class);
|
|
|
+//
|
|
|
+// // todo 绑定数据
|
|
|
+//
|
|
|
+// return ResponseHelp.success(userQuestionDetailDtos);
|
|
|
+// }
|
|
|
+//
|
|
|
+// @RequestMapping(value = "/start", method = RequestMethod.POST)
|
|
|
+// @ApiOperation(value = "开始做题", notes = "提交考试设置", httpMethod = "POST")
|
|
|
+// public Response<UserReportBaseDto> start(@RequestBody @Validated SentenceStartDto dto) {
|
|
|
+// User user = (User) shiroHelp.getLoginUser();
|
|
|
+// JSONObject setting = new JSONObject();
|
|
|
+// UserReportRelation report = questionFlowService.start(user.getId(), PaperOrigin.SENTENCE, dto.getPaperId(), setting);
|
|
|
+//
|
|
|
+// UserReportBaseDto userReportBaseDto = Transform.convert(report, UserReportBaseDto.class);
|
|
|
+//
|
|
|
+// return ResponseHelp.success(userReportBaseDto);
|
|
|
+// }
|
|
|
+//
|
|
|
+// @RequestMapping(value = "/continue", method = RequestMethod.POST)
|
|
|
+// @ApiOperation(value = "继续做题", notes = "获取报告信息", httpMethod = "POST")
|
|
|
+// public Response<UserReportBaseDto> continueReport(@RequestBody @Validated ReportContinueDto dto) {
|
|
|
+// User user = (User) shiroHelp.getLoginUser();
|
|
|
+// UserReportRelation report = questionFlowService.continueReport(user.getId(), dto.getUserReportId());
|
|
|
+//
|
|
|
+// UserReportBaseDto userReportBaseDto = Transform.convert(report, UserReportBaseDto.class);
|
|
|
+//
|
|
|
+// return ResponseHelp.success(userReportBaseDto);
|
|
|
+// }
|
|
|
+//
|
|
|
+// @RequestMapping(value = "/next", method = RequestMethod.POST)
|
|
|
+// @ApiOperation(value = "获取下一题", notes = "获取下一题", httpMethod = "POST")
|
|
|
+// public Response<UserSentenceQuestionBaseDto> next(@RequestBody @Validated ReportNextDto dto) {
|
|
|
+// User user = (User) shiroHelp.getLoginUser();
|
|
|
+//
|
|
|
+// UserQuestion userQuestion = questionFlowService.next(user.getId(), dto.getUserReportId());
|
|
|
+//
|
|
|
+// UserSentenceQuestionBaseDto baseDto = Transform.convert(userQuestion, UserSentenceQuestionBaseDto.class);
|
|
|
+//
|
|
|
+// // 绑定question
|
|
|
+// baseDto.setQuestion(Transform.convert(questionService.get(userQuestion.getQuestionId()), QuestionExtendDto.class));
|
|
|
+//
|
|
|
+// // 绑定sentenceQuestion
|
|
|
+// baseDto.setSentence(Transform.convert(sentenceQuestionService.get(userQuestion.getQuestionNoId()), SentenceQuestionBaseExtendDto.class));
|
|
|
+//
|
|
|
+// // 绑定collect
|
|
|
+// baseDto.setCollect(userCollectQuestionService.getByUserAndQuestion(user.getId(), userQuestion.getQuestionId()) != null);
|
|
|
+//
|
|
|
+// return ResponseHelp.success(null);
|
|
|
+// }
|
|
|
+//
|
|
|
+// @RequestMapping(value = "/submit", method = RequestMethod.POST)
|
|
|
+// @ApiOperation(value = "提交题目答案", notes = "提交题目", httpMethod = "POST")
|
|
|
+// public Response<Boolean> submit(@RequestBody @Validated QuestionSubmitDto dto) {
|
|
|
+// User user = (User) shiroHelp.getLoginUser();
|
|
|
+// Boolean result = questionFlowService.submit(user.getId(), dto.getUserQuestionId(), dto.getTime(), dto.getAnswer(), dto.getSetting());
|
|
|
+// return ResponseHelp.success(result);
|
|
|
+// }
|
|
|
+//
|
|
|
+// @RequestMapping(value = "/finish", method = RequestMethod.POST)
|
|
|
+// @ApiOperation(value = "完成考试", notes = "完成考试", httpMethod = "POST")
|
|
|
+// public Response<Boolean> finish(@RequestBody @Validated ReportFinishDto dto) {
|
|
|
+// User user = (User) shiroHelp.getLoginUser();
|
|
|
+//
|
|
|
+// Boolean result = questionFlowService.finish(user.getId(), dto.getUserReportId());
|
|
|
+// return ResponseHelp.success(result);
|
|
|
+// }
|
|
|
+//
|
|
|
+// @RequestMapping(value = "/restart", method = RequestMethod.POST)
|
|
|
+// @ApiOperation(value = "重置考试", notes = "重置考试", httpMethod = "POST")
|
|
|
+// public Response<Boolean> restart(@RequestBody @Validated PaperRestartDto dto) {
|
|
|
+// User user = (User) shiroHelp.getLoginUser();
|
|
|
+//
|
|
|
+// questionFlowService.restart(dto.getUserPaperId(), user.getId());
|
|
|
+//
|
|
|
+// return ResponseHelp.success(true);
|
|
|
+// }
|
|
|
}
|