事务测试恢复

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

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

@@ -45,7 +45,10 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.ForkJoinPool;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
@@ -404,20 +407,4 @@ public class ThirdApi {
                         .body()).orElseThrow(() -> new RuntimeException("token校验失败"));
         log.info("-------delOnLineById = " + resp);
     }
-
-    //获取字典信息
-    public List<Dict> getDictItems(CommonSearchVo searcher) {
-        try {
-            List<Dict> dictList = dictRemoteClient.getList(searcher);
-            if(!Objects.isNull(dictList) && dictList.size() > 0){
-//               List<String> dicts =  dictList.stream().map(Dict::getValue).collect(Collectors.toList());
-               return dictList;
-            }else {
-               return null;
-            }
-        } catch (Exception e) {
-            log.error("-------获取字典信息 = " + e.getMessage());
-        }
-        return null;
-    }
 }

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

@@ -2,14 +2,11 @@
 
 import java.io.OutputStream;
 import java.util.*;
-import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.boe.feign.api.infrastructure.entity.CommonSearchVo;
-import com.boe.feign.api.infrastructure.entity.Dict;
 import com.xboe.api.ThirdApi;
 import com.xboe.module.course.dto.*;
 import org.apache.commons.lang3.StringUtils;
@@ -172,48 +169,19 @@ public class CourseManageApi extends ApiBaseController{
 		List<CourseSection> sectionlist=sectionService.getByCourseId(id);
 		List<CourseTeacher> teachers=courseService.findTeachersByCourseId(id);
 		List<CourseCrowd> crowds=courseService.findCrowdByCourseId(id);
-
-        CommonSearchVo searcher = new CommonSearchVo();
-        searcher.setPid(637L);
-        searcher.setType(1);
-		List<Dict> dictList = thirdApi.getDictItems(searcher);
-		boolean isPermission = false;
-        if(dictList != null && dictList.size() > 0){
-			List<String> dicts =  dictList.stream().map(Dict::getValue).collect(Collectors.toList());
-			isPermission = dicts.contains(course.getOrgId());
-			rs.put("dicts",dicts);
-		}
-		log.error("-------是否仅内网查看 = " + isPermission);
+		
+		//
 		rs.put("course",course);
 		rs.put("contents",cclist);
 		rs.put("sections",sectionlist);
 		rs.put("teachers",teachers);
 		rs.put("crowds",crowds);
-		rs.put("isPermission",isPermission);
-
-
+		
 		
 		return success(rs);
 		
 	}
-	@GetMapping("/getDictIds")
-	public JsonResponse<Map<String,Object>> getDictIds(Long pid,Integer type){
-		CommonSearchVo searcher = new CommonSearchVo();
-		if(pid==null || type ==null){
-			return badRequest("参数错误");
-		}
-		Map<String,Object> rs=new HashMap<String,Object>();
-		searcher.setPid(pid);
-		searcher.setType(type);
-		List<Dict> dictList = thirdApi.getDictItems(searcher);
-		rs.put("dicts",null);
-		if(dictList != null && dictList.size() > 0){
-			List<String> dicts =  dictList.stream().map(Dict::getValue).collect(Collectors.toList());
-			rs.put("dicts",dicts);
-		}
-		return success(rs);
-	}
-
+	
 	/**
 	 * 管理员审核列表，教师的审核不在这里，此审核也应该移动CourseAuditApi中去
 	 * @param pager

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

@@ -33,10 +33,7 @@ public class Course extends BaseEntity {
     
     /**所有的设备*/
     public static int DEVICE_ALL=3;
-
-    /**仅内网*/
-    public static int DEVICE_INTERNAL=4;
-
+    
     /**未提交，草稿*/
     public static final int STATUS_NONE=1;
     

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

@@ -183,8 +183,6 @@ public class CourseServiceImpl implements ICourseService {
                 filters.add(FieldFilters.in("device", Course.DEVICE_MOBILE, Course.DEVICE_ALL));
             } else if (dto.getDevice() == Course.DEVICE_ALL) {
                 filters.add(FieldFilters.eq("device", Course.DEVICE_ALL));
-            }else if (dto.getDevice() == Course.DEVICE_INTERNAL) {
-                filters.add(FieldFilters.eq("device", Course.DEVICE_INTERNAL));
             }
 
         }
@@ -493,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" +
@@ -516,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" +
@@ -573,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/popup/entity/Popup.java

@@ -1,6 +1,5 @@
 package com.xboe.module.popup.entity;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xboe.core.SysConstant;
 import com.xboe.core.orm.IdEntity;
 import lombok.Data;
