From 77d7257c02fc811a53b8d9207e4239f69c8a600c Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 15 六月 2023 14:33:36 +0800
Subject: [PATCH] 题目和标签代码提交
---
smartor/src/main/java/com/smartor/service/impl/SvyLibTopicServiceImpl.java | 106 +++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 82 insertions(+), 24 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/service/impl/SvyLibTopicServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/SvyLibTopicServiceImpl.java
index 64d7f85..f0e7adc 100644
--- a/smartor/src/main/java/com/smartor/service/impl/SvyLibTopicServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/SvyLibTopicServiceImpl.java
@@ -2,13 +2,12 @@
import java.io.IOException;
import java.util.*;
+import java.util.stream.Collectors;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
-import com.smartor.domain.PatArchive;
-import com.smartor.domain.SvyLibTopicRes;
-import com.smartor.domain.SvyLibTopicoption;
+import com.smartor.domain.*;
import com.smartor.mapper.SvyLibTopicoptionMapper;
import org.apache.catalina.User;
import org.apache.commons.collections4.CollectionUtils;
@@ -20,7 +19,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.smartor.mapper.SvyLibTopicMapper;
-import com.smartor.domain.SvyLibTopic;
import com.smartor.service.ISvyLibTopicService;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
@@ -174,6 +172,18 @@
if (ObjectUtils.isNotEmpty(row.getCell(8))) {
svyLibTopicRes.setScore(row.getCell(8).toString());
}
+ if (ObjectUtils.isNotEmpty(row.getCell(9))) {
+ svyLibTopicRes.setScore(row.getCell(9).toString());
+ }
+ if (ObjectUtils.isNotEmpty(row.getCell(10))) {
+ svyLibTopicRes.setScore(row.getCell(10).toString());
+ }
+ if (ObjectUtils.isNotEmpty(row.getCell(11))) {
+ svyLibTopicRes.setScore(row.getCell(11).toString());
+ }
+ if (ObjectUtils.isNotEmpty(row.getCell(12))) {
+ svyLibTopicRes.setScore(row.getCell(12).toString());
+ }
if (StringUtils.isNotEmpty(svyLibTopicRes.getRemark())) {
//璇存槑璇ヨ鏁版嵁鏈夐棶棰�
svyLibTopicErrors.add(svyLibTopicRes);
@@ -215,29 +225,69 @@
//瑙ｇ瓟棰橈紝涓嶉渶瑕佸啀璁剧疆閫夐」
svyLibTopicoptionMapper.insertSvyLibTopicoption(svyLibTopicoption);
} else {
- if (ObjectUtils.isNotEmpty(row.getCell(4)) || StringUtils.isNotEmpty(row.getCell(4).toString())) {
- svyLibTopicoption.setOptioncode("A");
- svyLibTopicoption.setOptioncontent(row.getCell(4).toString());
- svyLibTopicoption.setOptionid(null);
- svyLibTopicoptionMapper.insertSvyLibTopicoption(svyLibTopicoption);
+ if (ObjectUtils.isNotEmpty(row.getCell(4))) {
+ if (StringUtils.isNotEmpty(row.getCell(4).toString())) {
+ svyLibTopicoption.setOptioncode("A");
+ svyLibTopicoption.setOptioncontent(row.getCell(4).toString());
+ svyLibTopicoption.setOptionid(null);
+ svyLibTopicoptionMapper.insertSvyLibTopicoption(svyLibTopicoption);
+ }
}
- if (ObjectUtils.isNotEmpty(row.getCell(5)) || StringUtils.isNotEmpty(row.getCell(5).toString())) {
- svyLibTopicoption.setOptioncode("B");
- svyLibTopicoption.setOptioncontent(row.getCell(5).toString());
- svyLibTopicoption.setOptionid(null);
- svyLibTopicoptionMapper.insertSvyLibTopicoption(svyLibTopicoption);
+ if (ObjectUtils.isNotEmpty(row.getCell(5))) {
+ if (StringUtils.isNotEmpty(row.getCell(5).toString())) {
+ svyLibTopicoption.setOptioncode("B");
+ svyLibTopicoption.setOptioncontent(row.getCell(5).toString());
+ svyLibTopicoption.setOptionid(null);
+ svyLibTopicoptionMapper.insertSvyLibTopicoption(svyLibTopicoption);
+ }
}
- if (ObjectUtils.isNotEmpty(row.getCell(6)) || StringUtils.isNotEmpty(row.getCell(6).toString())) {
- svyLibTopicoption.setOptioncode("C");
- svyLibTopicoption.setOptioncontent(row.getCell(6).toString());
- svyLibTopicoption.setOptionid(null);
- svyLibTopicoptionMapper.insertSvyLibTopicoption(svyLibTopicoption);
+ if (ObjectUtils.isNotEmpty(row.getCell(6))) {
+ if (StringUtils.isNotEmpty(row.getCell(6).toString())) {
+ svyLibTopicoption.setOptioncode("C");
+ svyLibTopicoption.setOptioncontent(row.getCell(6).toString());
+ svyLibTopicoption.setOptionid(null);
+ svyLibTopicoptionMapper.insertSvyLibTopicoption(svyLibTopicoption);
+ }
}
- if (ObjectUtils.isNotEmpty(row.getCell(7)) || StringUtils.isNotEmpty(row.getCell(7).toString())) {
- svyLibTopicoption.setOptioncode("D");
- svyLibTopicoption.setOptioncontent(row.getCell(7).toString());
- svyLibTopicoption.setOptionid(null);
- svyLibTopicoptionMapper.insertSvyLibTopicoption(svyLibTopicoption);
+ if (ObjectUtils.isNotEmpty(row.getCell(7))) {
+ if (StringUtils.isNotEmpty(row.getCell(7).toString())) {
+ svyLibTopicoption.setOptioncode("D");
+ svyLibTopicoption.setOptioncontent(row.getCell(7).toString());
+ svyLibTopicoption.setOptionid(null);
+ svyLibTopicoptionMapper.insertSvyLibTopicoption(svyLibTopicoption);
+ }
+ }
+ if (ObjectUtils.isNotEmpty(row.getCell(8))) {
+ if (StringUtils.isNotEmpty(row.getCell(8).toString())) {
+ svyLibTopicoption.setOptioncode("E");
+ svyLibTopicoption.setOptioncontent(row.getCell(8).toString());
+ svyLibTopicoption.setOptionid(null);
+ svyLibTopicoptionMapper.insertSvyLibTopicoption(svyLibTopicoption);
+ }
+ }
+ if (ObjectUtils.isNotEmpty(row.getCell(9))) {
+ if (StringUtils.isNotEmpty(row.getCell(9).toString())) {
+ svyLibTopicoption.setOptioncode("F");
+ svyLibTopicoption.setOptioncontent(row.getCell(9).toString());
+ svyLibTopicoption.setOptionid(null);
+ svyLibTopicoptionMapper.insertSvyLibTopicoption(svyLibTopicoption);
+ }
+ }
+ if (ObjectUtils.isNotEmpty(row.getCell(10))) {
+ if (StringUtils.isNotEmpty(row.getCell(10).toString())) {
+ svyLibTopicoption.setOptioncode("G");
+ svyLibTopicoption.setOptioncontent(row.getCell(10).toString());
+ svyLibTopicoption.setOptionid(null);
+ svyLibTopicoptionMapper.insertSvyLibTopicoption(svyLibTopicoption);
+ }
+ }
+ if (ObjectUtils.isNotEmpty(row.getCell(11))) {
+ if (StringUtils.isNotEmpty(row.getCell(11).toString())) {
+ svyLibTopicoption.setOptioncode("H");
+ svyLibTopicoption.setOptioncontent(row.getCell(11).toString());
+ svyLibTopicoption.setOptionid(null);
+ svyLibTopicoptionMapper.insertSvyLibTopicoption(svyLibTopicoption);
+ }
}
}
}
@@ -252,5 +302,13 @@
return null;
}
+ @Override
+ public SvyLibTopicRes showTopic(SvyTopicReq svyTopicReq) {
+ List<SvyLibTopicAndOptionRes> svyLibTopicAndOptionRes = svyLibTopicMapper.showTopic(svyTopicReq);
+ Map<Long, List<SvyLibTopicAndOptionRes>> groupByAge = svyLibTopicAndOptionRes.stream().collect(Collectors.groupingBy(SvyLibTopicAndOptionRes::getTopicid));
+
+ return null;
+ }
+
}
--
Gitblit v1.9.3