修改注解

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

@@ -98,8 +98,7 @@ public class ThirdApi {
     private String syncOnLineScore;
     @Value("${coursesuilt.updateOnLineStatua}")
     private String updateOnLineStatua;
-    @Value("${coursesuilt.delOnLineById}")
+
-    private String delOnLineById;
 
     //获取例外人员的id
     public List<String> getUserId() {
@@ -399,12 +398,4 @@ public class ThirdApi {
     public void syncExamStudyRecord(ExamStudyRecordParam param) {
         externalRemoteClient.syncExamStudyRecord(param);
     }
-
-    public void delOnLineById(CourseParam param, String token) {
-        log.info("---------------同步在线课删除 ------- param " + param);
-        String resp = Optional.ofNullable(
-                HttpRequest.post(delOnLineById).body(JSONUtil.toJsonStr(param)).header("token", token).execute()
-                        .body()).orElseThrow(() -> new RuntimeException("token校验失败"));
-        log.info("-------delOnLineById = " + resp);
-    }
 }

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

@@ -886,7 +886,7 @@ public class CourseManageApi extends ApiBaseController{
 	 * @return
 	 */
 	@PostMapping("/delete")
-	public JsonResponse<Boolean> delete(String id,Boolean erasable,String title,String remark, HttpServletRequest request){
+	public JsonResponse<Boolean> delete(String id,Boolean erasable,String title,String remark){
 		if(StringUtils.isBlank(id)){
 			return badRequest("参数错误");
 		}
@@ -901,11 +901,6 @@ public class CourseManageApi extends ApiBaseController{
 		try {
 			CurrentUser cu=getCurrent();
 			courseService.delete(id, erasable,cu.getAccountId(), cu.getName(), remark);
-
-			String token = request.getHeader("Xboe-Access-Token");
-			CourseParam param = new CourseParam();
-			param.setId(id);
-			thirdApi.delOnLineById(param,token);
 			return success(true);
 		} catch (Exception e) {
 			log.error("管理员删除课程错误",e);

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

@@ -57,8 +57,4 @@ 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/ICourseService.java

@@ -341,6 +341,8 @@ public interface ICourseService {
     List<Course> mobiledelList(Integer num,CourseQueryDto courseQueryDto);
 
 
-    List<Course> findByIds(List<String> courseIds);
+
-    void deletedStudyResourceBatchByCourseIdAndType(String courseId,Integer courseType);
+
+
+
 }

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

@@ -105,11 +105,8 @@ public class CourseContentServiceImpl implements ICourseContentService {
 		if(homework!=null) {
 			homework.setCourseId(cc.getCourseId());
 			homework.setContentId(cc.getId());
-			log.info("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
+			homework=homeworkDao.saveOrUpdate(homework);
 			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

@@ -1,6 +1,5 @@
 package com.xboe.module.course.service.impl;
 
-import java.io.IOException;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
@@ -15,17 +14,11 @@ import java.util.stream.Stream;
 import javax.annotation.Resource;
 import javax.management.Query;
 
-import cn.hutool.core.collection.CollectionUtil;
 import com.xboe.api.ThirdApi;
 import com.xboe.core.orm.*;
 import com.xboe.school.study.dao.StudyCourseDao;
 import com.xboe.school.study.entity.StudyCourse;
 import org.apache.commons.lang3.StringUtils;
-import org.elasticsearch.client.RequestOptions;
-import org.elasticsearch.client.RestHighLevelClient;
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilders;
-import org.elasticsearch.index.reindex.DeleteByQueryRequest;
 import org.hibernate.mapping.IdGenerator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
@@ -122,9 +115,6 @@ public class CourseServiceImpl implements ICourseService {
     @Autowired(required = false)
     private IEventDataSender eventSender;
 
-    @Resource
-    RestHighLevelClient restHighLevelClient;
-
 
   
     /**
@@ -491,7 +481,7 @@ public class CourseServiceImpl implements ICourseService {
         String sql = "SELECT DISTINCT\n" +
                 "rt.course_id\n" +
                 "FROM\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" +
+                "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" +
                 "\n" +
                 "WHERE\n" +
                 "\n" +
@@ -514,7 +504,7 @@ public class CourseServiceImpl implements ICourseService {
         String sql = "SELECT DISTINCT\n" +
                 "pt.course_id\n" +
                 "FROM\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" +
+                "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" +
                 "\n" +
                 "WHERE\n" +
                 "\n" +
@@ -571,8 +561,8 @@ public class CourseServiceImpl implements ICourseService {
         String sql = "SELECT DISTINCT\n" +
                 "\tc.id \n" +
                 "FROM\n" +
-                "\tboe.student s\n" +
+                "\tboe_new.student s\n" +
-                "\tINNER JOIN boe.grow_task gt ON s.pid = gt.grow_id\n" +
+                "\tINNER JOIN boe_new.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" +
@@ -864,14 +854,12 @@ public class CourseServiceImpl implements ICourseService {
                     log.error("未配置事件消息发送的实现");
                 }
             }
-
-            // 删除ES数据
-            deletedStudyResourceBatchByCourseIdAndType(id,c.getType());
         } else {
             //彻底删除，课件设置为无课程状态
             courseDao.setDeleted(id);
         }
         //记录删除日志信息
+
     }
 
     @Override
@@ -1580,13 +1568,6 @@ public class CourseServiceImpl implements ICourseService {
         return list;
     }
 
-    @Override
-    public List<Course> findByIds(List<String> courseIds) {
-        QueryBuilder query = QueryBuilder.from(Course.class);
-        query.addFilter(FieldFilters.in("id", courseIds));
-        return courseDao.findList(query.builder());
-    }
-
 
     @Override
     public int countWaitAudit(String aid) {
@@ -1998,17 +1979,5 @@ public class CourseServiceImpl implements ICourseService {
         return courseDao.findListByHql("Select new Course(id,studys,score) from Course where id in(?1)", ids);
     }
 
-    @Override
+
-    public void deletedStudyResourceBatchByCourseIdAndType(String courseId, Integer courseType) {
-        DeleteByQueryRequest request = new DeleteByQueryRequest("new_study_resource");
-        BoolQueryBuilder boolQueryBuilder = new BoolQueryBuilder();
-        boolQueryBuilder.must(QueryBuilders.matchQuery("courseId", courseId));
-        boolQueryBuilder.must(QueryBuilders.matchQuery("courseType", courseType));
-        request.setQuery(boolQueryBuilder);
-        try {
-            restHighLevelClient.deleteByQuery(request, RequestOptions.DEFAULT);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
 }

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.like("name",aea.getName()));
+				query.addFilter(FieldFilters.eq("name",aea.getName()));
 			}
 		}
 		return dao.findPage(query.builder());

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

@@ -75,7 +75,6 @@ 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),
@@ -88,11 +87,9 @@ 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("title", questionDto.getKeyword()));
+            iFieldFilters.add(FieldFilters.like("content", 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

@@ -15,7 +15,6 @@ import com.xboe.constants.CacheName;
 import com.xboe.module.course.vo.TeacherVo;
 import com.xboe.module.usergroup.service.IUserGroupService;
 import com.xboe.school.study.dao.StudyCourseDao;
-import com.xboe.school.vo.StudyTimeVo;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -212,7 +211,6 @@ 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<>();
@@ -277,6 +275,19 @@ public class StudyCourseApi extends ApiBaseController{
 						continue;
 					}
 
+					// 查询redis上面的key，并解析value获取到lastStudyTime
+					String lastActive = redisTemplate.opsForValue().get("studyContentId:" + item.getId() + ":last_active");
+					if (StringUtil.isNotBlank(lastActive)) {
+						String[] parts = lastActive.split("&");
+						if (parts.length == 2) {
+							int lastStudyTimeRedis = Integer.parseInt(parts[0]);
+							log.info("study-video-time-redis获取---lastStudyTimeRedis = " + lastStudyTimeRedis);
+							if(lastStudyTimeRedis>0){
+								item.setLastStudyTime(lastStudyTimeRedis);
+							}
+						}
+					}
+
 					BigDecimal lastStudyTime = new BigDecimal(item.getLastStudyTime());
 					BigDecimal duration = new BigDecimal(content.getDuration());
 					BigDecimal progress = lastStudyTime.divide(duration, 10, RoundingMode.HALF_UP);
@@ -404,8 +415,6 @@ 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);
@@ -616,7 +625,7 @@ public class StudyCourseApi extends ApiBaseController{
 	@Deprecated
 	@RequestMapping(value="/appendtime",method = {RequestMethod.GET,RequestMethod.POST})
 	public JsonResponse<String> appendTime(StudyTime studyTime, HttpServletRequest request){
-
+		
 		if(StringUtils.isBlank(studyTime.getStudyId())){
 			return error("参数错误");
 		}
@@ -646,91 +655,7 @@ public class StudyCourseApi extends ApiBaseController{
 			return error("记录学习时长错误",e.getMessage());
 		}
 	}
-
+	
-	/**
-	 * appendtime 于 study-video-time 合并
-	 * */
-	/*@RequestMapping(value="/updateStudyVideoTime1",method = {RequestMethod.GET,RequestMethod.POST})
-	public JsonResponse<String> updateStudyVideoTime1(StudyTimeVo studyTime, HttpServletRequest request){
-
-		//  0 study-video-time ,  1 appendtime
-		if (studyTime.getType() == 0){
-			if(StringUtils.isBlank(studyTime.getItemId())){
-				return error("参数错误");
-			}
-			if(studyTime.getVideoTime()==null){
-				return error("无时间点");
-			}
-			//检查是否已存在
-			try {
-				studyService.updateLastTime(studyTime.getItemId(),studyTime.getVideoTime(), getCurrent().getAccountId());
-				if (studyTime.getContentId() != null && studyTime.getCourseId() != null && studyTime.getProgressVideo() != null){
-					contentService.updateProcessVideo(studyTime.getContentId(), studyTime.getCourseId(), studyTime.getProgressVideo());
-				}
-				return success("true");
-			}catch(Exception e) {
-				log.error("updateStudyVideoTime type =0 记录最后学习时间错误",e);
-				return error("updateStudyVideoTime type =0 记录最后学习时间失败 ",e.getMessage());
-			}
-		}else if(studyTime.getType() == 1){
-			if(StringUtils.isBlank(studyTime.getStudyId())){
-				return error("参数错误");
-			}
-			if(StringUtils.isBlank(studyTime.getCourseId())){
-				return error("未指定课程");
-			}
-			if(StringUtils.isBlank(studyTime.getContentId())){
-				return error("未指定资源内容");
-			}
-
-			String token = request.getHeader("Xboe-Access-Token");
-			if (StringUtils.isEmpty(token)) {
-				token = request.getHeader("token");
-			}
-			try {
-				studyService.updateStudyDuration(studyTime.getStudyId(),null,studyTime.getContentId(),studyTime.getVideoTime(),studyTime.getCourseId());
-				List<StudyCourse> allUserList = thirdApi.getStudyCourseList(studyTime.getStudyId() ,studyTime.getCourseId(), token);
-				log.info("updateStudyVideoTime type =1 在线课学习记录 = " + allUserList);
-				return success(studyTime.getId());
-			}catch(Exception e) {
-				log.error("updateStudyVideoTime type =1 记录学习时长错误",e);
-				return error("updateStudyVideoTime type =1 记录学习时长错误 ",e.getMessage());
-			}
-		}else{
-			return error("type不能为空");
-		}
-	}*/
-
-	@RequestMapping(value="/updateStudyVideoTime",method = {RequestMethod.GET,RequestMethod.POST})
-	public JsonResponse<String> updateStudyVideoTime(StudyTimeVo studyTime, HttpServletRequest request){
-        try {
-            if(StringUtils.isBlank(studyTime.getItemId())){
-                return error("参数错误");
-            }
-            if(studyTime.getVideoTime()==null){
-                return error("无时间点");
-            }
-            if(StringUtils.isBlank(studyTime.getStudyId())){
-                return error("参数错误");
-            }
-            if(StringUtils.isBlank(studyTime.getCourseId())){
-                return error("未指定课程");
-            }
-            if(StringUtils.isBlank(studyTime.getContentId())){
-                return error("未指定资源内容");
-            }
-            studyService.updateStudyDuration(studyTime.getStudyId(),studyTime.getItemId(),studyTime.getContentId(),studyTime.getVideoTime(),studyTime.getCourseId());
-            if (studyTime.getContentId() != null && studyTime.getCourseId() != null && studyTime.getProgressVideo() != null){
-                contentService.updateProcessVideo(studyTime.getContentId(), studyTime.getCourseId(), studyTime.getProgressVideo());
-            }
-
-        } catch (Exception e) {
-			log.error("updateStudyVideoTime",e);
-			return error("学习时长记录失败",e.getMessage(),null);
-        }
-		return success("true");
-    }
-
 	/**获取最后一次的学习内容*/
 	@GetMapping("/last-study")
 	public JsonResponse<Map<String,Object>> lastStudy(){

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

@@ -1,27 +1,11 @@
 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;
 
-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;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -58,15 +42,6 @@ public class StudyCourseESApi extends ApiBaseController{
 	@Autowired
 	IStudyCourseService service;
 
-	@Autowired
-	ICourseService courseService;
-
-	@Value("${xboe.upload.file.http_path}")
-	private String httpPath;
-
-	@Value("${xboe.image.course.default}")
-	private String defaultCourseImage;
-
 	@Resource
 	private PhpOnlineStudyRecordScheduledTasks phpOnlineStudyRecordScheduledTasks;
 
@@ -79,61 +54,13 @@ public class StudyCourseESApi extends ApiBaseController{
 		try {
 			dto.setAccountId(getCurrent().getAccountId());
 			PageList<CourseStudyDto> rs=search.search(page.getStartRow(),page.getPageSize(), dto);
-
-			handleCourseImage(rs);
-
 			return success(rs);
 		}catch(Exception e) {
 			log.error("查询报名学习ES失败",e);
 			return error("查询失败",e.getMessage());
 		}
 	}
-
+	
-	private void handleCourseImage(PageList<CourseStudyDto> rs) {
-		if (rs == null || CollectionUtil.isEmpty(rs.getList())) {
-			return;
-		}
-
-		List<String> emptyImageCourseIds = Lists.newArrayList();
-		for(CourseStudyDto courseStudyDto : rs.getList()) {
-			if(StringUtils.isBlank(courseStudyDto.getCourseImage())) {
-				// 过滤课程类型
-				if(courseStudyDto.getCourseType()==10
-					|| courseStudyDto.getCourseType()==20){
-					emptyImageCourseIds.add(courseStudyDto.getCourseId());
-				}else{
-					log.warn("课程图片为空，课程id为：{}，课程类型:{}",courseStudyDto.getCourseId(),courseStudyDto.getCourseType());
-				}
-			}
-		}
-
-		if(CollectionUtil.isEmpty(emptyImageCourseIds)){
-			return;
-		}
-
-		List<Course> courseList = courseService.findByIds(emptyImageCourseIds);
-		if(CollectionUtil.isNotEmpty(courseList)){
-			// courseList转换成map
-			Map<String, Course> courseMap = courseList.stream().collect(Collectors.toMap(Course::getId, course -> course));
-
-			// 赋值ES图片
-			for(CourseStudyDto courseStudyDto : rs.getList()) {
-				if(emptyImageCourseIds.contains(courseStudyDto.getCourseId())) {
-					Course currentCourse = courseMap.get(courseStudyDto.getCourseId());
-					if(null!=currentCourse){
-						if(StringUtils.isNotBlank(currentCourse.getCoverImg())){
-							// 拼接域名
-							courseStudyDto.setCourseImage(httpPath + currentCourse.getCoverImg());
-						}else{
-							// 赋值默认图片
-							courseStudyDto.setCourseImage(defaultCourseImage);
-						}
-					}
-				}
-			}
-		}
-	}
-
 	@RequestMapping(value="/list-by-ids",method = {RequestMethod.POST})
 	public JsonResponse<List<StudyCourse>> search(@RequestBody List<String> ids){
 		if(ids.isEmpty()) {

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

@@ -1,7 +1,5 @@
 package com.xboe.school.study.api;
 
-import com.xboe.api.ThirdApi;
-import com.xboe.school.study.entity.StudyCourse;
 import com.xboe.school.study.service.IStudyService;
 import com.xxl.job.core.handler.annotation.XxlJob;
 import lombok.RequiredArgsConstructor;
@@ -12,13 +10,10 @@ import org.springframework.data.redis.core.ScanOptions;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
-import java.util.function.BiConsumer;
 
 /**
  * @author by lyc
@@ -31,15 +26,13 @@ public class StudyCourseTask {
 
     private final IStudyService studyService;
     private final StringRedisTemplate redisTemplate;
-    @Resource
-    private ThirdApi thirdApi;
 
     /**
      * 定时任务
      * 获取redis 中学习结束的数据更新入库
      * */
-    @XxlJob("saveStudyCourseItemLastTime2")
+    @XxlJob("saveStudyCourseItemLastTime")
-    public void saveStudyCourseItemLastTime2() {
+    public void saveStudyCourseItemLastTime() {
         // 1. 定义匹配模式（匹配所有目标key）
         final String KEY_PATTERN = "studyContentId:*:last_active";
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss");
@@ -66,6 +59,7 @@ public class StudyCourseTask {
                         String[] parts = redisKey.split(":");
                         if (parts.length < 2) continue;
                         String studyContentId = parts[1];
+
                         // 7. 获取存储的时间点（示例逻辑）
                         String redisValue = redisTemplate.opsForValue().get(redisKey);
                         if (redisValue == null) continue;
@@ -75,15 +69,19 @@ public class StudyCourseTask {
                         if (partValues.length >= 2){
                             timestamp = LocalDateTime.parse(partValues[1], formatter);
                         }
+
                         // 8. 更新数据库（调用已有服务方法）
                         studyService.updateStudyCourseItemLastTime(studyContentId, lastStudyTime, timestamp);
+
                         // 9. 删除Redis键（原子操作）
                         redisTemplate.delete(redisKey);
+
                         log.info("处理成功 key: {}, lastStudyTime: {}", redisKey, lastStudyTime);
                     } catch (Exception e) {
                         log.error("处理失败 key: {}", redisKey, e);
                     }
                 }
+
             }
             cursor.close();
         } catch (Exception e) {
@@ -104,163 +102,5 @@ public class StudyCourseTask {
     }
 
 
-    @XxlJob("saveStudyCourseItemLastTime")
-    public void saveStudyCourseItemLastTime() {
-        // 1. 定义匹配模式（匹配所有目标key）
-        final String KEY_PATTERN = "studyId:*:courseId:*:courseContentId:*:studyItemId:*";
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss");
-        // 2. 使用SCAN安全遍历（避免阻塞）
-        ScanOptions options = ScanOptions.scanOptions()
-                .match(KEY_PATTERN)
-                .count(100) // 分页大小
-                .build();
-
-        try (RedisConnection connection = Objects.requireNonNull(redisTemplate.getConnectionFactory()).getConnection()) {
-            Cursor<byte[]> cursor = connection.scan(options);
-            // 3. 遍历处理符合条件的key
-            while (cursor.hasNext()) {
-                String redisKey = new String(cursor.next());
-                log.info("-定时任务 saveStudyCourseItemLastTime ---redisKey = " + redisKey);
-                // 4. 获取剩余TTL（秒）
-                Long ttl = redisTemplate.getExpire(redisKey, TimeUnit.SECONDS);
-
-                // 5. 过滤条件：剩余时间 >= 29天23小时30分钟（转换为秒）
-                // 总需时间 = (30天 - 30分钟) = 29天23小时30分钟 = 2590200秒
-                // 5分钟 300秒 || 2592000 - 300 = 2591700
-                if (ttl <= 2590200) {
-                    try {
-                        // 6. 提取studyContentId
-                        String[] parts = redisKey.split(":");
-                        if (parts.length < 7) continue;
-                        String studyId = parts[1];
-                        String courseId = parts[3];
-                        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){
-                            timestamp = LocalDateTime.parse(partValues[2], formatter);
-                        }
-                        // 8. 更新数据库（调用已有服务方法）
-                        studyService.newAppendStudyDuration(studyId,null,courseContentId,appendtime,timestamp);
-                        log.info("-定时任务 saveStudyCourseItemLastTime ---studyItemId = " + studyItemId);
-                        if (studyItemId != null && !studyItemId.equals("null")){
-                            log.info("-定时任务 saveStudyCourseItemLastTime --- boolean studyItemId = " + (studyItemId != null));
-                            // 8. 更新数据库（调用已有服务方法）
-                            studyService.updateStudyCourseItemLastTime(studyItemId, studyVideoTtime, timestamp);
-                        }
-                        List<StudyCourse> allUserList = thirdApi.getStudyCourseList(studyId , courseId, null);
-                        log.info("处理成功 allUserList: {}", allUserList);
-                        // 9. 删除Redis键（原子操作）
-                        redisTemplate.delete(redisKey);
-                        log.info("处理成功 key: {}, lastStudyTime: {}", redisKey, appendtime);
-                    } catch (Exception e) {
-                        log.error("处理失败 key: {}", redisKey, e);
-                    }
-                }
-            }
-            cursor.close();
-        } catch (Exception e) {
-            log.error("定时任务执行异常", e);
-        }
-
-
-    }
-
-
-    @XxlJob("saveStudyCourseItemLastTime1")
-    public void saveStudyCourseItemLastTime1() {
-        // 定义需要处理的键模式集合
-        processKeys("studyContentId:*:last_active", this::handleLastActiveKey);
-        processKeys("studyId:*:courseId:*:courseContentId:*", this::handleDurationKey);
-    }
-
-    private void processKeys(String keyPattern, BiConsumer<String, String> keyHandler) {
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss");
-        ScanOptions options = ScanOptions.scanOptions()
-                .match(keyPattern)
-                .count(100)
-                .build();
-
-        try (RedisConnection connection = Objects.requireNonNull(redisTemplate.getConnectionFactory()).getConnection()) {
-            Cursor<byte[]> cursor = connection.scan(options);
-            while (cursor.hasNext()) {
-                String redisKey = new String(cursor.next());
-                Long ttl = redisTemplate.getExpire(redisKey, TimeUnit.SECONDS);
-
-                if (ttl != null && ttl <= 2590200) {
-                    try {
-                        String redisValue = redisTemplate.opsForValue().get(redisKey);
-                        if (redisValue != null) {
-                            // 调用对应的处理方法
-                            keyHandler.accept(redisKey, redisValue);
-                        }
-                        redisTemplate.delete(redisKey);
-                        log.info("Key processed: {}", redisKey);
-                    } catch (Exception e) {
-                        log.error("Process failed [{}]", redisKey, e);
-                    }
-                }
-            }
-            cursor.close();
-        } catch (Exception e) {
-            log.error("Key processing error: {}", keyPattern, e);
-        }
-    }
-
-    // 处理 last_active 类型键
-    private void handleLastActiveKey(String redisKey, String redisValue) {
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss");
-        String[] parts = redisKey.split(":");
-        String studyContentId = parts[1];
-
-        String[] values = redisValue.split("&");
-        int lastStudyTime = Integer.parseInt(values[0]);
-        LocalDateTime timestamp = values.length >= 2 ?
-            LocalDateTime.parse(values[1], formatter) : null;
-
-        studyService.updateStudyCourseItemLastTime(studyContentId, lastStudyTime, timestamp);
-    }
-
-    // 处理 duration 类型键
-    private void handleDurationKey(String redisKey, String redisValue) {
-        String[] parts = redisKey.split(":");
-        String studyId = parts[1];
-        String courseId = parts[3];
-        String courseContentId = parts[5];
-
-        String[] values = redisValue.split("&");
-        int duration = Integer.parseInt(values[0]);
-        LocalDateTime timestamp = values.length >= 2 ?
-            LocalDateTime.parse(values[1], DateTimeFormatter.ISO_LOCAL_DATE_TIME) : null;
-
-        studyService.newAppendStudyDuration(studyId, null, courseContentId, duration, timestamp);
-
-        // 保留第三方调用
-        List<StudyCourse> allUserList = thirdApi.getStudyCourseList(studyId, courseId, null);
-        log.info("Study records synced: {}", allUserList.size());
-    }
-
-
-
-
-
-
-
-
-
-
-
-
 
 }

servers/boe-server-all/src/main/java/com/xboe/school/study/entity/StudyCourseItem.java

@@ -134,7 +134,6 @@ public class StudyCourseItem extends IdEntity {
     /**
      * 视频播放进度
      * */
-//    @Column(name = "progress_video")
     @Transient
     private BigDecimal progressVideo;
 

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

@@ -101,8 +101,4 @@ public interface IStudyService {
     List<StudyCourseItem> getList(String courseId, String contentId, String name, Integer status);
 
 	void updateStudyCourseItemLastTime(String studyContentId, int lastStudyTime, LocalDateTime timestamp);
-
-	void updateStudyDuration(String studyId,String studyItemId, String contentId, Integer videoTime,String courseId);
-
-	void newAppendStudyDuration(String studyId, String studyItemId, String courseContentId, int duration, LocalDateTime timestamp);
 }

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

@@ -116,74 +116,34 @@ public class StudyServiceImpl implements IStudyService{
 		//增加内容的学习时长
 		if(StringUtils.isNotBlank(studyItemId)) {
 			//直接根据id更新
+//			String hql="Update StudyCourseItem set studyDuration=studyDuration+"+duration+",status=(case when status<2 then 2 else status end) where id=?1";
+//			scItemDao.update(hql,studyItemId);
 			String sql="Update boe_study_course_item set study_duration=study_duration+"+duration+",status=(case when status<2 then 2 else status end) where id=?1";
 			scItemDao.sqlUpdate(sql,studyItemId);
-
+			//scItemDao.updateMultiFieldById(studyItemId, UpdateBuilder.create("studyDuration", "studyDuration+"+duration,FieldUpdateType.EXPRESSION));
+			
 		}else {
+			//根据学习id和课程内容id更新
+//			scItemDao.update(UpdateBuilder.from(StudyCourseItem.class)
+//					.addUpdateField("studyDuration", "studyDuration+"+duration,FieldUpdateType.EXPRESSION)
+//					.addFilter(FieldFilters.eq("studyId", studyId))  
+//					.addFilter(FieldFilters.eq("contentId", courseContentId))
+//					.builder());
+//			
+//			String hql="Update StudyCourseItem set studyDuration=studyDuration+"+duration+",status=(case when status<2 then 2 else status end) where studyId=?1 and contentId=?2";
+//			scItemDao.update(hql,studyId,courseContentId);
 			String sql="Update boe_study_course_item set study_duration=study_duration+"+duration+",status=(case when status<2 then 2 else status end) where study_id=?1 and content_id=?2";
 			scItemDao.sqlUpdate(sql,studyId,courseContentId);
 		}
 		
+		//追加课程的学习时长
+		//scDao.updateMultiFieldById(studyId, UpdateBuilder.create("totalDuration", "totalDuration+"+duration,FieldUpdateType.EXPRESSION));
+		
 		String sql="Update boe_study_course set total_duration=total_duration+"+duration+",status=(case when status<2 then 2 else status end),progress=(case when progress=0 then 1 else progress end),last_time = '"+LocalDateTime.now()+"' where id=?1";
 		scDao.sqlUpdate(sql,studyId);
+		
 	}
 
-	@Override
-	@Transactional
-	public void newAppendStudyDuration(String studyId,String studyItemId,String courseContentId, int duration,LocalDateTime timestamp) {
-
-		//增加内容的学习时长
-		if(StringUtils.isNotBlank(studyItemId)) {
-			//直接根据id更新
-			String sql="Update boe_study_course_item set study_duration=study_duration+"+duration+",status=(case when status<2 then 2 else status end) where id=?1";
-			scItemDao.sqlUpdate(sql,studyItemId);
-
-		}else {
-			String sql="Update boe_study_course_item set study_duration=study_duration+"+duration+",status=(case when status<2 then 2 else status end) where study_id=?1 and content_id=?2";
-			scItemDao.sqlUpdate(sql,studyId,courseContentId);
-		}
-
-		String sql="Update boe_study_course set total_duration=total_duration+"+duration+",status=(case when status<2 then 2 else status end),progress=(case when progress=0 then 1 else progress end),last_time = '"+timestamp+"' where id=?1";
-		scDao.sqlUpdate(sql,studyId);
-	}
-
-	// 更新 前端传输已学习时长
-	@Override
-	public void updateStudyDuration(String studyId,String studyItemId,String courseContentId, Integer videoTime,String courseId) {
-
-		LocalDateTime now = LocalDateTime.now();
-		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss");
-
-		String key = "studyId:" + studyId + ":courseId:" + courseId + ":courseContentId:" + courseContentId + ":studyItemId:" + studyItemId;
-		String currentValue = redisTemplate.opsForValue().get(key);
-		Integer lastDuration = 0;
-		Integer oldVideoTime = 0;
-		Integer sum = 10; // 原appendtime改为固定10秒调用一次接口
-		if (currentValue != null) {
-			String[] partValues = currentValue.split("&");
-			oldVideoTime = Integer.parseInt(partValues[0]);
-			lastDuration = Integer.parseInt(partValues[1]);
-			sum += lastDuration;
-			if(oldVideoTime > videoTime){
-				videoTime = oldVideoTime;// 取最大值最终入库
-			}
-		};
-
-		String value = videoTime + "&" + sum + "&" + now.format(formatter); // study_video_time & appendtime & time
-		log.info("-study-video-time-----value = " + value);
-
-		// 20250303 优化 多次更新改一次更新
-		// 更新Redis中的最后活跃时间（带30秒过期）
-		redisTemplate.opsForValue().set(
-				key,
-				value,
-				Duration.ofSeconds(2592000)
-		);
-		log.info("- 合并 updateStudyDuration -redis保存---value = " + value);
-//		Duration.ofDays(30)  也就是 2592000秒
-	}
-
-
 	@Override
 	@Transactional
 	public void appendStudyDuration(StudyTime st) {
@@ -206,21 +166,7 @@ public class StudyServiceImpl implements IStudyService{
 
 	@Override	
 	public List<StudyCourseItem> findByStudyId(String studyId) {
-		List<StudyCourseItem> list = scItemDao.findList(OrderCondition.desc("lastTime"),FieldFilters.eq("studyId", studyId));
+		return scItemDao.findList(OrderCondition.desc("lastTime"),FieldFilters.eq("studyId", studyId));
-		for (StudyCourseItem item : list){
-			log.info("-- studyIndex -查询上次学习的是什么资源。mysql查询---------------- item = " + item);
-			String redisKey = "studyId:" + studyId + ":courseId:" + item.getCourseId() + ":courseContentId:" + item.getContentId() + ":studyItemId:" + item.getId();
-			log.info("-- studyIndex -查询上次学习的是什么资源。查询用户的学习情况---------------- redisKey = " + redisKey);
-			String redisValue = redisTemplate.opsForValue().get(redisKey);
-			log.info("-- studyIndex -查询上次学习的是什么资源。查询用户的学习情况---------------- redisValue = " + redisValue);
-			if (redisValue != null) {
-				String[] values = redisValue.split("&");
-				int duration = Integer.parseInt(values[0]);
-				item.setLastStudyTime(duration);
-				log.info("-- studyIndex -----set 结果---------------- LastStudyTime = " + item.getLastStudyTime());
-			}
-		}
-		return list;
 	}
 
 	@Override
@@ -411,7 +357,6 @@ public class StudyServiceImpl implements IStudyService{
 		log.info("-study-video-time-mysql保存---studyContentId = " + studyContentId);
 	}
 
-
 	@Override
 	public Map<String,Object> getLast(String aid) {
 		//按lastTime排序，第一条,只是课件内容

servers/boe-server-all/src/main/java/com/xboe/school/vo/StudyTimeVo.java

@@ -1,19 +0,0 @@
-package com.xboe.school.vo;
-
-import com.xboe.school.study.entity.StudyTime;
-import lombok.Data;
-
-/** appendtime 于 study-video-time 合并
- *  appendtime 参数 StudyTime
- *  study-video-time 参数 是 StudyTimeVo
- */
-@Data
-public class StudyTimeVo extends StudyTime {
-
-    private String itemId;
-    private Integer videoTime;
-//    private String contentId; // 已继承
-//    private String courseId; // 已继承
-    private Float progressVideo;
-    private Integer type; // 0 study-video-time ,  1 appendtime
-}

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

@@ -60,7 +60,6 @@ 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")

servers/boe-server-all/src/main/resources/application-dev.yml

@@ -76,9 +76,6 @@ xboe:
     encryptor:
       algorithm: PBEWithMD5AndDES
       iv-generator-classname: org.jasypt.iv.NoIvGenerator
-  image:
-    course:
-      default: http://192.168.0.253/pc/images/bgimg/course.png
 xxl:
   job:
     accessToken: 65ddc683-22f5-83b4-de3a-3c97a0a29af0

servers/boe-server-all/src/main/resources/application-pre.yml

@@ -108,9 +108,7 @@ xboe:
     from: boeu_learning@boe.com.cn
     user:
     security:
-  image:
+
-    course:
-      default: http://10.251.132.75/pc/images/bgimg/course.png
 jasypt:
   encryptor:
     algorithm: PBEWithMD5AndDES

servers/boe-server-all/src/main/resources/application-prod.yml

@@ -74,9 +74,6 @@ xboe:
     encryptor:
       algorithm: PBEWithMD5AndDES
       iv-generator-classname: org.jasypt.iv.NoIvGenerator
-  image:
-    course:
-      default: https://u.boe.com/pc/images/bgimg/course.png
 xxl:
   job:
     accessToken: 65ddc683-22f5-83b4-de3a-3c97a0a29af0

servers/boe-server-all/src/main/resources/application-test.yml

@@ -84,7 +84,7 @@ xboe:
     file:
       temp_path: /tmp
       save_path: /home/www/elearning/upload
-      http_path: https://u-pre.boe.com/upload
+      http_path: http://10.251.186.27/upload
   externalinterface:
     url:
       system: http://localhost:9091
@@ -108,9 +108,7 @@ xboe:
     from: boeu_learning@boe.com.cn
     user:
     security:
-  image:
+
-    course:
-      default: https://u-pre.boe.com/pc/images/bgimg/course.png
 jasypt:
   encryptor:
     algorithm: PBEWithMD5AndDES

servers/boe-server-all/src/main/resources/application.yml

@@ -73,5 +73,4 @@ coursesuilt:
   updateOrSaveCourse: ${boe.domain}/manageApi/admin/teacherRecord/updateOrSaveCourse
   syncCourseStudent: ${boe.domain}/manageApi/admin/teacherRecord/syncCourseStudent
   syncOnLineScore: ${boe.domain}/manageApi/admin/teacherRecord/syncOnLineScore
-  updateOnLineStatua: ${boe.domain}/manageApi/admin/teacherRecord/updateOnLineStatua
+  updateOnLineStatua: ${boe.domain}/manageApi/admin/teacherRecord/updateOnLineStatua
-  delOnLineById: ${boe.domain}/manageApi/admin/teacherRecord/delOnLineById