Merge remote-tracking branch 'java-servse-yx/zcwy0912-llf' into zcwy0912-llf

视频解析添加日志
恢复
2025-12-10 03:16:48 +08:00 · 2024-10-21 11:07:47 +08:00 · 2024-10-21 11:06:36 +08:00 · 2024-09-30 13:20:31 +08:00 · 2024-09-30 11:57:55 +08:00 · 2024-09-30 11:51:47 +08:00
15 changed files with 353 additions and 167 deletions
--- a/servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java
@@ -12,13 +12,10 @@ import com.xboe.module.dict.entity.DictDto;
 import com.xboe.module.exam.entity.ExamTest;
 import com.xboe.school.study.entity.StudyCourse;
 import com.xboe.system.user.dao.UserDao;
-import com.xboe.system.user.entity.User;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import java.util.Optional;
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseWareApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseWareApi.java
@@ -9,6 +9,7 @@ import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -28,6 +29,7 @@ import com.xboe.module.course.service.ICourseFileService;
 */
@RestController
@RequestMapping(value = "/xboe/m/course/cware")
+@Slf4j
 public class CourseWareApi extends ApiBaseController {

 	private String cookieName = "PLAYSIGN_TIME";
@@ -131,6 +133,8 @@ public class CourseWareApi extends ApiBaseController {
 		// 第一个/前端是时间
 		int index = signStr.indexOf("/");
 		if (index <= 0) {
+			log.info("解密后的字符串:"+signStr);
+			log.info("解密后的字符串的时间拼接:"+index);
 			return badRequest("验证错误");
 		}

@@ -138,9 +142,13 @@ public class CourseWareApi extends ApiBaseController {
 		String cfid = signStr.substring(index+1);// 文件路径

 		if (!time.equals(cookieTime)) {
+			log.info("请求头时间和解析后的时间对比:"+"解析时间:"+time+"    请求头时间："+cookieTime);
+			log.info("解密后的字符串的时间拼接:"+signStr);
 			return badRequest("验证错误");
 		}
 		if(StringUtils.isBlank(cfid) || cfid.length()<10) {
+			log.info("查看时间文件路径："+cfid);
+			log.info("解密后的字符串的时间拼接:"+signStr);
 			return badRequest("验证错误");
 		}

--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseContent.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseContent.java
@@ -83,8 +83,13 @@ public class CourseContent extends BaseEntity {
     * */
    @Column(name = "duration")
    private Integer duration;
-    
-    
+
+    /**
+     * 视频播放进度
+     * */
+    @Column(name = "progress_video")
+    private Float progressVideo;
+
    /**用于学习时的状态显示，非存储字段*/
    @Transient
    private Integer status;
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseContentService.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseContentService.java
@@ -82,4 +82,7 @@ public interface ICourseContentService{
 	 * @return
 	 */
 	CourseAssess getAssess(String ccid);
+
+	void updateProcessVideo(String contentId, String courseId, Float processVideo);
+
 }
--- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseContentServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseContentServiceImpl.java
@@ -1,5 +1,7 @@
 package com.xboe.module.course.service.impl;

+import java.sql.PreparedStatement;
+import java.sql.SQLException;
 import java.util.List;

 import javax.annotation.Resource;
@@ -141,6 +143,17 @@ public class CourseContentServiceImpl implements ICourseContentService {
 		return assess;
 	}

+	@Override
+	@Transactional
+	public void updateProcessVideo(String id, String courseId, Float progressVideo) {
+		// 处理 processVideo 为 null 的情况
+		if (progressVideo == null) {
+			progressVideo = 0.00f;
+		}
+		String sql = "UPDATE boe_course_content SET progress_video = "+ progressVideo+" WHERE id = "+ id+" AND course_id = "+ courseId+" ";
+		ccDao.sqlUpdate(sql);
+	}
+
 	@Override
 	@Transactional
 	public void updateName(String id, String name) {
--- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/AloneExamApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/AloneExamApi.java
@@ -355,17 +355,17 @@ public class AloneExamApi extends ApiBaseController {
    			return badRequest("此考试无试卷内容，考试已经过期或试卷已被删除");
    		}
            try {
-            	List<TestQuestionVo> qlist=this.randomQuestion(examTest, paperJson);
-            	ObjectMapper objectMapper = new ObjectMapper();
-            	paperJson=objectMapper.writeValueAsString(qlist);
-			} catch (XaskException e) {
-				log.error("生成试卷错误",e);
-				return error("生成考试试卷错误",e.getMessage(),map);
-			} catch (JsonProcessingException e) {
-				log.error("生成试卷，解析生成json错误",e);
-				return error("生成考试试卷解析错误",e.getMessage(),map);
-			}
-    	}
+                List<TestQuestionVo> qlist=this.randomQuestion(examTest, paperJson);
+                ObjectMapper objectMapper = new ObjectMapper();
+                paperJson=objectMapper.writeValueAsString(qlist);
+            } catch (XaskException e) {
+                log.error("生成试卷错误",e);
+                return error("生成考试试卷错误",e.getMessage(),map);
+            } catch (JsonProcessingException e) {
+                log.error("生成试卷，解析生成json错误",e);
+                return error("生成考试试卷解析错误",e.getMessage(),map);
+            }
+        }
    	map.put("paper", paperJson);
    	long end=System.currentTimeMillis();
    	log.info("开始考试用时="+(end-start)+" ms");
--- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamQuestionApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamQuestionApi.java
@@ -166,118 +166,258 @@ public class ExamQuestionApi extends ApiBaseController {
                return badRequest("请上传正确的试题文件");
            }
            //获取表头
-            Row row = sheetAt.getRow(1);
+            Row row ;
            //从第二行开始获取数据
            List<ExamQuestion> examQuestions1 = new ArrayList<>();
            QuestionDto questionDto = new QuestionDto();
+            if(sheetAt.getRow(1).getCell(0).getStringCellValue().equals("标题(*)") && !sheetAt.getRow(1).getCell(0).getStringCellValue().equals("")){
+                row = sheetAt.getRow(1);
+                for (int i = 2;i<sheetAt.getPhysicalNumberOfRows();i++) {
+                    //获取每一行

-            for (int i=2;i<sheetAt.getPhysicalNumberOfRows();i++) {
-                //获取每一行
-
-                Row row1 = sheetAt.getRow(i);
-                if(row1==null || row1.getCell(0)==null){
-                    break;
-                }
-                if(StringUtil.isBlank(row1.getCell(0).getStringCellValue())){
-                    break;
-                }
-                ExamQuestion examQuestion = new ExamQuestion();
-                examQuestion.setTitle(row1.getCell(0).getStringCellValue());
-                if(row1.getCell(1).getStringCellValue().equals("单选题")){
-                    examQuestion.setType(1);
-                }
-                if(row1.getCell(1).getStringCellValue().equals("多选题")){
-                    examQuestion.setType(2);
-                }
-                examQuestion.setKnowledge(row1.getCell(2).getStringCellValue());
-                if(row1.getCell(3).getStringCellValue().equals("中")){
-                    examQuestion.setDifficulty(2f);
-                }
-                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);
+                    Row row1 = sheetAt.getRow(i);
+                    if(row1==null || row1.getCell(0)==null){
+                        break;
+                    }
+                    if(StringUtil.isBlank(row1.getCell(0).getStringCellValue())){
+                        break;
+                    }
+                    ExamQuestion examQuestion = new ExamQuestion();
+                    examQuestion.setTitle(row1.getCell(0).getStringCellValue());
+                    if(row1.getCell(1).getStringCellValue().equals("单选题")){
+                        examQuestion.setType(1);
+                    }
+                    if(row1.getCell(1).getStringCellValue().equals("多选题")){
+                        examQuestion.setType(2);
+                    }
+                    if(row1.getCell(2).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);
+                    cell.setCellType(CellType.STRING);

 //                examQuestion.setDefaultScore(Float.valueOf(cell.getStringCellValue()));

-                //单选
-                if (!cell.getStringCellValue().contains(",")){
-                    examQuestion.setAnswer(row1.getCell(6).getStringCellValue());
-                    examQuestion.setDefaultScore(Float.valueOf(row1.getCell(4).getStringCellValue()));
-                    Cell cell1 = row1.getCell(5, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
-                    cell1.setCellType(CellType.STRING);
-                    examQuestion.setAnalysis(cell1.getStringCellValue());
+                    //单选
+                    if (!cell.getStringCellValue().contains(",")){
+                        examQuestion.setAnswer(row1.getCell(5).getStringCellValue());
+                        if (row1.getCell(3).getStringCellValue().isEmpty()){
+                            examQuestion.setDefaultScore(null);
+                        }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=7;j<=13;j++) {
+                        List<ExamOption> examOptions = new ArrayList<>();
+                        for (int j=6;j<=12;j++) {

-                        if(row1.getCell(j)!=null) {
-                            ExamOption examOption = new ExamOption();
+                            if(row1.getCell(j)!=null) {
+                                ExamOption examOption = new ExamOption();
 //                            截取表头
-                            String substring = row.getCell(j).getStringCellValue().substring(3, 4);
-                            if (row1.getCell(6).getStringCellValue().contains(substring)) {
+                                String substring = row.getCell(j).getStringCellValue().substring(3, 4);
+                                if (row1.getCell(5).getStringCellValue().contains(substring)) {

-                                examOption.setIsAnswer(true);
-                                examOption.setScore(Float.valueOf(row1.getCell(4).getStringCellValue()));
-                            } else {
-                                examOption.setIsAnswer(false);
-                            }
-                            if (examOption.getIsAnswer()) {
-                                examOption.setScore(Float.valueOf(row1.getCell(4).getStringCellValue()));
-                            }
+                                    examOption.setIsAnswer(true);
+                                    if (row1.getCell(3).getStringCellValue().isEmpty()){
+                                        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(null);
+                                    }else {
+                                        examOption.setScore(Float.valueOf(row1.getCell(3).getStringCellValue()));
+                                    }
+                                }

-                            examOption.setOptions(row.getCell(j).getStringCellValue());
+                                examOption.setOptions(row.getCell(j).getStringCellValue());

-                            Cell cell2 = row1.getCell(j);
-                            cell2.setCellType(CellType.STRING);
-                            examOption.setContent(cell2.getStringCellValue());
+                                Cell cell2 = row1.getCell(j);
+                                cell2.setCellType(CellType.STRING);
+                                examOption.setContent(cell2.getStringCellValue());

-                            if (examOption != null && StringUtil.isNotBlank(examOption.getContent())) {
-                                examOptions.add(examOption);
+                                if (examOption != null && StringUtil.isNotBlank(examOption.getContent())) {
+                                    examOptions.add(examOption);
+                                }
                            }
                        }
-                    }

-                    examQuestion.setOptionList(examOptions);
-                    examQuestions1.add(examQuestion);
-                }
-                //多选 多选的默认分存的是最大分
-                else{
-                    String stringCellValue = row1.getCell(4).getStringCellValue();
-                    String[] strings = stringCellValue.split(",");
+                        examQuestion.setOptionList(examOptions);
+                        examQuestions1.add(examQuestion);
+                    }
+                    //多选 多选的默认分存的是最大分
+                    else{
+                        String stringCellValue = row1.getCell(4).getStringCellValue();
+                        String[] strings = stringCellValue.split(",");
 //                    String[] strings = new String[stringCellValue.length()];
-                    String max=strings[0];
-                    for (int j=0;j<strings.length;j++) {
-                        if(Float.valueOf(max)<Float.valueOf(strings[j])){
-                            max=strings[j];
-                        }
-                    }
-                    examQuestion.setDefaultScore(Float.valueOf(max));
-                    Cell cell1 = row1.getCell(5, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
-                    cell1.setCellType(CellType.STRING);
-                    examQuestion.setAnalysis(cell1.getStringCellValue());
-                    examQuestion.setAnswer(row1.getCell(6).getStringCellValue());
-                    List<ExamOption> examOptions = new ArrayList<>();
-                    //A
-                    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-7]));
-                            if(examOption!=null && StringUtil.isNotBlank(examOption.getContent())){
-                                examOptions.add(examOption);
+                        String max=strings[0];
+                        for (int j=0;j<strings.length;j++) {
+                            if(Float.valueOf(max)<Float.valueOf(strings[j])){
+                                max=strings[j];
                            }
+                        }
+                        examQuestion.setDefaultScore(Float.valueOf(max));
+                        Cell cell1 = row1.getCell(4, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
+                        cell1.setCellType(CellType.STRING);
+                        examQuestion.setAnalysis(cell1.getStringCellValue());
+                        examQuestion.setAnswer(row1.getCell(5).getStringCellValue());
+                        List<ExamOption> examOptions = new ArrayList<>();
+                        //A
+                        for (int j=6;j<=12;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]));
+                                if(examOption!=null && StringUtil.isNotBlank(examOption.getContent())){
+                                    examOptions.add(examOption);
+                                }

+                            }
+                        }
+                        examQuestion.setOptionList(examOptions);
+                        examQuestions1.add(examQuestion);
+                    }
+                }
+            }else {
+                row = sheetAt.getRow(2);
+                for (int i = 3;i<sheetAt.getPhysicalNumberOfRows();i++) {
+                    //获取每一行
+
+                    Row row1 = sheetAt.getRow(i);
+                    if(row1==null || row1.getCell(0)==null){
+                        break;
+                    }
+                    if(StringUtil.isBlank(row1.getCell(0).getStringCellValue())){
+                        break;
+                    }
+                    ExamQuestion examQuestion = new ExamQuestion();
+                    examQuestion.setTitle(row1.getCell(0).getStringCellValue());
+                    if(row1.getCell(1).getStringCellValue().equals("单选题")){
+                        examQuestion.setType(1);
+                    }
+                    if(row1.getCell(1).getStringCellValue().equals("多选题")){
+                        examQuestion.setType(2);
+                    }
+                    log.debug("row1.getCell(2) = " + row1.getCell(2));
+                    if (row1.getCell(2)==null ||row1.getCell(2).getStringCellValue() == null  || row1.getCell(2).getStringCellValue().equals("")){
+                        examQuestion.setDifficulty(null);
+                    }else{
+                        if( row1.getCell(2).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);
                        }
                    }
-                    examQuestion.setOptionList(examOptions);
-                    examQuestions1.add(examQuestion);
+                    Cell cell = row1.getCell(3);
+                    cell.setCellType(CellType.STRING);
+
+//                examQuestion.setDefaultScore(Float.valueOf(cell.getStringCellValue()));
+
+                    //单选
+                    if (!cell.getStringCellValue().contains(",")){
+                        examQuestion.setAnswer(row1.getCell(5).getStringCellValue());
+                        if (row1.getCell(3).getStringCellValue().isEmpty()){
+                            examQuestion.setDefaultScore(null);
+                        }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++) {
+
+                            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)) {
+
+                                    examOption.setIsAnswer(true);
+                                    if (row1.getCell(3).getStringCellValue().isEmpty()){
+                                        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(null);
+                                    }else {
+                                        examOption.setScore(Float.valueOf(row1.getCell(3).getStringCellValue()));
+                                    }
+                                }
+
+                                examOption.setOptions(row.getCell(j).getStringCellValue());
+
+                                Cell cell2 = row1.getCell(j);
+                                cell2.setCellType(CellType.STRING);
+                                examOption.setContent(cell2.getStringCellValue());
+
+                                if (examOption != null && StringUtil.isNotBlank(examOption.getContent())) {
+                                    examOptions.add(examOption);
+                                }
+                            }
+                        }
+
+                        examQuestion.setOptionList(examOptions);
+                        examQuestions1.add(examQuestion);
+                    }
+                    //多选 多选的默认分存的是最大分
+                    else{
+                        String stringCellValue = row1.getCell(4).getStringCellValue();
+                        String[] strings = stringCellValue.split(",");
+//                    String[] strings = new String[stringCellValue.length()];
+                        String max=strings[0];
+                        for (int j=0;j<strings.length;j++) {
+                            if(Float.valueOf(max)<Float.valueOf(strings[j])){
+                                max=strings[j];
+                            }
+                        }
+                        examQuestion.setDefaultScore(Float.valueOf(max));
+                        Cell cell1 = row1.getCell(4, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
+                        cell1.setCellType(CellType.STRING);
+                        examQuestion.setAnalysis(cell1.getStringCellValue());
+                        examQuestion.setAnswer(row1.getCell(5).getStringCellValue());
+                        List<ExamOption> examOptions = new ArrayList<>();
+                        //A
+                        for (int j=6;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]));
+                                if(examOption!=null && StringUtil.isNotBlank(examOption.getContent())){
+                                    examOptions.add(examOption);
+                                }
+
+                            }
+                        }
+                        examQuestion.setOptionList(examOptions);
+                        examQuestions1.add(examQuestion);
+                    }
                }
            }
            //判断题  只存在试题表中
