删除考试根据名称条件筛选

servers/boe-server-all/pom.xml

@@ -58,7 +58,7 @@
 			<artifactId>xboe-module-scorm</artifactId>
 			<version>1.0.0</version>
 		</dependency>
-		<dependency>
+		 <dependency>
 			<groupId>com.xboe</groupId>
 			<artifactId>xboe-core</artifactId>
 			<version>1.0.0</version>
@@ -233,31 +233,6 @@
 			<artifactId>spring-retry</artifactId>
 			<version>1.3.1</version>
 		</dependency>
-
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-webmvc</artifactId>
-			<version>5.3.26</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.yaml</groupId>
-			<artifactId>snakeyaml</artifactId>
-			<version>2.0</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-text</artifactId>
-			<version>1.10.0</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.tomcat.embed</groupId>
-			<artifactId>tomcat-embed-core</artifactId>
-			<version>9.0.83</version>
-		</dependency>
-
 	</dependencies>
 	<build>
 		<resources>

servers/boe-server-all/src/main/java/com/xboe/module/exam/service/impl/AloneExamServiceImpl.java

@@ -142,9 +142,6 @@ public class AloneExamServiceImpl implements IAloneExamService{
 			if(StringUtils.isNotBlank(aea.getTestId())) {
 				query.addFilter(FieldFilters.eq("testId",aea.getTestId()));
 			}
-			if(StringUtils.isNotBlank(aea.getTestName())) {
-				query.addFilter(FieldFilters.eq("testName",aea.getTestName()));
-			}
 			if(StringUtils.isNotBlank(aea.getAid())) {
 				query.addFilter(FieldFilters.eq("aid",aea.getAid()));
 			}

servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java

@@ -324,19 +324,8 @@ 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()) {
@@ -421,14 +410,6 @@ 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);
 			}
@@ -534,14 +515,6 @@ 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);

servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java

@@ -98,12 +98,8 @@ public class StudyServiceImpl implements IStudyService{
 		//sci.setProgress(100);//直接设置为学习完成
 		sci.setLastTime(ldt);
 		scItemDao.saveOrUpdate(sci);
-		if (sci.getId() != null){
-			dto.setStudyItemId(sci.getId());
-		}else {
-			log.info("学习记录插入失败"+sci.getId());
-			throw new IllegalArgumentException("学习记录插入失败");
-		}
+		
+		dto.setStudyItemId(sci.getId());
 		//检查是否全部学习完成
 		scDao.finishCheck(dto.getStudyId(),dto.getCourseId(),dto.getContentTotal(),token);