事务测试恢复

# Conflicts:
#	servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseTask.java

servers/boe-server-all/src/main/java/com/xboe/module/course/entity/CourseTeacher.java

@@ -57,4 +57,8 @@ public class CourseTeacher extends IdBaseEntity {
     @Transient
     private Integer teacherType;
 
+    /**讲师头像*/
+    @Transient
+    private String photo;
+
 }

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

@@ -105,8 +105,11 @@ public class CourseContentServiceImpl implements ICourseContentService {
 		if(homework!=null) {
 			homework.setCourseId(cc.getCourseId());
 			homework.setContentId(cc.getId());
-			homework=homeworkDao.saveOrUpdate(homework);
+			log.info("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
 			homework.setSysVersion(homeworkDao.getVersion(homework.getId()));
+			homeworkDao.saveOrUpdate(homework);
+			log.info("bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb");
+			log.info("ccccccccccccccccccccccccccccccccccccccccccccccccccc");
 		}
 	}
 

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

@@ -491,7 +491,7 @@ public class CourseServiceImpl implements ICourseService {
         String sql = "SELECT DISTINCT\n" +
                 "rt.course_id\n" +
                 "FROM\n" +
-                "boe_new.student s INNER JOIN boe_new.router_task rt on s.pid=rt.router_id inner join boe_course c on c.id=rt.course_id\n" +
+                "boe.student s INNER JOIN boe.router_task rt on s.pid=rt.router_id inner join boe_course c on c.id=rt.course_id\n" +
                 "\n" +
                 "WHERE\n" +
                 "\n" +
@@ -514,7 +514,7 @@ public class CourseServiceImpl implements ICourseService {
         String sql = "SELECT DISTINCT\n" +
                 "pt.course_id\n" +
                 "FROM\n" +
-                "boe_new.student s INNER JOIN boe_new.project_task pt on s.pid=pt.project_id inner join boe_course c on c.id=pt.course_id\n" +
+                "boe.student s INNER JOIN boe.project_task pt on s.pid=pt.project_id inner join boe_course c on c.id=pt.course_id\n" +
                 "\n" +
                 "WHERE\n" +
                 "\n" +
@@ -571,8 +571,8 @@ public class CourseServiceImpl implements ICourseService {
         String sql = "SELECT DISTINCT\n" +
                 "\tc.id \n" +
                 "FROM\n" +
-                "\tboe_new.student s\n" +
-                "\tINNER JOIN boe_new.grow_task gt ON s.pid = gt.grow_id\n" +
+                "\tboe.student s\n" +
+                "\tINNER JOIN boe.grow_task gt ON s.pid = gt.grow_id\n" +
                 "\tINNER JOIN boe_course c ON gt.course_id = c.id \n" +
                 "WHERE\n" +
                 "\ts.type = 14 \n" +

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

@@ -165,7 +165,7 @@ public class AloneExamServiceImpl implements IAloneExamService{
 				query.addFilter(FieldFilters.eq("aid",aea.getAid()));
 			}
 			if(StringUtils.isNotBlank(aea.getName())) {
-				query.addFilter(FieldFilters.eq("name",aea.getName()));
+				query.addFilter(FieldFilters.like("name",aea.getName()));
 			}
 		}
 		return dao.findPage(query.builder());

servers/boe-server-all/src/main/java/com/xboe/module/interaction/service/impl/CommentsServiceImpl.java

@@ -75,6 +75,7 @@ public class CommentsServiceImpl implements ICommentsService{
 		c.setPraises(0);
 		c.setFavorites(0);
 		dao.save(c);
+		callback.increase(BoedxResourceType.toEnum(c.getObjType()),c.getObjId(), BoedxHitsField.Comments);
 		if(c.getParentRead()!=null && c.getParentRead()) {
 			dao.updateMultiFieldById(c.getParentId(), 
 					UpdateBuilder.create("replys","replys+1",FieldUpdateType.EXPRESSION),
@@ -87,9 +88,11 @@ public class CommentsServiceImpl implements ICommentsService{
 	
 	@Override
 	public void deleteReply(String id,String parentId) {
-		
+		Comments comment=dao.get(id);
 		dao.deleteById(id);
 		dao.updateMultiFieldById(parentId, UpdateBuilder.create("replys","replys-1",FieldUpdateType.EXPRESSION));
+		//需要同时回调处理，修改对应的内容的评论数量
+		callback.reduce(BoedxResourceType.toEnum(comment.getObjType()),comment.getObjId(),BoedxHitsField.Comments);
 	}
 
 	@Override

servers/boe-server-all/src/main/java/com/xboe/module/qa/service/impl/QuestionServiceImpl.java

@@ -86,7 +86,7 @@ public class QuestionServiceImpl implements IQuestionService {
 //            filters.add(FieldFilters.or(FieldFilters.like("title", questionDto.getKeyword()), FieldFilters.like("content", questionDto.getKeyword())));
             List<IFieldFilter> iFieldFilters = new ArrayList<>();
             iFieldFilters.add(FieldFilters.like("title", questionDto.getKeyword()));
-            iFieldFilters.add(FieldFilters.like("content", questionDto.getKeyword()));
+            iFieldFilters.add(FieldFilters.like("title", questionDto.getKeyword()));
             iFieldFilters.add(FieldFilters.like("sysCreateBy", questionDto.getKeyword()));
             filters.add(FieldFilters.or(iFieldFilters));
         }

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

@@ -212,6 +212,7 @@ public class StudyCourseApi extends ApiBaseController{
 				ct.setRemark(t.getDescription());
 				ct.setSupplier(t.getSupplier());
 				ct.setTeacherType(t.getTeacherType());
+				ct.setPhoto(t.getPhoto());
 			}
 			if(redisTemplate.opsForValue().get(ct.getTeacherId())==null){
 				List<String>list=new ArrayList<>();
@@ -403,6 +404,8 @@ public class StudyCourseApi extends ApiBaseController{
 			studyService.saveStudyInfo(sci,token);
 			//学习记录成功后处理
 			studyService.appendStudyDuration(sci.getStudyId(),sci.getStudyItemId(),sci.getContentId(),sci.getDuration());
+
+			log.info("在线课学习记录 sci.getStudyId() = "+ sci.getStudyId() + " , sci.getCourseId() = " + sci.getCourseId() );
 			List<StudyCourse> allUserList = thirdApi.getStudyCourseList(sci.getStudyId() ,sci.getCourseId(), token);
 			log.info("在线课学习记录"+allUserList);
 			//System.out.println("在线课学习记录"+allUserList);

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

@@ -1,7 +1,9 @@
 package com.xboe.school.study.api;
 
 import java.io.IOException;
+import java.time.LocalDateTime;
 import java.time.ZoneOffset;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -10,6 +12,13 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.xboe.module.course.entity.Course;
 import com.xboe.module.course.service.ICourseService;
 import org.apache.commons.compress.utils.Lists;
+import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.fastjson2.JSON;
+import com.xboe.core.orm.FieldFilters;
+import com.xboe.core.orm.QueryBuilder;
+import com.xboe.module.course.dao.CourseDao;
+import com.xboe.module.course.dto.RankingDto;
+import com.xboe.module.course.entity.Course;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;

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

@@ -137,11 +137,15 @@ public class StudyCourseTask {
                         String courseContentId = parts[5];
                         String studyItemId = parts[7];
                         // 7. 获取存储的时间点（示例逻辑）
+
                         String redisValue = redisTemplate.opsForValue().get(redisKey);
+                        //  redisValue = 60&20&2025-07-22T16:51:40
                         log.info("-定时任务 saveStudyCourseItemLastTime ---redisValue = " + redisValue);
                         if (redisValue == null) continue;
                         String[] partValues = redisValue.split("&");
+                        // studyVideoTtime=60
                         int studyVideoTtime = Integer.parseInt(partValues[0]);
+                        // appendtime=20
                         int appendtime = Integer.parseInt(partValues[1]);
                         LocalDateTime timestamp = null;
                         if (partValues.length >= 2){

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

@@ -60,6 +60,7 @@ public class SysUploaderApi  extends ApiBaseController{
 		fileTypeSet.add("pptx");
 		fileTypeSet.add("pdf");
 		fileTypeSet.add("zip");
+		fileTypeSet.add("jpeg");
 	}
 	
 	@RequestMapping(value = "/file/upload", method = RequestMethod.POST, produces = "application/json")