@@ -25,14 +24,12 @@ public class   Popup extends IdEntity {
      * 开始时间
      * */
     @Column(name = "start_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime startTime;
 
     /**
      * 结束时间
      * */
     @Column(name = "end_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime endTime;
 
 

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

@@ -10,8 +10,6 @@ import java.util.stream.Collectors;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.nacos.shaded.com.google.common.util.concurrent.RateLimiter;
-import com.boe.feign.api.infrastructure.entity.CommonSearchVo;
-import com.boe.feign.api.infrastructure.entity.Dict;
 import com.xboe.api.ThirdApi;
 import com.xboe.constants.CacheName;
 import com.xboe.module.course.vo.TeacherVo;
@@ -214,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<>();
@@ -235,30 +234,7 @@ public class StudyCourseApi extends ApiBaseController{
 		rs.put("contents",cclist);
 		rs.put("sections",sectionlist);
 		rs.put("teachers",teachers);
-		// 未选择仅内网时isPermission = false，不用区分内外网
-		boolean isPermission = false;
-		if(course.getDevice() ==4){
-			CommonSearchVo searcher = new CommonSearchVo();
-			searcher.setPid(637L);
-			searcher.setType(1);
-			List<Dict> dictList = thirdApi.getDictItems(searcher);
-			if(dictList != null && dictList.size() > 0){
-				List<String> dicts =  dictList.stream().map(Dict::getValue).collect(Collectors.toList());
-				// 选择仅内网 并且字典中配置了此课程资源归属，那么只能内网观看 返回 truw
-				isPermission = dicts.contains(course.getOrgId());
-			}
-		}
-		rs.put("isPermission",isPermission);
-
-		CommonSearchVo warn = new CommonSearchVo();
-		warn.setCode("course_warn");
-		warn.setType(1);
-		List<Dict> warns = thirdApi.getDictItems(warn);
-		if(warns != null && warns.size() > 0){
-			rs.put("warn",warns.get(0).getValue());
-			rs.put("warnTitle",warns.get(0).getName());
-		}
-
+		
 		//检查是否已报名
 		StudyCourse sc=service.findByCourseIdAndAid(cid, aid);
 		if(pass==true && sc==null) {
@@ -428,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/school/study/service/impl/StudyExamServiceImpl.java

@@ -10,7 +10,6 @@ import com.xboe.module.course.entity.CourseExam;
 import com.xboe.school.study.dao.StudyCourseDao;
 import com.xboe.school.study.dao.StudyCourseItemDao;
 import com.xboe.school.study.dao.StudyExamDao;
-import com.xboe.school.study.entity.StudyCourse;
 import com.xboe.school.study.entity.StudyCourseItem;
 import com.xboe.school.study.entity.StudyExam;
 import com.xboe.school.study.service.IStudyExamService;
@@ -171,32 +170,15 @@ public class StudyExamServiceImpl implements IStudyExamService{
 			}
 			builder.addGroupBy("studyId");
 			List<StudyExam> list1 = dao.findList(builder.builder());
-			if(list1 != null && list1.size() > 0){
-				log.info("----------StudyExam--QueryBuilder list1.size = " + list1.size() + ",0 = " + list1.get(0));
-				for(StudyExam item : list1){
-					log.info("--------------StudyExam---CourseId = " + item.getCourseId() + " , StudyId = " + item.getStudyId() + " , StudentId = " + item.getStudentId());
-					int totalContent = courseContentDao.getCount(item.getCourseId());
-					log.info("--------StudyExam--准备判断进度-------totalContent = " + totalContent);
-					scDao.finishCheck1(item.getStudyId(),item.getCourseId(),totalContent);
-					log.info("--------StudyExam--判断进度完毕----------------------");
-				}
-			}else{
-				QueryBuilder builder1 = QueryBuilder.from(StudyCourse.class);
-				if (StringUtils.isEmpty(courseId)){
-				 	return;
-				}
-				builder1.addFilter(FieldFilters.eq("courseId", courseId));
-				List<StudyCourse> list2 = scDao.findList(builder1.builder());
-				log.info("------------StudyCourse list2.size = " + list2.size() + ",0 = " + list2.get(0));
-				for(StudyCourse item : list2){
-					log.info("-------------StudyCourse----CourseId = " + item.getCourseId() + " , StudyId = " + item.getId() + " , StudentId = " + item.getAid());
-					int totalContent = courseContentDao.getCount(item.getCourseId());
-					log.info("--------StudyCourse--准备判断进度-------totalContent = " + totalContent);
-					scDao.finishCheck1(item.getId(),item.getCourseId(),totalContent);
-					log.info("--------StudyCourse--判断进度完毕----------------------");
-				}
-			}
+			log.info("------------QueryBuilder list1.size = " + list1.size() + ",0 = " + list1.get(0));
 
+			for(StudyExam item : list1){
+				log.info("-----------------CourseId = " + item.getCourseId() + " , StudyId = " + item.getStudyId() + " , StudentId = " + item.getStudentId());
+				int totalContent = courseContentDao.getCount(item.getCourseId());
+				log.info("----------准备判断进度-------totalContent = " + totalContent);
+				scDao.finishCheck1(item.getStudyId(),item.getCourseId(),totalContent);
+				log.info("----------判断进度完毕----------------------");
+			}
 		} catch (Exception exception) {
 			exception.printStackTrace();
 			log.info("------异常----------------------：" +exception.getMessage());

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

@@ -282,12 +282,11 @@ public class StudyServiceImpl implements IStudyService{
 				return pageList;
 			}
 		}
-
 		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,b.score " +
+				"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 + "' 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,MAX(item.score) score " +
+				"(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 + "' and item.aname like '%"+name+"%' group by bsc.id) b " +
 				"on a.course_id = b.course_id and a.id = b.id " +
@@ -316,9 +315,6 @@ public class StudyServiceImpl implements IStudyService{
 			sc.setProgress(Integer.valueOf(objs[5].toString()));
 			sc.setStatus(Integer.valueOf(objs[6].toString()));
 			sc.setAname(objs[3].toString());
-			if(objs[7] != null){
-				sc.setScore(Float.valueOf(objs[7].toString()));
-			}
 			item.add(sc);
 		}
 		log.info("资源完成情况人员"+item);

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")