From a0877d9c0e2cf8678c025ecd88a5045d6e581e56 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 29 十月 2024 14:19:31 +0800
Subject: [PATCH] 试卷标题不能为空
---
src/docker/Dockerfile | 4 ++--
src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java | 1 -
src/main/resources/application-dev.yml | 1 +
src/main/resources/application-prod.yml | 1 +
src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java | 15 ++++++++++++++-
5 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/docker/Dockerfile b/src/docker/Dockerfile
index 739e440..b19f643 100644
--- a/src/docker/Dockerfile
+++ b/src/docker/Dockerfile
@@ -10,10 +10,10 @@
COPY simsun.ttc /usr/share/fonts/
# easyExcel瀛椾綋
RUN apk add fontconfig && apk add --update ttf-dejavu && fc-cache --force
-# 鍚屾docker鍐呴儴鐨勬椂闂�
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
# 璁剧疆鏃跺尯
ENV TZ=Asia/Shanghai
+# 鍚屾docker鍐呴儴鐨勬椂闂�
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
EXPOSE 8000
# 澶嶅埗jar鍖呭埌/user/local/java涓�
ARG JAR_FILE
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 db198fe..07bf709 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ExamPaperServiceImpl.java
@@ -46,6 +46,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
@@ -74,9 +75,12 @@
examPaper.setScore(new BigDecimal(form.getScore()));
//闅忔満璇曞嵎
if (ExamPaperTypeEnum.Random.getCode().equals(form.getPaperType())) {
- //鏍￠獙棰樼洰鏁伴噺
+ //鏍￠獙鏍囬鏄惁濉啓銆佹牎楠岄鐩暟閲�
List<PaperQuestionSettingDTO> questionSetting = form.getQuestionSetting();
for (PaperQuestionSettingDTO settingDTO : questionSetting) {
+ if(StringUtils.isEmpty(settingDTO.getTitle())){
+ return Result.fail(SystemCode.InnerError.getCode(),"鏍囬涓嶈兘涓虹┖");
+ }
Integer questionType = settingDTO.getQuestionType();
for (PaperSettingItem item : settingDTO.getSettingList()) {
Integer num = item.getNum();
@@ -100,6 +104,12 @@
return Result.ok();
} else if (ExamPaperTypeEnum.Fixed.getCode().equals(form.getPaperType())) {
//鍥哄畾璇曞嵎
+ List<PaperFixQuestionDTO> questionTitleList = form.getQuestionTitleList();
+ for (PaperFixQuestionDTO dto : questionTitleList) {
+ if(StringUtils.isEmpty(dto.getTitle())){
+ return Result.fail(SystemCode.InnerError.getCode(),"鏍囬涓嶈兘涓虹┖");
+ }
+ }
examPaper.setContent(JSON.toJSONString(form.getQuestionTitleList()));
baseMapper.insert(examPaper);
return Result.ok();
@@ -116,6 +126,9 @@
List<PaperSettingItem> settingList = settingDTO.getSettingList();
List<PaperQuestion> questionList = new ArrayList<>();
for (PaperSettingItem item : settingList) {
+ if(StringUtils.isEmpty(settingDTO.getTitle())){
+ return Result.fail(SystemCode.InnerError.getCode(),"鏍囬涓嶈兘涓虹┖");
+ }
Integer num = item.getNum();
Integer difficult = item.getDifficult();
//闇�瑕侀厤缃殑棰樼洰鏁伴噺涓�0鍒欒烦杩�
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 71ed6b3..c68c3e0 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
@@ -382,7 +382,6 @@
doQuestionVO.setQuestionType(item.getQuestionType());
//澧炲姞棰樼洰鍒嗘暟
doQuestionVO.setQuestionScore(question.getScore());
-
// 棰樼洰鍓湰
QuestionAnswerCopyVO copy = new QuestionAnswerCopyVO();
copy.setId(question.getId());
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index aa4e6d9..9146cc8 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -8,6 +8,7 @@
spring:
config:
+ # 鏁欏璧勬簮璁块棶璺緞
url: http://localhost:8000
datasource:
url: jdbc:mysql://42.193.1.25:3306/xzs?useSSL=true&useUnicode=true&serverTimezone=GMT%2B8&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowPublicKeyRetrieval=true&allowMultiQueries=true
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 5669974..7d5a812 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -7,6 +7,7 @@
spring:
config:
+ # 鏁欏璧勬簮璁块棶璺緞
url: http://25.30.6.246:8000
datasource:
driver-class-name: dm.jdbc.driver.DmDriver
--
Gitblit v1.8.0