修改题目相关功能

tz/common/common-core/src/main/java/com/tz/platform/common/core/enmus/QuestionTypeEnum.java

@@ -7,11 +7,13 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum  QuestionTypeEnum {
     //单选
-    SINGLE(1,"单选"),
+    SINGLE(1,"单选题"),
     //多选
-    MULTY(2,"多选"),
+    MULTY(2,"多选题"),
     //判断
-    JUDGE(3,"判断");
+    JUDGE(3,"判断题"),
+    //填空
+    GAPFILLING(4,"填空题");
     /**
      * 类型
      */

tz/common/common-core/src/main/java/com/tz/platform/common/core/tools/ExcelUtil.java

@@ -29,7 +29,7 @@ public class ExcelUtil {
     private InputStream is;
     private Workbook excel;
     //获取第一个sheet
-    public Sheet sheet0 ;
+    public static Sheet sheet0 ;
 
     private Font defaultFont;
 
@@ -37,6 +37,9 @@ public class ExcelUtil {
 
     private CellStyle numStyle ;
 
+    public static void initSheet(Workbook workbook) {
+        sheet0 = workbook.getSheetAt(0);
+    }
 
     public ExcelUtil(){
         initNumStyle();

tz/competition/competition-service/src/main/java/com/tz/platform/competitiion/pc/biz/TeamMemberImportBiz.java

@@ -65,6 +65,15 @@ public class TeamMemberImportBiz {
             e.printStackTrace();
         }
 
+//        // 过滤掉全空或字段都是null的记录  这个操作暂时不做
+//        personList = personList.stream()
+//                .filter(person -> person != null
+//                        && (person.getStudentNo() != null && !person.getStudentNo().trim().isEmpty()
+//                        || person.getName() != null && !person.getName().trim().isEmpty()
+//                        || person.getClassName() != null && !person.getClassName().trim().isEmpty()
+//                        || person.getSchoolName() != null && !person.getSchoolName().trim().isEmpty()))
+//                .collect(Collectors.toList());
+//
         List<String> collect = personList.stream().map(p -> p.getStudentNo()).filter(Objects::nonNull).collect(Collectors.toList());
         List<User> allStu = userDao.findAllByStudentNoIn(collect);
         if (allStu.isEmpty()){
@@ -129,12 +138,12 @@ public class TeamMemberImportBiz {
         List<CompetitionMember> newMembers = competitionMembers.stream()
                 .filter(member -> memberDao.findByCompetitionIdAndStudentNoAndSchool(competitionId,member.getStudentNo(), member.getSchool()).isEmpty())
                 .collect(Collectors.toList());
-        if (!newMembers.isEmpty()) {
-            memberDao.saveAll(newMembers);
+        if (!competitionMembers.isEmpty()) {
+            memberDao.saveAll(competitionMembers);
             updatePeopleCount(competitionId);
             return Result.success("success");
         } else {
-            return Result.success("No new members to save.");
+            return Result.error("没有正确的用户");
         }
     }
 

tz/exam/exam-service/src/main/java/com/tz/platform/exam/pc/dto/QuestionContDTO.java

@@ -9,4 +9,5 @@ public class QuestionContDTO implements Serializable {
     private Integer singleCount;
     private Integer multiCount;
     private Integer judgeCount;
+    private Integer gapFilling;
 }

tz/exam/exam-service/src/main/java/com/tz/platform/pc/PCQuestionController.java

@@ -11,6 +11,8 @@ import com.tz.platform.pc.vo.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
 @RequestMapping(value = "/pc/question")
 public class PCQuestionController extends BaseController {
@@ -53,8 +55,17 @@ public class PCQuestionController extends BaseController {
         return questionBiz.listByIds(vo);
     }
 
+
     @GetMapping(value = "getCount")
-    public Result<QuestionContDTO> getCount(){
-        return  questionBiz.getCount();
+    public Result<QuestionContDTO> getCount(@RequestBody(required = false) List<Long> ids) {
+        return questionBiz.getCount(ids);
     }
+
+    //todo 随机抽取逻辑
+    //1、展示所有课程信息，供选择使用。已有 使用下拉框
+
+    //2、根据选择的一个或多个课程ID查出总共的题型数量 改造完成 getCount
+
+    //3、根据用户设置的各个题型的数量组成考试，这一步应该是前端完成
+
 }

tz/exam/exam-service/src/main/java/com/tz/platform/pc/PCQuestionImportController.java

@@ -3,22 +3,28 @@ package com.tz.platform.pc;
 import com.tz.platform.common.core.base.BaseController;
 import com.tz.platform.common.core.base.Result;
 import com.tz.platform.pc.biz.QuestionImportBiz;
-import com.tz.platform.pc.dto.ListQuestionImportDTO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.List;
+import java.util.Map;
+
 @RestController
-@RequestMapping(value = "/api/question/")
+@RequestMapping(value = "/api/question")
 public class PCQuestionImportController extends BaseController {
 
     @Autowired
     private QuestionImportBiz importBiz;
 
+//    @PostMapping(value = "importExcel")
+//    public Result<ListQuestionImportDTO> importExcel(MultipartFile file) {
+//        return importBiz.importExcel(file,getUserNo());
+//    }
+
     @PostMapping(value = "importExcel")
-    public Result<ListQuestionImportDTO> importExcell(MultipartFile file){
-        return importBiz.importExcel(file,getUserNo());
+    public Result<String> importExcel(MultipartFile file,
+                                      @RequestParam Long courseId) throws Exception {
+        return importBiz.importExcel11(file, getUserNo(), courseId);
     }
 }

tz/exam/exam-service/src/main/java/com/tz/platform/pc/biz/PCQuestionBiz.java

@@ -82,6 +82,7 @@ public class PCQuestionBiz {
         question = questionDao.save(question);
         return Result.success(question.getId());
     }
+
     public Result<String> update(QuestionUpdateVO questionVO) {
 
         if (!StringUtils.hasText(questionVO.getStem())) {
@@ -164,14 +165,29 @@ public class PCQuestionBiz {
         return Result.success(dto);
     }
 
-    public Result<QuestionContDTO> getCount(){
-            int singleCount = questionDao.countByQuestionTypeAndType(QuestionTypeEnum.SINGLE.getCode(),0);
-            int multiCount = questionDao.countByQuestionTypeAndType(QuestionTypeEnum.MULTY.getCode(),0);
-            int judgeCount = questionDao.countByQuestionTypeAndType(QuestionTypeEnum.JUDGE.getCode(),0);
+    public Result<QuestionContDTO> getCount(List<Long> ids) {
+        int singleCount;
+        int multiCount;
+        int judgeCount;
+        int gapFilling;
+
+        if (ids != null && !ids.isEmpty()) {
+            singleCount = questionDao.countByQuestionTypeAndTypeAndCourseIdIn(QuestionTypeEnum.SINGLE.getCode(), 0, ids);
+            multiCount = questionDao.countByQuestionTypeAndTypeAndCourseIdIn(QuestionTypeEnum.MULTY.getCode(), 0, ids);
+            judgeCount = questionDao.countByQuestionTypeAndTypeAndCourseIdIn(QuestionTypeEnum.JUDGE.getCode(), 0, ids);
+            gapFilling = questionDao.countByQuestionTypeAndTypeAndCourseIdIn(QuestionTypeEnum.GAPFILLING.getCode(), 0, ids);
+        } else {
+            singleCount = questionDao.countByQuestionTypeAndType(QuestionTypeEnum.SINGLE.getCode(), 0);
+            multiCount = questionDao.countByQuestionTypeAndType(QuestionTypeEnum.MULTY.getCode(), 0);
+            judgeCount = questionDao.countByQuestionTypeAndType(QuestionTypeEnum.JUDGE.getCode(), 0);
+            gapFilling = questionDao.countByQuestionTypeAndType(QuestionTypeEnum.GAPFILLING.getCode(), 0);
+        }
+
         QuestionContDTO dto = new QuestionContDTO();
         dto.setJudgeCount(judgeCount);
         dto.setMultiCount(multiCount);
         dto.setSingleCount(singleCount);
+        dto.setGapFilling(gapFilling);
         return Result.success(dto);
     }
 }

tz/exam/exam-service/src/main/java/com/tz/platform/pc/biz/QuestionImportBiz.java

@@ -15,18 +15,14 @@ import com.tz.platform.pc.dto.ListQuestionImportDTO;
 import com.tz.platform.pc.dto.QuestionImportDTO;
 import com.tz.platform.repository.CourseDao;
 import com.tz.platform.repository.QuestionDao;
-import org.apache.catalina.User;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
+import java.util.*;
 
 @Component
 public class QuestionImportBiz {
@@ -57,6 +53,10 @@ public class QuestionImportBiz {
             ExcelUtil util = new ExcelUtil(file.getInputStream());
             int lastRowNum = util.getLastRowNum();
             List<QuestionImportDTO> list = new ArrayList<>();
+
+            Workbook workbook = new XSSFWorkbook(file.getInputStream());
+            ExcelUtil.initSheet(workbook);
+
             for (int rowNo = 1; rowNo <= lastRowNum; ) {
                 int lineCount = util.getMergedRegionLineCount(rowNo, 1);
                 if (lineCount <= 0) {
@@ -98,7 +98,7 @@ public class QuestionImportBiz {
                                 question.setLevelId(levelVo.getId());
                                 question.setLevelName(levelNamme);
                             }
-
+                            //todo 兼容填空题
                             question.setStem(stem);
                             question.setUserNo(userNo);
                             question.setCreateTime(new Date());
@@ -117,6 +117,8 @@ public class QuestionImportBiz {
                                 qt = QuestionTypeEnum.MULTY;
                             } else if (questType.equals(QuestionTypeEnum.JUDGE.getDesc())) {
                                 qt = QuestionTypeEnum.JUDGE;
+                            } else if (questType.equals(QuestionTypeEnum.GAPFILLING.getDesc())) {
+                                qt = QuestionTypeEnum.GAPFILLING;
                             }
                             if (qt == null) {
                                 subDto.setStatus("题型未匹配");
@@ -144,8 +146,8 @@ public class QuestionImportBiz {
                                 if (answerList.size() == 0) {
                                     subDto.setStatus("无选项");
                                 }
-
-                                if(answerIds.size()>0&&answerList.size()>0&&qt!=null){
+                                //todo 兼容填空题
+                                if (answerIds.size() > 0 && answerList.size() > 0) {
                                     question.setQuestionType(qt.getCode());
                                     question.setAnswerList(answerList);
                                     question.setAnswerId(answerIds);
@@ -169,4 +171,159 @@ public class QuestionImportBiz {
 
         return Result.success(dto);
     }
+
+
+    public Result<String> importExcel11(MultipartFile file, Long userNo, Long courseId) throws Exception {
+        //身份校验
+        if (userNo == null || userNo <= 0) {
+            return Result.error("无权操作");
+        }
+        UserVo user = feignUser.getByUserNo(userNo);
+        if (user == null || user.getUserType() < UserTypeEnum.TEACHER.getCode()) {
+            return Result.error("无权操作");
+        }
+        List<Question> questionList = new ArrayList<>();
+
+        try {
+            Workbook workbook = WorkbookFactory.create(file.getInputStream());
+            Sheet sheet = workbook.getSheetAt(0);
+            // 迭代每一行
+            Iterator<Row> iterator = sheet.iterator();
+            iterator.next();
+            while (iterator.hasNext()) {
+                Row row = iterator.next();
+
+                /*解析列，下标从0开始*/
+                Cell cell0 = row.getCell(0); //题型
+                Cell cell1 = row.getCell(1);//题干
+                Cell cell2 = row.getCell(2);//A
+                Cell cell3 = row.getCell(3);//B
+                Cell cell4 = row.getCell(4);//C
+                Cell cell5 = row.getCell(5);//D
+                Cell cell6 = row.getCell(6);//E
+                Cell cell7 = row.getCell(7);//答案
+                Cell cell8 = row.getCell(8);//分数
+                Cell cell9 = row.getCell(9);//解析
+
+                //判断题的BCDE选项和解析可能为空
+                if (cell0 == null || cell1 == null || cell2 == null || cell3 == null || cell7 == null || cell8 == null) {
+                    return Result.error("必填项不能为空！");
+                }
+
+                String questType = this.getCellValue(cell0);//题型
+                String a = null;
+                String b = null;
+                if (!questType.equals("填空题")) {
+                    a = this.getCellValue(cell2); //选项A
+                    b = this.getCellValue(cell3);//选项B
+                }
+                String stem = this.getCellValue(cell1);//题干
+                String answer = this.getCellValue(cell7);//答案
+                String score = this.getCellValue(cell8);//分值
+                String c = cell4 != null ? this.getCellValue(cell4) : null;
+                String d = cell5 != null ? this.getCellValue(cell5) : null;
+                String e = cell6 != null ? this.getCellValue(cell6) : null;
+                String analysis = cell9 != null ? this.getCellValue(cell9) : null; //答案解析
+
+                Course course = courseDao.getById(courseId);
+                if (course == null) {
+                    return Result.error("课程不存在");
+                }
+
+                Question temp = questionDao.getByStem(stem);
+                if (temp != null) {
+                    return Result.error("题干已存在");
+                }
+
+                QuestionTypeEnum qt = null;
+                if (questType.equals(QuestionTypeEnum.SINGLE.getDesc())) {
+                    qt = QuestionTypeEnum.SINGLE;
+                } else if (questType.equals(QuestionTypeEnum.MULTY.getDesc())) {
+                    qt = QuestionTypeEnum.MULTY;
+                } else if (questType.equals(QuestionTypeEnum.JUDGE.getDesc())) {
+                    qt = QuestionTypeEnum.JUDGE;
+                } else if (questType.equals(QuestionTypeEnum.GAPFILLING.getDesc())) {
+                    qt = QuestionTypeEnum.GAPFILLING;
+                }
+                if (qt == null) {
+                    return Result.error("题型未匹配");
+                }
+
+                Question question = new Question();
+                question.setStem(stem);
+                question.setUserNo(userNo);
+                question.setCreateTime(new Date());
+                question.setStatus(0);
+                question.setScore(Long.parseLong(score));
+                question.setCreatorId(userNo);
+                question.setCreator(user.getName());
+                question.setType(0);
+                question.setAnalysis(analysis);
+                question.setCourseId(course.getId());
+                question.setLevelId(0);
+                question.setLevelName("通用");
+                question.setQuestionType(qt.getCode());
+                question.setCourseName(course.getName());
+
+                List<Answer> answerList = new ArrayList<>();
+                List<Integer> answerIds = new ArrayList<>();
+                String[] split = answer.split(",");
+
+                int id = 1; // 选项的ID
+
+                if (questType.equals("填空题")) {
+                    Answer answerData = new Answer();
+                    answerData.setId(id);
+                    answerData.setTitle(answer);
+                    answerList.add(answerData);
+                } else {
+                    String[] options = {a, b, c, d, e}; // 选项文本
+                    for (String option : options) {
+                        if (com.alibaba.cloud.commons.lang.StringUtils.isNotBlank(option)) {
+                            Answer answerData = new Answer();
+                            answerData.setId(id);
+                            answerData.setTitle(option);
+                            answerList.add(answerData);
+                        }
+                        id++; // 每次循环递增ID
+                    }
+                }
+
+                for (String s : split) {
+                    int answerId = 1; // 默认A选项对应ID为1
+                    if (s.equals("A")) {
+                        answerId = 1;
+                    } else if (s.equals("B")) {
+                        answerId = 2;
+                    } else if (s.equals("C")) {
+                        answerId = 3;
+                    } else if (s.equals("D")) {
+                        answerId = 4;
+                    } else if (s.equals("E")) {
+                        answerId = 5;
+                    }
+                    answerIds.add(answerId);
+                }
+
+                question.setAnswerList(answerList);
+                question.setAnswerId(answerIds);
+                questionList.add(question);
+            }
+            questionDao.saveAll(questionList);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return Result.error("系统异常，请联系管理员");
+        }
+        return Result.success("导入成功！");
+    }
+
+    public String getCellValue(Cell cell) {
+        if (cell.getCellType() == Cell.CELL_TYPE_BOOLEAN) {
+            return String.valueOf(cell.getBooleanCellValue());
+        } else if (cell.getCellType() == Cell.CELL_TYPE_NUMERIC) {
+            Double d = cell.getNumericCellValue();
+            return String.valueOf(d.intValue());
+        }
+        return String.valueOf(cell.getStringCellValue());
+    }
 }

tz/exam/exam-service/src/main/java/com/tz/platform/pc/vo/QuestionVO.java

@@ -21,7 +21,7 @@ public class QuestionVO {
     private String stemImg;
     private Long creatorId;
     List<Answer> answerList;
-    private String analysis;
+    private String analysis; //[题目选项]
     private Integer status;
-    private List<Integer> answerId;
+    private List<Integer> answerId; //正确答案 [1]
 }

tz/exam/exam-service/src/main/java/com/tz/platform/repository/CourseDao.java

@@ -11,5 +11,6 @@ import org.springframework.stereotype.Repository;
 public interface CourseDao extends JpaRepository<Course,Long> {
     Page<Course> findAll(Pageable pageable);
     Course getById(Long id);
+    Course getByName(String name);
     Course getByOuterId(Integer outerId);
 }

tz/exam/exam-service/src/main/java/com/tz/platform/repository/QuestionDao.java

@@ -17,6 +17,7 @@ import java.util.List;
 @Repository
 public interface QuestionDao extends JpaRepository<Question, Long> {
     Question getById(Long id);
+
     Page<Question> findAll(Pageable pageable);
 
     Page<Question> findAllByStemAndType(String stem, Integer type, Pageable pageable);
@@ -33,6 +34,8 @@ public interface QuestionDao extends JpaRepository<Question,Long> {
 
     List<Question> findAllByIdIn(List<Long> ids);
 
+    int countByQuestionTypeAndTypeAndCourseIdIn(Integer qtype, Integer type, List<Long> courseId);
+
     int countByQuestionTypeAndType(Integer qtype, Integer type);
 
     Question getByStem(String stem);