From d823860098f54886d416c41755634c1c5a45b6e1 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期一, 08 七月 2024 09:44:16 +0800 Subject: [PATCH] 填空题答案bug --- src/main/resources/mapper/ExamPaperMapper.xml | 2 +- src/main/java/com/ycl/jxkg/job/StudyRecordJob.java | 2 +- src/main/resources/mapper/ExamMapper.xml | 2 +- src/main/java/com/ycl/jxkg/domain/vo/admin/exam/ExamPaperPageRequestVO.java | 2 ++ src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java | 36 ++++++++++++++++++------------------ src/main/resources/application-prod.yml | 6 +++--- src/main/resources/application.yml | 2 +- src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java | 2 +- 8 files changed, 28 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/ycl/jxkg/domain/vo/admin/exam/ExamPaperPageRequestVO.java b/src/main/java/com/ycl/jxkg/domain/vo/admin/exam/ExamPaperPageRequestVO.java index 2e6bb05..8c893b7 100644 --- a/src/main/java/com/ycl/jxkg/domain/vo/admin/exam/ExamPaperPageRequestVO.java +++ b/src/main/java/com/ycl/jxkg/domain/vo/admin/exam/ExamPaperPageRequestVO.java @@ -19,4 +19,6 @@ private BigDecimal score; + private Integer createUser; + } diff --git a/src/main/java/com/ycl/jxkg/job/StudyRecordJob.java b/src/main/java/com/ycl/jxkg/job/StudyRecordJob.java index 043daf9..36eda18 100644 --- a/src/main/java/com/ycl/jxkg/job/StudyRecordJob.java +++ b/src/main/java/com/ycl/jxkg/job/StudyRecordJob.java @@ -32,7 +32,7 @@ private final StudyRecordMapper studyRecordMapper; private final StudyRecordService studyRecordService; - @Scheduled(fixedRate = 120000) // 2鍒嗛挓鎵ц涓�娆� + @Scheduled(fixedRate = 1200000) // 2鍒嗛挓鎵ц涓�娆� private void updateStudyRecord() { log.info("寮�濮嬪瓨瀛︿範鏃堕暱"); List<StudyRecord> cacheList = new ArrayList<>(); diff --git a/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java index f641b8e..4e85c14 100644 --- a/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java +++ b/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java @@ -185,7 +185,7 @@ @Override public PageInfo<ExamResponseVO> page(ExamPaperPageRequestVO requestVM) { - //TODO: 鏁版嵁鏉冮檺 + requestVM.setCreateUser(webContext.getCurrentUser().getId()); PageInfo<ExamPaper> page = PageHelper.startPage(requestVM.getPageIndex(), requestVM.getPageSize(), "id desc").doSelectPageInfo(() -> examPaperMapper.page(requestVM)); PageInfo<ExamResponseVO> pageVO = PageInfoHelper.copyMap(page, e -> { diff --git a/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java index c4c8bfa..87992df 100644 --- a/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java +++ b/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java @@ -373,6 +373,24 @@ doQuestionVO.setQuestionType(item.getQuestionType()); //澧炲姞棰樼洰鍒嗘暟 doQuestionVO.setQuestionScore(question.getScore()); + + // 棰樼洰鍓湰 + QuestionAnswerCopyVO copy = new QuestionAnswerCopyVO(); + copy.setId(question.getId()); + copy.setAnalyze(question.getAnalyze()); + copy.setDifficult(question.getDifficult()); + //濉┖鐨勭瓟妗堝湪Json閲� + if (QuestionTypeEnum.GapFilling.getCode().equals(item.getQuestionType())) { + List<String> gapAnswer = new ArrayList<>(); + for (QuestionItemObject questionItemObject : question.getItems()) { + gapAnswer.add(questionItemObject.getContent()); + } + copy.setCorrect(String.join(ANSWER_SPLIT, gapAnswer)); + } else { + copy.setCorrect(question.getCorrect()); + } + questionAnswerCopyVOList.add(copy); + // 濉┖棰橀渶瑕佹姽闄ontent(鍥犱负鏄瓟妗�) if (QuestionTypeEnum.GapFilling.getCode().equals(doQuestionVO.getQuestionType())) { question.getItems().stream().forEach(option -> { @@ -383,24 +401,6 @@ doQuestionVO.setId(question.getId()); doQuestionVO.setOriginalFile(question.getOriginalFile()); doQuestionVO.setAudioFile(question.getAudioFile()); - - // 棰樼洰鍓湰 - QuestionAnswerCopyVO copy = new QuestionAnswerCopyVO(); - copy.setId(question.getId()); - copy.setAnalyze(question.getAnalyze()); - copy.setDifficult(question.getDifficult()); - //濉┖鐨勭瓟妗堝湪Json閲� - if (QuestionTypeEnum.GapFilling.getCode().equals(item.getQuestionType())) { - List<String> gapAnswer = new ArrayList<>(); - for (QuestionItemObject questionItemObject : doQuestionVO.getQuestionItemList()) { - gapAnswer.add(questionItemObject.getContent()); - } - copy.setCorrect(String.join(ANSWER_SPLIT, gapAnswer)); - } else { - copy.setCorrect(question.getCorrect()); - } - questionAnswerCopyVOList.add(copy); - return doQuestionVO; }).collect(Collectors.toList()); if (ExamPaperTypeEnum.RandomOrder.getCode().equals(examPaper.getPaperType())) { diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index a342da9..9d725da 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -3,13 +3,13 @@ upload: # 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛� - url: /usr/local/file + url: E:/ycl/file spring: datasource: - url: jdbc:mysql://localhost:3306/xzs?useSSL=true&useUnicode=true&serverTimezone=GMT%2B8&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&allowMultiQueries=true + url: jdbc:mysql://42.193.1.25:3306/xzs?useSSL=true&useUnicode=true&serverTimezone=GMT%2B8&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&allowMultiQueries=true username: root - password: 123456 + password: 321$YcYl@1970! driver-class-name: com.mysql.cj.jdbc.Driver rabbitmq: host: 101.35.247.188 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 0463e0e..ac1a3c4 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -80,4 +80,4 @@ #runningtime environment profiles: - active: dev + active: prod diff --git a/src/main/resources/mapper/ExamMapper.xml b/src/main/resources/mapper/ExamMapper.xml index 7a3a092..543b5cd 100644 --- a/src/main/resources/mapper/ExamMapper.xml +++ b/src/main/resources/mapper/ExamMapper.xml @@ -98,7 +98,7 @@ INNER JOIN t_exam_paper TEP ON TEP.id = TE.exam_paper_id AND TEP.deleted = 0 LEFT JOIN t_exam_submit_temp TEST ON TEST.exam_id = TE.id WHERE - TE.deleted = 0 and TEST.deleted !=1 + TE.deleted = 0 and (TEST.deleted =0 or TEST.deleted is null) <if test="query.examName != null and query.examName != ''"> AND TE.exam_name like concat('%', #{query.examName}, '%') </if> diff --git a/src/main/resources/mapper/ExamPaperMapper.xml b/src/main/resources/mapper/ExamPaperMapper.xml index b51b22c..b7c419a 100644 --- a/src/main/resources/mapper/ExamPaperMapper.xml +++ b/src/main/resources/mapper/ExamPaperMapper.xml @@ -34,7 +34,7 @@ tep.* FROM t_exam_paper tep <where> - and tep.deleted=0 + and tep.deleted=0 and (create_user = #{createUser} or visibility = 'Public') <if test="id != null "> and tep.id= #{id} </if> -- Gitblit v1.8.0