Merge branch 'refs/heads/zcwy-0724-wjw-online' into zcwy0923-wjwyyk-online

# Conflicts:
#	servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java
#	servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java

servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java

@@ -19,8 +19,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;

servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CaseScheduledTasks.java

@@ -12,16 +12,13 @@ public class CaseScheduledTasks {
     @Resource
     private ICasesService casesService;
 
-    /**
+    @Scheduled(cron = "0 0 1 1 * ?")  // 每月的第一天的1:00执行
-     * 每月的第一天的1:00执行
-     */
-    @Scheduled(cron = "0 0 1 1 * ?")
     public void refreshViewsRankOfMajor() {
         casesService.refreshViewsRankOfMajor();
     }
 
     /**
-     * 季初第一天两点执行，cron表达式设置为每个季度的第一个月的第一天的特定时间。每个季度的第一个月是1月、4月、7月和10月：
+     * 季初执行，cron表达式设置为每个季度的第一个月的第一天的特定时间。每个季度的第一个月是1月、4月、7月和10月：
      */
     @Scheduled(cron = "0 0 2 1 1,4,7,10 ?")
     public void refreshLastQuarterStatistics() {

servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CasesRankDao.java

@@ -15,9 +15,7 @@ import java.util.stream.Collectors;
 @Repository
 @Slf4j
 public class CasesRankDao extends BaseDao<CasesRank> {
-    /**
+
-     * 获取类别榜记录，默认按上榜时间降序排列
-     */
     public List<CasesRank> findViewsRankRecordByCaseId(String caseId) {
         String sql =
                     "SELECT bdmt.name,bcvr.rise_rank_time,bcvr.rank,bcvr.major_id \n" +
@@ -26,7 +24,8 @@ public class CasesRankDao extends BaseDao<CasesRank> {
                     "JOIN boe_dict_major_type bdmt \n" +
                     "  ON bdmt.code = bcvr.major_id \n" +
                     "WHERE bcvr.case_id = ?1 AND bcvr.deleted=0 AND bdmt.deleted=0\n" +
-                    "ORDER BY bcvr.rise_rank_time DESC;";
+                    "ORDER BY bcvr.sys_update_time DESC \n" +
+                    "LIMIT 2;";
 
         List<Object[]> list = this.sqlFindList(sql, caseId);
 

servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java

@@ -416,36 +416,14 @@ public class CasesServiceImpl implements ICasesService {
         if (CollUtil.isEmpty(casesList)) {
             return casesList;
         }
-
         //1.推荐案例数据处理
         recommendCasesDataHandle(casesList, accountId);
         //2.标签处理，添加作者标签和新的案例标签
         addAuthorTagAndCaseNewTag(casesList);
-        //3.案例类型处理
-//        majorTypeHandle(casesList);
 
         return casesList;
     }
 
-    private void majorTypeHandle(List<Cases> casesList) {
-        if (CollUtil.isNotEmpty(casesList)) {
-            for (Cases c : casesList) {
-                StringBuffer stringBuffer = new StringBuffer();
-                List<CasesMajorType> caseId = casesMajorTypeDao.findList(FieldFilters.eq("caseId", c.getId()));
-                if (caseId != null && !caseId.isEmpty()) {
-                    for (CasesMajorType cm : caseId) {
-                        stringBuffer.append(cm.getMajorId());
-                        stringBuffer.append(",");
-                    }
-                }
-                if (stringBuffer.length() > 0) {
-                    stringBuffer.deleteCharAt(stringBuffer.length() - 1);
-                    c.setMajorType(stringBuffer.toString());
-                }
-            }
-        }
-    }
-
     private void recommendCasesDataHandle(List<Cases> casesList, String accountId) {
         if (StrUtil.isNotBlank(accountId)) {
             List<String> caseIdList = casesList.stream().map(Cases::getId).collect(Collectors.toList());
@@ -505,7 +483,7 @@ public class CasesServiceImpl implements ICasesService {
 
 
         caseList.forEach(e -> {
-            // 获取浏览量上榜记录
+            // 获取最新的两个浏览量上榜记录
             List<CasesRank> viewsRankRecords = casesRankDao.findViewsRankRecordByCaseId(e.getId());
             if (CollUtil.isNotEmpty(viewsRankRecords)) {
                 // 拼接生成浏览量排行榜的标签
@@ -1253,7 +1231,7 @@ public class CasesServiceImpl implements ICasesService {
     @Override
     public void refreshLastQuarterStatistics() {
         log.info("开始执行每季案例相关定时任务");
-        int i = casesDao.sqlUpdate("update boe_cases set last_quarter_views=views,last_quarter_praises=praises where deleted=0");
+        int i = casesDao.sqlUpdate("update boe_cases set last_quarter_views=views,last_quarter_praise=praise where deleted=0");
         log.info("每季案例相关定时任务执行完成，boe_cases更新数据量为条数为"+i);
     }
 
@@ -1305,18 +1283,15 @@ public class CasesServiceImpl implements ICasesService {
         List<HashMap<String, Object>> popularityOfMajor = casesRankDao.findPopularityOfMajor(pageSize, startTime, endTime, majorId);
         List<String> caseIdList = popularityOfMajor.stream().map(map -> map.get("caseId").toString()).collect(Collectors.toList());
 
+        Map<Object, Integer> collect = popularityOfMajor.stream().collect(Collectors.toMap(map -> map.get("caseId").toString(), map -> Integer.valueOf(map.get("rank").toString())));
 
         QueryBuilder query = QueryBuilder.from(Cases.class);
         query.addFilter(FieldFilters.in("id",caseIdList));
         query.addFilter(FieldFilters.eq("deleted",false));
 
         List<Cases> casesList = casesDao.findList(query.builder());
-        //处理案例数据-通用操作
         casesList = caseListCommonHandle(casesList, accountId);
-        //获取案例与排名的映射关系
-        Map<Object, Integer> collect = popularityOfMajor.stream().collect(Collectors.toMap(map -> map.get("caseId").toString(), map -> Integer.valueOf(map.get("rank").toString())));
 
-        //排序榜单案例顺序
         Collections.sort(casesList, new Comparator<Cases>() {
             @Override
             public int compare(Cases c1, Cases c2) {
@@ -1325,26 +1300,6 @@ public class CasesServiceImpl implements ICasesService {
                 return Integer.compare(order1, order2);
             }
         });
-
-        casesList.forEach(cases -> {
-            List<CaseViewRankingItemVo> viewRankTags = cases.getViewRankTags();
-
-            // 使用 Stream API 进行排序，保持其余元素的原始顺序
-            List<CaseViewRankingItemVo> sortedList = viewRankTags.stream()
-                    .sorted((o1, o2) -> {
-                        // majorId 相等时放前面
-                        boolean o1Matches = o1.getMajorId().equals(majorId);
-                        boolean o2Matches = o2.getMajorId().equals(majorId);
-
-                        if (o1Matches && !o2Matches) return -1; // o1是majorId, o2不是，o1排前
-                        if (!o1Matches && o2Matches) return 1;  // o2是majorId, o1不是，o2排前
-                        return 0; // 如果两者都是或都不是majorId, 保持原有顺序
-                    })
-                    .collect(Collectors.toList());
-
-            // 更新原列表
-            cases.setViewRankTags(sortedList);
-        });
         return casesList;
     }
 

servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseContentApi.java

@@ -4,10 +4,13 @@ import java.util.List;
 
 import javax.annotation.Resource;
 
-import com.xboe.common.utils.StringUtil;
-import com.xboe.core.log.AutoLog;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 
 import com.xboe.core.JsonResponse;
 import com.xboe.core.api.ApiBaseController;
@@ -74,22 +77,7 @@ public class CourseContentApi extends ApiBaseController{
 		}
 		return success(obj);
 	}
-
+	
-	@GetMapping("/exam/paper-content")
-	@AutoLog(module = "试卷",action = "查看试卷试题",info = "查看当前试题内容")
-	public JsonResponse<Object> paperContent(String courseExamId){
-		if(StringUtil.isBlank(courseExamId)){
-			return badRequest("缺少必要参数");
-		}
-		try {
-			Object paperContentOfOnline = ccontentService.getPaperContentOfOnline(courseExamId);
-			return success(paperContentOfOnline);
-		} catch (Exception e) {
-			log.error("查询试卷内容json错误",e);
-			return error("查询失败",e.getMessage());
-		}
-	}
-
 	/**
 	 * 获取评估信息
 	 * @param ccid

servers/boe-server-all/src/main/java/com/xboe/module/course/api/CoursePortalApi.java

@@ -1,7 +1,38 @@
 package com.xboe.module.course.api;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
 import com.xboe.api.ThirdApi;
 import com.xboe.api.vo.UserBasicInfo;
+import com.xboe.core.orm.FieldFilters;
+import com.xboe.module.course.entity.*;
+import com.xboe.module.course.vo.TeacherVo;
+import com.xboe.school.study.dao.StudyCourseDao;
+import com.xboe.school.study.entity.StudyHomeWork;
+import com.xboe.school.study.service.IStudyHomeWorkService;
+import com.xboe.school.study.service.IStudyService;
+import com.xboe.system.user.entity.User;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.xboe.common.PageList;
 import com.xboe.common.Pagination;
 import com.xboe.common.utils.StringUtil;
@@ -396,6 +427,49 @@ public class CoursePortalApi extends ApiBaseController{
 		String zipFilePath = "/home/www/elearning/upload/saveZip/" + courseName+"【作业】" + ".zip";
 		createZipFile(map, zipFilePath);
 		return success(zipFilePath);
+		// 创建一个临时文件用于存储ZIP文件
+//		File tempZipFile = new File("/home/www/elearning/upload/temp.zip");
+//
+//		try (ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(tempZipFile))) {
+//			for (Map.Entry<String, String> e : map.entrySet()) {
+//				File fileToZip = new File(e.getValue());
+//				// 添加 ZIP 条目
+//				ZipEntry entry = new ZipEntry(e.getKey());
+//				entry.setSize(fileToZip.length());
+//
+//				zos.putNextEntry(entry);
+//
+//				try (FileInputStream fis = new FileInputStream(fileToZip)) {
+//					byte[] buffer = new byte[4096];
+//					int len;
+//					while ((len = fis.read(buffer)) > 0) {
+//						zos.write(buffer, 0, len);
+//					}
+//				}
+//
+//				zos.closeEntry();
+//			}
+//		}
+//		// 将临时文件移动到指定位置
+//		Path source = tempZipFile.toPath();
+//        //生成uuid
+////        String uuid = UUID.randomUUID().toString();
+//		Path destination = Paths.get("/home/www/elearning/upload/saveZip/" + courseName+"【作业】" + ".zip");
+//
+//		// 确保目标目录存在
+//		Files.createDirectories(destination.getParent());
+//
+//		// 删除目标文件如果已存在
+//		if (Files.exists(destination)) {
+//			Files.delete(destination);
+//		}
+//
+//		// 移动文件
+//		Files.copy(source, destination, StandardCopyOption.REPLACE_EXISTING);
+//
+//		// 返回文件路径给前端
+//		String filePath = destination.toAbsolutePath().toString();
+//		return success(filePath);
 	}
 	private static void createZipFile(Map<String, String> map, String zipFilePath) throws IOException {
 		try (ZipOutputStream zos = new ZipOutputStream(new FileOutputStream(zipFilePath))) {

servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseContentService.java

@@ -85,6 +85,4 @@ public interface ICourseContentService{
 
 	void updateProcessVideo(String contentId, String courseId, Float processVideo);
 
-	Object getPaperContentOfOnline(String courseExamId);
-
 }

servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseContentServiceImpl.java

@@ -1,17 +1,23 @@
 package com.xboe.module.course.service.impl;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
+import java.sql.PreparedStatement;
-import com.fasterxml.jackson.core.type.TypeReference;
+import java.sql.SQLException;
-import com.fasterxml.jackson.databind.DeserializationFeature;
+import java.util.List;
-import com.fasterxml.jackson.databind.JsonNode;
+
-import com.fasterxml.jackson.databind.ObjectMapper;
+import javax.annotation.Resource;
-import com.fasterxml.jackson.databind.node.ObjectNode;
+import javax.transaction.Transactional;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
 import com.xboe.common.OrderCondition;
-import com.xboe.core.cache.IXaskCache;
-import com.xboe.core.cache.XaskCacheProvider;
 import com.xboe.core.orm.FieldFilters;
 import com.xboe.core.orm.UpdateBuilder;
-import com.xboe.module.course.dao.*;
+import com.xboe.module.course.dao.CourseAssessDao;
+import com.xboe.module.course.dao.CourseContentDao;
+import com.xboe.module.course.dao.CourseExamDao;
+import com.xboe.module.course.dao.CourseHomeWorkDao;
+import com.xboe.module.course.dao.CourseSectionDao;
 import com.xboe.module.course.dto.CourseContentDto;
 import com.xboe.module.course.dto.SortItem;
 import com.xboe.module.course.entity.CourseAssess;
@@ -19,21 +25,8 @@ import com.xboe.module.course.entity.CourseContent;
 import com.xboe.module.course.entity.CourseExam;
 import com.xboe.module.course.entity.CourseHomeWork;
 import com.xboe.module.course.service.ICourseContentService;
-import com.xboe.module.exam.dao.ExamPaperDao;
-import com.xboe.module.exam.vo.TestQuestionVo;
 import com.xboe.standard.enums.BoedxContentType;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
-import javax.transaction.Transactional;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-@Slf4j
 @Service
 public class CourseContentServiceImpl implements ICourseContentService {
 
@@ -51,13 +44,7 @@ public class CourseContentServiceImpl implements ICourseContentService {
     
     @Resource
     private CourseHomeWorkDao homeworkDao;
-
+    
-    @Resource
-    private CourseExamDao courseExamDao;
-
-    @Resource
-    private ExamPaperDao examPaperDao;
-
 
 	@Override
 	@Transactional
@@ -91,9 +78,6 @@ public class CourseContentServiceImpl implements ICourseContentService {
 			assessDao.saveOrUpdate(assess);
 		}
 		if(exam!=null) {
-			if ((exam.getRandomMode() && !(exam.getQnum() > 0)) || (!exam.getRandomMode() && exam.getQnum() > 0)) {
-				throw new RuntimeException("随机选题处参数错误");
-			}
 			exam.setCourseId(cc.getCourseId());
 			exam.setContentId(cc.getId());
 			if(exam.getPercentScore()==null) {
@@ -204,68 +188,4 @@ public class CourseContentServiceImpl implements ICourseContentService {
 		
 		return ccDao.sumDurationByCourseId(courseId);
 	}
-
-	@Override
-	public Object getPaperContentOfOnline(String courseExamId) {
-		CourseExam courseExam = courseExamDao.findOne(FieldFilters.eq("id", courseExamId));
-		if (courseExam == null) {
-			throw new RuntimeException("课程考试不存在");
-		}
-
-		String paperId = courseExam.getPaperId();
-		Integer qnum = courseExam.getQnum();
-		Boolean randomMode = courseExam.getRandomMode();
-
-		String paperJson = "";
-		ObjectMapper objectMapper = new ObjectMapper();
-
-		try {
-			// 判断试卷类型
-			if (courseExam.getPaperType() == 1 && StringUtils.isNotBlank(courseExam.getPaperContent())) {
-				paperJson = courseExam.getPaperContent();
-				JsonNode rootNode = objectMapper.readTree(paperJson);
-				JsonNode itemsNode = rootNode.path("items");
-				List<JsonNode> itemsNodes = new ArrayList<>();
-				itemsNode.forEach(itemsNodes::add);
-
-				if (randomMode && qnum != null && qnum > 0 && randomMode && qnum != null && qnum > 0 && itemsNodes.size() > qnum) {
-					Collections.shuffle(itemsNodes);
-					itemsNodes = itemsNodes.subList(0, qnum);
-				}
-				return itemsNodes;
-			} else if (courseExam.getPaperType() == 2) {
-				IXaskCache cache = XaskCacheProvider.getCache();
-				String cacheKey = "course:exam:" + courseExamId + ":" + paperId;
-				String cacheData = cache.getCacheObject(cacheKey);
-
-				if (StringUtils.isBlank(cacheData)) {
-					paperJson = (String) examPaperDao.findField("paperContent", FieldFilters.eq("id", paperId));
-					cache.setCacheObject(cacheKey, paperJson, 5, TimeUnit.HOURS);
-				} else {
-					paperJson = cacheData;
-				}
-
-				objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-				List<TestQuestionVo> eqVoList = objectMapper.readValue(paperJson, new TypeReference<List<TestQuestionVo>>() {
-				});
-
-				if (randomMode && qnum != null && qnum > 0 && eqVoList.size() > qnum) {
-					Collections.shuffle(eqVoList);
-					eqVoList = eqVoList.subList(0, qnum);
-				}
-				return eqVoList;
-			}
-
-		} catch (JsonProcessingException e) {
-			log.error("JSON处理错误", e);
-			throw new RuntimeException(e);
-		}
-
-		if (StringUtils.isBlank(paperJson)) {
-			throw new RuntimeException("此考试无试卷内容，考试已经过期或试卷已被删除");
-		}
-
-		return null;
-	}
-
 }

servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamQuestionApi.java

@@ -170,7 +170,7 @@ public class ExamQuestionApi extends ApiBaseController {
             //从第二行开始获取数据
             List<ExamQuestion> examQuestions1 = new ArrayList<>();
             QuestionDto questionDto = new QuestionDto();
-            if(sheetAt.getRow(1).getCell(0).getStringCellValue().equals("标题(*)") && !sheetAt.getRow(1).getCell(0).getStringCellValue().equals("")){
+            if(sheetAt.getRow(1).getCell(0).getStringCellValue().equals("标题(*)")){
                 row = sheetAt.getRow(1);
                 for (int i = 2;i<sheetAt.getPhysicalNumberOfRows();i++) {
                     //获取每一行
@@ -190,56 +190,45 @@ public class ExamQuestionApi extends ApiBaseController {
                     if(row1.getCell(1).getStringCellValue().equals("多选题")){
                         examQuestion.setType(2);
                     }
-                    if(row1.getCell(2).getStringCellValue().equals("中")){
+                    examQuestion.setKnowledge(row1.getCell(2).getStringCellValue());
+                    if(row1.getCell(3).getStringCellValue().equals("中")){
                         examQuestion.setDifficulty(2f);
-                    }else if(row1.getCell(2).getStringCellValue().equals("难")){
-                        examQuestion.setDifficulty(3f);
-                    } else if(row1.getCell(2).getStringCellValue().equals("易")){
-                        examQuestion.setDifficulty(1f);
-                    }else  if(row1.getCell(2).getStringCellValue().equals("")){
-                        examQuestion.setDifficulty(null);
                     }
-                    Cell cell = row1.getCell(3);
+                    if(row1.getCell(3).getStringCellValue().equals("难")){
+                        examQuestion.setDifficulty(3f);
+                    }
+                    if(row1.getCell(3).getStringCellValue().equals("低")){
+                        examQuestion.setDifficulty(1f);
+                    }
+                    Cell cell = row1.getCell(4);
                     cell.setCellType(CellType.STRING);
 
 //                examQuestion.setDefaultScore(Float.valueOf(cell.getStringCellValue()));
 
                     //单选
                     if (!cell.getStringCellValue().contains(",")){
-                        examQuestion.setAnswer(row1.getCell(5).getStringCellValue());
+                        examQuestion.setAnswer(row1.getCell(6).getStringCellValue());
-                        if (row1.getCell(3).getStringCellValue().isEmpty()){
+                        examQuestion.setDefaultScore(Float.valueOf(row1.getCell(4).getStringCellValue()));
-                            examQuestion.setDefaultScore(null);
+                        Cell cell1 = row1.getCell(5, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
-                        }else {
-                            examQuestion.setDefaultScore(Float.valueOf(row1.getCell(3).getStringCellValue()));
-                        }
-                        Cell cell1 = row1.getCell(4, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
                         cell1.setCellType(CellType.STRING);
                         examQuestion.setAnalysis(cell1.getStringCellValue());
 
                         List<ExamOption> examOptions = new ArrayList<>();
-                        for (int j=6;j<=12;j++) {
+                        for (int j=7;j<=13;j++) {
 
                             if(row1.getCell(j)!=null) {
                                 ExamOption examOption = new ExamOption();
 //                            截取表头
                                 String substring = row.getCell(j).getStringCellValue().substring(3, 4);
-                                if (row1.getCell(5).getStringCellValue().contains(substring)) {
+                                if (row1.getCell(6).getStringCellValue().contains(substring)) {
 
                                     examOption.setIsAnswer(true);
-                                    if (row1.getCell(3).getStringCellValue().isEmpty()){
+                                    examOption.setScore(Float.valueOf(row1.getCell(4).getStringCellValue()));
-                                        examOption.setScore(null);
-                                    }else {
-                                        examOption.setScore(Float.valueOf(row1.getCell(3).getStringCellValue()));
-                                    }
                                 } else {
                                     examOption.setIsAnswer(false);
                                 }
                                 if (examOption.getIsAnswer()) {
-                                    if (row1.getCell(3).getStringCellValue().isEmpty()){
+                                    examOption.setScore(Float.valueOf(row1.getCell(4).getStringCellValue()));
-                                        examOption.setScore(null);
-                                    }else {
-                                        examOption.setScore(Float.valueOf(row1.getCell(3).getStringCellValue()));
-                                    }
                                 }
 
                                 examOption.setOptions(row.getCell(j).getStringCellValue());
@@ -269,19 +258,19 @@ public class ExamQuestionApi extends ApiBaseController {
                             }
                         }
                         examQuestion.setDefaultScore(Float.valueOf(max));
-                        Cell cell1 = row1.getCell(4, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
+                        Cell cell1 = row1.getCell(5, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
                         cell1.setCellType(CellType.STRING);
                         examQuestion.setAnalysis(cell1.getStringCellValue());
-                        examQuestion.setAnswer(row1.getCell(5).getStringCellValue());
+                        examQuestion.setAnswer(row1.getCell(6).getStringCellValue());
                         List<ExamOption> examOptions = new ArrayList<>();
                         //A
-                        for (int j=6;j<=12;j++){
+                        for (int j=7;j<=13;j++){
                             if(row1.getCell(j)!=null && StringUtil.isNotBlank(row1.getCell(j).getStringCellValue())){
                                 ExamOption examOption=new ExamOption();
                                 examOption.setOptions(row.getCell(j).getStringCellValue());
                                 examOption.setContent(row1.getCell(j).getStringCellValue());
                                 examOption.setIsAnswer(true);
-                                examOption.setScore(Float.valueOf(strings[j-6]));
+                                examOption.setScore(Float.valueOf(strings[j-7]));
                                 if(examOption!=null && StringUtil.isNotBlank(examOption.getContent())){
                                     examOptions.add(examOption);
                                 }
@@ -312,56 +301,45 @@ public class ExamQuestionApi extends ApiBaseController {
                     if(row1.getCell(1).getStringCellValue().equals("多选题")){
                         examQuestion.setType(2);
                     }
-                    if(row1.getCell(2).getStringCellValue().equals("中")){
+                    examQuestion.setKnowledge(row1.getCell(2).getStringCellValue());
+                    if(row1.getCell(3).getStringCellValue().equals("中")){
                         examQuestion.setDifficulty(2f);
-                    }else if(row1.getCell(2).getStringCellValue().equals("难")){
-                        examQuestion.setDifficulty(3f);
-                    } else if(row1.getCell(2).getStringCellValue().equals("易")){
-                        examQuestion.setDifficulty(1f);
-                    }else  if(row1.getCell(2).getStringCellValue().equals("")){
-                        examQuestion.setDifficulty(null);
                     }
-                    Cell cell = row1.getCell(3);
+                    if(row1.getCell(3).getStringCellValue().equals("难")){
+                        examQuestion.setDifficulty(3f);
+                    }
+                    if(row1.getCell(3).getStringCellValue().equals("低")){
+                        examQuestion.setDifficulty(1f);
+                    }
+                    Cell cell = row1.getCell(4);
                     cell.setCellType(CellType.STRING);
 
 //                examQuestion.setDefaultScore(Float.valueOf(cell.getStringCellValue()));
 
                     //单选
                     if (!cell.getStringCellValue().contains(",")){
-                        examQuestion.setAnswer(row1.getCell(5).getStringCellValue());
+                        examQuestion.setAnswer(row1.getCell(6).getStringCellValue());
-                        if (row1.getCell(3).getStringCellValue().isEmpty()){
+                        examQuestion.setDefaultScore(Float.valueOf(row1.getCell(4).getStringCellValue()));
-                            examQuestion.setDefaultScore(null);
+                        Cell cell1 = row1.getCell(5, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
-                        }else {
-                            examQuestion.setDefaultScore(Float.valueOf(row1.getCell(3).getStringCellValue()));
-                        }
-                        Cell cell1 = row1.getCell(4, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
                         cell1.setCellType(CellType.STRING);
                         examQuestion.setAnalysis(cell1.getStringCellValue());
 
                         List<ExamOption> examOptions = new ArrayList<>();
-                        for (int j=6;j<=12;j++) {
+                        for (int j=7;j<=13;j++) {
 
                             if(row1.getCell(j)!=null) {
                                 ExamOption examOption = new ExamOption();
 //                            截取表头
                                 String substring = row.getCell(j).getStringCellValue().substring(3, 4);
-                                if (row1.getCell(5).getStringCellValue().contains(substring)) {
+                                if (row1.getCell(6).getStringCellValue().contains(substring)) {
 
                                     examOption.setIsAnswer(true);
-                                    if (row1.getCell(3).getStringCellValue().isEmpty()){
+                                    examOption.setScore(Float.valueOf(row1.getCell(4).getStringCellValue()));
-                                        examOption.setScore(null);
-                                    }else {
-                                        examOption.setScore(Float.valueOf(row1.getCell(3).getStringCellValue()));
-                                    }
                                 } else {
                                     examOption.setIsAnswer(false);
                                 }
                                 if (examOption.getIsAnswer()) {
-                                    if (row1.getCell(3).getStringCellValue().isEmpty()){
+                                    examOption.setScore(Float.valueOf(row1.getCell(4).getStringCellValue()));
-                                        examOption.setScore(null);
-                                    }else {
-                                        examOption.setScore(Float.valueOf(row1.getCell(3).getStringCellValue()));
-                                    }
                                 }
 
                                 examOption.setOptions(row.getCell(j).getStringCellValue());
@@ -391,19 +369,19 @@ public class ExamQuestionApi extends ApiBaseController {
                             }
                         }
                         examQuestion.setDefaultScore(Float.valueOf(max));
-                        Cell cell1 = row1.getCell(4, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
+                        Cell cell1 = row1.getCell(5, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
                         cell1.setCellType(CellType.STRING);
                         examQuestion.setAnalysis(cell1.getStringCellValue());
-                        examQuestion.setAnswer(row1.getCell(5).getStringCellValue());
+                        examQuestion.setAnswer(row1.getCell(6).getStringCellValue());
                         List<ExamOption> examOptions = new ArrayList<>();
                         //A
-                        for (int j=6;j<=13;j++){
+                        for (int j=7;j<=13;j++){
                             if(row1.getCell(j)!=null && StringUtil.isNotBlank(row1.getCell(j).getStringCellValue())){
                                 ExamOption examOption=new ExamOption();
                                 examOption.setOptions(row.getCell(j).getStringCellValue());
                                 examOption.setContent(row1.getCell(j).getStringCellValue());
                                 examOption.setIsAnswer(true);
-                                examOption.setScore(Float.valueOf(strings[j-6]));
+                                examOption.setScore(Float.valueOf(strings[j-7]));
                                 if(examOption!=null && StringUtil.isNotBlank(examOption.getContent())){
                                     examOptions.add(examOption);
                                 }
@@ -435,30 +413,27 @@ public class ExamQuestionApi extends ApiBaseController {
                 ExamQuestion examQuestion1 = new ExamQuestion();
                 examQuestion1.setTitle(row2.getCell(0).getStringCellValue());
                 examQuestion1.setType(3);
-                System.out.println("1+++++++"+row2.getCell(1));
+                examQuestion1.setKnowledge(row2.getCell(1).getStringCellValue());
-                if(row2.getCell(1).getStringCellValue().equals("中")){
+                if(row2.getCell(2).getStringCellValue().equals("中")){
                     examQuestion1.setDifficulty(2f);
-                }else if(row2.getCell(1).getStringCellValue().equals("难")){
+                }
+                if(row2.getCell(2).getStringCellValue().equals("难")){
                     examQuestion1.setDifficulty(3f);
-                } else if(row2.getCell(1).getStringCellValue().equals("易")){
+                }
+                if(row2.getCell(2).getStringCellValue().equals("易")){
                     examQuestion1.setDifficulty(1f);
-                }else  if(row2.getCell(1).getStringCellValue().equals("")){
-                    examQuestion1.setDifficulty(null);
                 }
-                Cell cell1 = row2.getCell(2);
+                Cell cell1 = row2.getCell(3);
                 cell1.setCellType(CellType.STRING);
-                if (row2.getCell(2).getStringCellValue().isEmpty()){
+                examQuestion1.setDefaultScore(Float.valueOf(cell1.getStringCellValue()));
-                    examQuestion1.setDefaultScore(null);
+                
-                }else {
+                if(row2.getCell(4)!=null) {
-                    examQuestion1.setDefaultScore(Float.valueOf(row2.getCell(2).getStringCellValue()));
+                	examQuestion1.setAnalysis(row2.getCell(4).getStringCellValue());
-                }
-                if(row2.getCell(3)!=null) {
-                	examQuestion1.setAnalysis(row2.getCell(3).getStringCellValue());
                 }else {
                 	examQuestion1.setAnalysis("");
                 }
                 
-                String cvalue=row2.getCell(4).getStringCellValue();
+                String cvalue=row2.getCell(5).getStringCellValue();
                 examQuestion1.setAnswer(cvalue.equals("正确")? "true":"false");
                 if(examQuestion1!=null){
                     examQuestions2.add(examQuestion1);