@@ -300,27 +440,30 @@ public class ExamQuestionApi extends ApiBaseController {
                ExamQuestion examQuestion1 = new ExamQuestion();
                examQuestion1.setTitle(row2.getCell(0).getStringCellValue());
                examQuestion1.setType(3);
-                examQuestion1.setKnowledge(row2.getCell(1).getStringCellValue());
-                if(row2.getCell(2).getStringCellValue().equals("中")){
+                System.out.println("1+++++++"+row2.getCell(1));
+                if(row2.getCell(1).getStringCellValue().equals("中")){
                    examQuestion1.setDifficulty(2f);
-                }
-                if(row2.getCell(2).getStringCellValue().equals("难")){
+                }else if(row2.getCell(1).getStringCellValue().equals("难")){
                    examQuestion1.setDifficulty(3f);
-                }
-                if(row2.getCell(2).getStringCellValue().equals("易")){
+                } else if(row2.getCell(1).getStringCellValue().equals("易")){
                    examQuestion1.setDifficulty(1f);
+                }else  if(row2.getCell(1).getStringCellValue().equals("")){
+                    examQuestion1.setDifficulty(null);
                }
-                Cell cell1 = row2.getCell(3);
+                Cell cell1 = row2.getCell(2);
                cell1.setCellType(CellType.STRING);
-                examQuestion1.setDefaultScore(Float.valueOf(cell1.getStringCellValue()));
-                
-                if(row2.getCell(4)!=null) {
-                	examQuestion1.setAnalysis(row2.getCell(4).getStringCellValue());
+                if (row2.getCell(2).getStringCellValue().isEmpty()){
+                    examQuestion1.setDefaultScore(null);
+                }else {
+                    examQuestion1.setDefaultScore(Float.valueOf(row2.getCell(2).getStringCellValue()));
+                }
+                if(row2.getCell(3)!=null) {
+                	examQuestion1.setAnalysis(row2.getCell(3).getStringCellValue());
                }else {
                	examQuestion1.setAnalysis("");
                }
                
-                String cvalue=row2.getCell(5).getStringCellValue();
+                String cvalue=row2.getCell(4).getStringCellValue();
                examQuestion1.setAnswer(cvalue.equals("正确")? "true":"false");
                if(examQuestion1!=null){
                    examQuestions2.add(examQuestion1);
--- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/ExamTest.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/ExamTest.java
@@ -28,7 +28,7 @@ public class ExamTest extends BaseEntity {
    /**
    * 考试名称
     * */
-    @Column(name = "test_name",nullable = false,length = 50)
+    @Column(name = "test_name",length = 50)
    private String testName;
    
    /**
@@ -46,7 +46,7 @@ public class ExamTest extends BaseEntity {
    /**
    * 考试时长    分钟
     * */
-    @Column(name = "test_duration",nullable = false)
+    @Column(name = "test_duration")
    private Integer testDuration;
    /**
     * 显示解析
@@ -107,13 +107,13 @@ public class ExamTest extends BaseEntity {
    /**
     * 考试的类型
     * */
-    @Column(name = "test_type",nullable = false)
+    @Column(name = "test_type")
    private Integer testType;
    
    /**
     * 发布状态 ，是否已发布
     */
-    @Column(name = "published",length = 1,nullable = false)
+    @Column(name = "published",length = 1)
    private Boolean published;
    /**
     * 发布时间
@@ -154,7 +154,7 @@ public class ExamTest extends BaseEntity {
    /**
     * 范围，1表独立使用，2表课程内部
     * */
-    @Column(name = "range_type",nullable = false)
+    @Column(name = "range_type")
    private Integer rangeType;

    /**
--- a/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/ExamTestServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/ExamTestServiceImpl.java
@@ -95,7 +95,7 @@ public class ExamTestServiceImpl implements IExamTestService {

    @Override
    public Boolean has(String paperId) {
-    	ExamTest et=examTestDao.findOne(FieldFilters.eq("paperId", paperId));
+    	ExamTest et=examTestDao.findOne(FieldFilters.eq("paperId", paperId),FieldFilters.eq("deleted", false));
    	//String etId= (String)examTestDao.findField("id", FieldFilters.eq("paperId", paperId));
        if(et==null){
            return true;
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java
@@ -11,6 +11,7 @@ import com.xboe.api.vo.*;
 import com.xboe.module.course.vo.TeacherVo;
 import com.xboe.module.usergroup.entity.UserGroupItem;
 import com.xboe.module.usergroup.service.IUserGroupService;
+import com.xboe.school.study.dao.StudyCourseDao;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -65,7 +66,9 @@ import javax.servlet.http.HttpServletRequest;
@RestController
@RequestMapping(value="/xboe/school/study/course")
 public class StudyCourseApi extends ApiBaseController{
-	
+
+
+
 	@Autowired
 	IStudyCourseService service;
 	
@@ -321,8 +324,19 @@ public class StudyCourseApi extends ApiBaseController{
 		if (StringUtils.isEmpty(token)) {
 			token = request.getHeader("token");
 		}
+
+
 		//检查是否已存在
 		StudyCourseItem item = studyService.checkHas(sci.getStudyId(),sci.getContentId());
+
+		// 20240815 特训营结营考试 临时代码
+//		if(item != null && redisTemplate.opsForValue().get(item.getId())==null){
+//			redisTemplate.opsForValue().set(item.getId(),item.getId());
+//			//设置过期时间为1天
+//			redisTemplate.expire(item.getId(), 60, TimeUnit.SECONDS);
+//		}else{
+//			return success("");
+//		}
 		if(item!=null) {
 			//如果记录存在，但是进度不100无成情况，就更新进度，一期不会有这种情况
 			if(item.getProgress()<100 && sci.getProgress()>item.getProgress()) {
@@ -407,6 +421,14 @@ public class StudyCourseApi extends ApiBaseController{
 		StudyCourseItem item = studyService.checkHas(sci.getStudyId(),sci.getContentId());
 		if(item!=null) {
 			//如果记录存在，但是进度不到100，未完成情况，就更新进度，一期不会有这种情况
+			// 20240815 特训营结营考试 临时代码
+//			if(item != null && redisTemplate.opsForValue().get(item.getId())==null){
+//				redisTemplate.opsForValue().set(item.getId(),item.getId());
+//				//设置过期时间为1天
+//				redisTemplate.expire(item.getId(), 60, TimeUnit.SECONDS);
+//			}else{
+//				return success("");
+//			}
 			if(item.getProgress()<100) {
 				studyService.updateProcess(item.getId(),sci.getStudyId(),sci.getCourseId(), sci.getContentTotal(),100,token);
 			}
@@ -512,6 +534,14 @@ public class StudyCourseApi extends ApiBaseController{
 			token = request.getHeader("token");
 		}
 		try {
+			// 20240815 特训营结营考试 临时代码
+//			if(itemId != null && redisTemplate.opsForValue().get(itemId)==null){
+//				redisTemplate.opsForValue().set(itemId,itemId);
+//				//设置过期时间为1天
+//				redisTemplate.expire(itemId, 60, TimeUnit.SECONDS);
+//			}else{
+//				return success(true);
+//			}
 			studyService.finishVideoStudyItem(itemId, studyId,courseId,cnum,token);
 			List<StudyCourse> allUserList = thirdApi.getStudyCourseList(studyId ,courseId, token);
 			log.info("在线课学习记录"+allUserList);
@@ -529,7 +559,7 @@ public class StudyCourseApi extends ApiBaseController{
 	 * @return
 	 */
 	@PostMapping("/study-video-time")
-	public JsonResponse<Boolean> study(String studyId,String itemId,Integer videoTime){
+	public JsonResponse<Boolean> study(String itemId,Integer videoTime,String contentId , String courseId,Float progressVideo){
 		
 		if(StringUtils.isBlank(itemId)){
 			return error("参数错误");
@@ -539,7 +569,10 @@ public class StudyCourseApi extends ApiBaseController{
 		}
 		//检查是否已存在
 		try {
-			studyService.updateLastTime(itemId,videoTime,getCurrent().getAccountId());
+			studyService.updateLastTime(itemId,videoTime, getCurrent().getAccountId());
+			if (contentId != null && courseId != null && progressVideo != null){
+				contentService.updateProcessVideo(contentId, courseId, progressVideo);
+			}
 			return success(true);
 		}catch(Exception e) {
 			log.error("记录最后学习时间错误",e);
@@ -690,9 +723,10 @@ public class StudyCourseApi extends ApiBaseController{
 			return error("查询失败",e.getMessage());
 		}
 	}
+
 	
 	@RequestMapping(value="/study-course-content",method = {RequestMethod.GET,RequestMethod.POST})
-	public JsonResponse<StudyCourseItem> findStudyCourseItem(String studyId,String contentId){
+	public JsonResponse<StudyCourseItem> findStudyCourseItem(String studyId,String contentId, HttpServletRequest request){
 		if(StringUtils.isBlank(studyId)){
 			return error("无学习信息");
 		}
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyExamApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyExamApi.java
@@ -7,6 +7,7 @@ import java.util.Map;
 import java.util.concurrent.TimeUnit;

 import com.xboe.api.ThirdApi;
+import com.xboe.school.study.dao.StudyCourseDao;
 import com.xboe.school.study.entity.StudyCourse;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +33,8 @@ import javax.servlet.http.HttpServletRequest;
@RestController
@RequestMapping(value="/xboe/school/study/exam")
 public class StudyExamApi extends ApiBaseController{
+	@Autowired
+	StudyCourseDao scDao;

 	@Autowired
 	IStudyExamService sexamService;
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyAssessServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyAssessServiceImpl.java
@@ -44,7 +44,7 @@ public class StudyAssessServiceImpl implements IStudyAssessService{
 			LocalDateTime ldt=LocalDateTime.now();
 			sci.setStudyId(assess.getStudyId());
 			sci.setContentId(assess.getContentId());
-			//sci.setContentName(homework.getContentName());
+			sci.setContentName("评估");
 			sci.setCourseId(assess.getCourseId());
 			//sci.setCsectionId(homework.getCsectionId());
 			sci.setProgress(100);//直接设置为学习完成
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyExamServiceImpl.java
@@ -82,7 +82,7 @@ public class StudyExamServiceImpl implements IStudyExamService{
 			LocalDateTime ldt=LocalDateTime.now();
 			sci.setStudyId(exam.getStudyId());
 			sci.setContentId(exam.getContentId());
-			//sci.setContentName(homework.getContentName());
+			sci.setContentName("考试");
 			sci.setCourseId(exam.getCourseId());
 			//sci.setCsectionId(homework.getCsectionId());
 			sci.setProgress(prog);//直接设置为学习完成
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyHomeWorkServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyHomeWorkServiceImpl.java
@@ -46,7 +46,7 @@ public class StudyHomeWorkServiceImpl implements IStudyHomeWorkService{
 			LocalDateTime ldt=LocalDateTime.now();
 			sci.setStudyId(homework.getStudyId());
 			sci.setContentId(homework.getContentId());
-			//sci.setContentName(homework.getContentName());
+			sci.setContentName(homework.getHwName());
 			sci.setCourseId(homework.getCourseId());
 			//sci.setCsectionId(homework.getCsectionId());
 			sci.setProgress(100);//直接设置为学习完成
@@ -67,7 +67,7 @@ public class StudyHomeWorkServiceImpl implements IStudyHomeWorkService{
 			//只是保留一条作业记录，不再保存多条记录了
 			//dao.save(homework);
 			//设置id。然后进行悠
-			homework.setId(obj.toString());
+			homework.setId(homework.getStudyItemId());
 			dao.update(homework);
 		}
 	}
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java
@@ -98,8 +98,12 @@ public class StudyServiceImpl implements IStudyService{
 		//sci.setProgress(100);//直接设置为学习完成
 		sci.setLastTime(ldt);
 		scItemDao.saveOrUpdate(sci);
-		
-		dto.setStudyItemId(sci.getId());
+		if (sci.getId() != null){
+			dto.setStudyItemId(sci.getId());
+		}else {
+			log.info("学习记录插入失败"+sci.getId());
+			throw new IllegalArgumentException("学习记录插入失败");
+		}
 		//检查是否全部学习完成
 		scDao.finishCheck(dto.getStudyId(),dto.getCourseId(),dto.getContentTotal(),token);
 		
@@ -182,7 +186,7 @@ public class StudyServiceImpl implements IStudyService{
 		if(StringUtils.isNotBlank(name)) {
 			query.addFilter(FieldFilters.eq("aname", name));
 		}
-		int pageIndex2 = pageIndex-1;
+		int pageIndex2 = (pageIndex-1)*10;
 		if(status!=null) {
 			if(status==3) {
 				query.addFilter(FieldFilters.eq("status", 2));
@@ -193,16 +197,16 @@ public class StudyServiceImpl implements IStudyService{
 			}else if (status == 1) {
 				String sql = "select bsc.id,bsc.course_id,bsc.course_name,bsc.aname,item.content_id,0 as progress,1 as status from boe_study_course bsc " +
 						" left join boe_study_course_item item on bsc.course_id = item.course_id and bsc.id = item.study_id" +
-						" where bsc.course_id = '"+courseId+"' and bsc.id not in(" +
+						" where bsc.course_id = '"+courseId+"' and bsc.aname like '%"+name+"%' and bsc.id not in(" +
 						" select item.study_id from boe_study_course_item item " +
-						" where item.course_id = '" + courseId + "' and item.content_id = '"+ contentId+"' group by item.study_id" +
+						" where item.course_id = '" + courseId + "' and item.content_id = '"+ contentId+"' and item.aname like '%"+name+"%' group by item.study_id" +
 						" ) group by bsc.id limit "+ pageIndex2+","+ pageSize+";";

 				String sql2 = "select count(*) as total from (select bsc.id,bsc.course_id,bsc.course_name,bsc.aname,item.content_id,0 as progress,1 as status from boe_study_course bsc " +
 						" left join boe_study_course_item item on bsc.course_id = item.course_id and bsc.id = item.study_id" +
-						" where bsc.course_id = '"+courseId+"' and bsc.id not in(" +
+						" where bsc.course_id = '"+courseId+"' and bsc.aname like '%"+name+"%' and bsc.id not in(" +
 						" select item.study_id from boe_study_course_item item " +
-						" where item.course_id = '" + courseId + "' and item.content_id = '"+ contentId+"' group by item.study_id" +
+						" where item.course_id = '" + courseId + "' and item.content_id = '"+ contentId+"' and item.aname like '%"+name+"%' group by item.study_id" +
 						" ) group by bsc.id) as total";
 				log.info("资源完成情况未开始sql"+sql);
 				List<Object[]> list = scDao.sqlFindList(sql);
@@ -224,46 +228,22 @@ public class StudyServiceImpl implements IStudyService{
 				return pageList;
 			}
 		}
-//		String sql = "select * from (select bsc.id,bsc.course_id,bsc.course_name,bsc.aname,item.progress,item.status from boe_study_course bsc left join " +
-//				"boe_study_course_item item on item.course_id = bsc.course_id and item.study_id = bsc.id " +
-//				"where bsc.`status` in (2,9) and bsc.course_id = '"+ courseId+"' group by bsc.id " +
-//				" UNION ALL " +
-//				" select bsc.id,bsc.course_id,bsc.course_name,bsc.aname,0 as progress,1 as status from boe_study_course bsc " +
-//				" LEFT JOIN boe_study_course_item item on item.course_id = bsc.course_id " +
-//				" where bsc.course_id = '"+courseId+"' and bsc.id not in (" +
-//				" select bsc.id from boe_study_course bsc " +
-//				" left join boe_study_course_item item on item.course_id = bsc.course_id and item.study_id = bsc.id " +
-//				" where bsc.course_id = '" + courseId + "' and item.content_id = '"+ contentId+"' group by bsc.id" +
-//				" )group by bsc.id) a group by a.id limit "+ pageIndex+","+ pageSize+";";
-
-//		String sql2 = "select count(*) from (select bsc.id,bsc.course_id,bsc.course_name,bsc.aname,item.progress,item.status from boe_study_course bsc left join " +
-//				"boe_study_course_item item on item.course_id = bsc.course_id and item.study_id = bsc.id " +
-//				"where bsc.`status` in (2,9) and bsc.course_id = '"+ courseId+"' group by bsc.id " +
-//				" UNION ALL " +
-//				" select bsc.id,bsc.course_id,bsc.course_name,bsc.aname,0 as progress,1 as status from boe_study_course bsc " +
-//				" LEFT JOIN boe_study_course_item item on item.course_id = bsc.course_id " +
-//				" where bsc.course_id = '"+courseId+"' and bsc.id not in (" +
-//				" select bsc.id from boe_study_course bsc " +
-//				" left join boe_study_course_item item on item.course_id = bsc.course_id and item.study_id = bsc.id " +
-//				" where bsc.course_id = '" + courseId + "' and item.content_id = '"+ contentId+"' group by bsc.id" +
-//				" )group by bsc.id) a group by a.id";
-
 		String sql = "select a.id, a.course_id, a.course_name, a.aname, " +
 				"IFNULL(b.finish_time, '0') as finish_time, IFNULL(b.progress, 0) as progress, IFNULL(b.status, 1) as status " +
-				"from (select id, course_id, course_name, aname, 0, 1 from boe_study_course where course_id = '" + courseId + "') a " +
+				"from (select id, course_id, course_name, aname, 0, 1 from boe_study_course where course_id = '" + courseId + "' and aname like '%"+name+"%') a " +
 				"left join " +
 				"(select bsc.id, bsc.course_id, bsc.course_name, bsc.aname, item.finish_time, item.progress, item.status " +
 				"from boe_study_course bsc left join boe_study_course_item item on item.course_id = bsc.course_id and item.study_id = bsc.id " +
-				"where bsc.course_id = '" + courseId + "' and item.content_id = '" + contentId + "' group by bsc.id) b " +
+				"where bsc.course_id = '" + courseId + "' and item.content_id = '" + contentId + "' and item.aname like '%"+name+"%' group by bsc.id) b " +
 				"on a.course_id = b.course_id and a.id = b.id " +
 				"group by a.id limit "+ pageIndex2+","+ pageSize+";";
 		String sql2 = "select count(*) as total from (select a.id, a.course_id, a.course_name, a.aname, " +
 				"IFNULL(b.finish_time, 0) as finish_time, IFNULL(b.progress, 0) as progress, IFNULL(b.status, 1) as status " +
-				"from (select id, course_id, course_name, aname, 0, 1 from boe_study_course where course_id = '" + courseId + "') a " +
+				"from (select id, course_id, course_name, aname, 0, 1 from boe_study_course where course_id = '" + courseId + "' and aname like '%"+name+"%') a " +
 				"left join " +
 				"(select bsc.id, bsc.course_id, bsc.course_name, bsc.aname, item.finish_time, item.progress, item.status " +
 				"from boe_study_course bsc left join boe_study_course_item item on item.course_id = bsc.course_id and item.study_id = bsc.id " +
-				"where bsc.course_id = '" + courseId + "' and item.content_id = '" + contentId + "' group by bsc.id) b " +
+				"where bsc.course_id = '" + courseId + "' and item.content_id = '" + contentId + "' and item.aname like '%"+name+"%' group by bsc.id) b " +
 				"on a.course_id = b.course_id and a.id = b.id " +
 				"group by a.id) as total";
 		log.info("资源完成情况全部sql"+sql);
Author	SHA1	Message	Date
zhaolongfei	a8ce10c575	Merge remote-tracking branch 'java-servse-yx/zcwy0912-llf' into zcwy0912-llf	2024-10-21 11:07:47 +08:00
zhaolongfei	70a87ac812	视频解析添加日志	2024-10-21 11:06:36 +08:00
Wangxxz	5285506f0f	恢复	2024-09-30 13:20:31 +08:00
Wangxxz	33df8b0831	加判断	2024-09-30 11:57:55 +08:00
Wangxxz	effb45c6d0	加判断	2024-09-30 11:51:47 +08:00
zhaolongfei	3af3c2eedf	考试随机试题功能修改	2024-09-29 11:17:00 +08:00
zhaolongfei	57e04f46c0	试题管理模板修改	2024-09-27 14:22:51 +08:00
zhaolongfei	2e2edbbf57	试题管理模板修改	2024-09-13 16:02:26 +08:00
zhaolongfei	beba553faa	试题管理模板修改	2024-09-13 15:08:45 +08:00
zhaolongfei	120a4f45fc	试题管理模板修改	2024-09-12 14:35:13 +08:00
nisen	18bb8a434a	Merge branch 'master-0705' into 121-master	2024-09-05 14:57:17 +08:00
nisen	2ae3d99f21	Merge branch 'zcwy0823-llf' into master-0705	2024-08-23 19:44:02 +08:00
zhaolongfei	89573debef	在线课考试添加任务计算,redis放开	2024-08-23 19:43:18 +08:00
nisen	457597eabc	Merge branch 'zcwy0823-llf' into master-0705	2024-08-23 19:28:25 +08:00
zhaolongfei	24ae3c0ec6	在线课考试添加任务计算,暂时注释redis	2024-08-23 19:27:31 +08:00
zhaolongfei	fffa12344a	在线课考试添加任务计算,回退	2024-08-23 18:54:38 +08:00
nisen	52a58a6c6f	Merge branch 'zcwy0823-llf' into master-0705	2024-08-23 18:45:46 +08:00
zhaolongfei	a4b034752d	在线课考试添加任务计算	2024-08-23 18:45:10 +08:00
nisen	23e63062e9	Merge branch 'zcwy0823-llf' into master-0705	2024-08-23 18:30:42 +08:00
zhaolongfei	06415d58ac	在线课考试添加任务计算	2024-08-23 18:30:05 +08:00
nisen	3fc8ce614d	Merge branch 'zcwy0823-llf' into master-0705	2024-08-23 18:00:57 +08:00
zhaolongfei	bebe36d39e	在线课考试添加任务计算	2024-08-23 18:00:26 +08:00
nisen	d4af5ba8d5	Merge branch 'zcwy0823-llf' into master-0705	2024-08-23 17:59:12 +08:00
zhaolongfei	d42d1b2e83	处理study接口,添加接口访问限制次数	2024-08-23 17:55:53 +08:00
nisen	cf64f0406f	Merge branch 'zcwy0815-llf' into master-0705	2024-08-15 20:20:14 +08:00
zhaolongfei	df3b0b95c1	处理study接口，studyitemid返回值为空的问题	2024-08-15 20:19:27 +08:00
nisen	f5ff666c07	Merge branch 'zcwy0815-llf' into master-0705	2024-08-15 19:57:23 +08:00
zhaolongfei	731e62c89f	处理study接口，studyitemid返回值为空的问题	2024-08-15 19:44:23 +08:00
zhaolongfei	7fe53c026e	处理study接口，studyitemid返回值为空的问题	2024-08-15 19:26:10 +08:00
zhaolongfei	6492e3b0dd	处理study接口，studyitemid返回值为空的问题	2024-08-15 19:18:28 +08:00
zhaolongfei	30aab6eab4	处理study接口，studyitemid返回值为空的问题	2024-08-15 19:03:11 +08:00
670788339	61754d3852	放开redis	2024-08-15 16:26:47 +08:00
670788339	a26ee1c707	放开注释	2024-08-15 15:42:45 +08:00
670788339	1f0060c4dc	放开注释	2024-08-15 15:27:41 +08:00
670788339	6b0050286c	放开注释	2024-08-15 15:19:59 +08:00
670788339	2b07029aca	注释	2024-08-15 12:09:40 +08:00
670788339	d2d7fab96c	注释	2024-08-15 12:03:05 +08:00
670788339	be3bae969c	study接口加redis过滤	2024-08-15 11:35:02 +08:00
670788339	8e1b7519ef	study接口加redis过滤	2024-08-15 11:31:17 +08:00
670788339	bddb11caf8	study接口加redis过滤	2024-08-15 10:53:26 +08:00
nisen	f0fe015561	Merge branch 'zcwy0731-llf' into master-0705	2024-08-06 17:52:08 +08:00
zhaolongfei	91bcec00ef	修复同步到item表没有名称问题	2024-08-06 14:42:05 +08:00
nisen	7a210ec701	Merge branch 'zcwy0731-llf' into master-0705	2024-08-05 19:03:09 +08:00
zhaolongfei	6c616a1163	在线课作业重复提交报错修复	2024-08-05 15:12:54 +08:00
zhaolongfei	939325d5bd	在线课作业重复提交报错修复	2024-08-05 15:05:28 +08:00
zhaolongfei	4eddbc8e8f	在线管理资源完成情况名称搜索修复	2024-08-05 11:21:14 +08:00
zhaolongfei	50bdd59a26	在线管理资源完成情况名称搜索修复	2024-08-05 11:11:12 +08:00
zhaolongfei	b85eb97bc1	在线管理资源完成情况名称搜索修复	2024-08-05 10:57:14 +08:00
zhaolongfei	28b58a73cf	在线管理资源完成情况名称搜索修复	2024-08-05 10:29:36 +08:00
zhaolongfei	b9adf4c45f	作业多次点击提交报错修复	2024-08-02 17:08:00 +08:00
zhaolongfei	49aab74463	作业多次点击提交报错修复	2024-08-02 13:19:08 +08:00
zhaolongfei	9f30910d04	作业多次点击提交报错修复	2024-08-02 11:32:14 +08:00
zhaolongfei	6658b8c04b	作业多次点击提交报错修复	2024-08-02 11:03:13 +08:00
zhaolongfei	19df4224a9	作业多次点击提交报错修复	2024-08-02 10:16:05 +08:00
zhaolongfei	95ddc9f5d5	作业多次点击提交报错修复	2024-08-02 09:36:36 +08:00
nisen	f3b6bb6fee	Merge branch 'zcwy0731-llf' into master-0705 # Conflicts: # servers/boe-server-all/src/main/java/com/xboe/module/exam/entity/ExamTest.java	2024-08-01 17:43:07 +08:00
zhaolongfei	64965f5ec6	考试管理删除不同步	2024-07-31 19:01:53 +08:00
zhaolongfei	a407ca2dad	考试管理删除不同步	2024-07-31 18:35:49 +08:00
nisen	16f1c2337b	Merge branch 'zcwy0716-llf' into master-0705	2024-07-30 15:46:41 +08:00
zhaolongfei	bf476a23a0	在线管理状态完成情况	2024-07-30 14:05:06 +08:00
joshen	92a4e509ef	Merge branch 'master-0705' into 'master' Master 0705 See merge request !116	2024-07-30 11:58:33 +08:00
nisen	0f0edaf2cd	Merge branch 'zcwy0729-llf' into master-0705	2024-07-30 11:56:45 +08:00
nisen	68d00e8c51	Merge branch 'zcwy0716-llf' into master-0705	2024-07-29 19:56:17 +08:00
zhaolongfei	41a542ea23	Merge remote-tracking branch 'java-servse-yx/zcwy0606-llf' into zcwy0729-llf # Conflicts: # servers/boe-server-all/src/main/java/com/xboe/module/exam/api/ExamTestApi.java # servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/ExamTestServiceImpl.java	2024-07-29 19:52:50 +08:00
zhaolongfei	fc98025a3a	视频暂存为空判断	2024-07-29 19:21:26 +08:00
zhaolongfei	e2c697f860	修改bug	2024-06-19 16:43:08 +08:00
zhaolongfei	c6a785bb4f	添加视频暂存点	2024-06-19 13:55:54 +08:00
zhaolongfei	8567fa9ecc	content表添加processVideo字段,添加判断	2024-06-18 13:47:46 +08:00
zhaolongfei	359b66e48a	content表添加processVideo字段,添加判断	2024-06-18 13:31:39 +08:00
zhaolongfei	8125a6bd77	content表添加processVideo字段,添加判断	2024-06-18 11:12:08 +08:00
zhaolongfei	9b37e8a73d	content表添加processVideo字段,添加判断	2024-06-18 09:09:52 +08:00
zhaolongfei	2fa3378e94	content表添加processVideo字段	2024-06-17 16:16:29 +08:00
zhaolongfei	0b7784779f	item添加processVideo字段	2024-06-13 15:28:13 +08:00
zhaolongfei	e03118275d	修改项目下考试结束时间并未生效修复	2024-06-06 18:10:28 +08:00
zhaolongfei	1b1cb17861	Merge branch 'zcwy0525-llf' into zcwy0606-llf	2024-06-06 16:35:40 +08:00
zhaolongfei	a35c1faa49	学员在线删除失败的bug修复	2024-06-06 16:32:33 +08:00