临时注释多余的completeStatus接口调用

# Conflicts:
#	servers/boe-server-all/src/main/java/com/xboe/module/course/service/ICourseService.java

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

@@ -45,10 +45,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Optional;
+import java.util.*;
 import java.util.concurrent.ForkJoinPool;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
@@ -98,7 +95,8 @@ public class ThirdApi {
     private String syncOnLineScore;
     @Value("${coursesuilt.updateOnLineStatua}")
     private String updateOnLineStatua;
-
+    @Value("${coursesuilt.delOnLineById}")
+    private String delOnLineById;
 
     //获取例外人员的id
     public List<String> getUserId() {
@@ -398,4 +396,28 @@ 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);
+    }
+
+    //获取字典信息
+    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,11 +2,14 @@
 
 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;
@@ -169,19 +172,48 @@ 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
@@ -886,7 +918,7 @@ public class CourseManageApi extends ApiBaseController{
 	 * @return
 	 */
 	@PostMapping("/delete")
-	public JsonResponse<Boolean> delete(String id,Boolean erasable,String title,String remark){
+	public JsonResponse<Boolean> delete(String id,Boolean erasable,String title,String remark, HttpServletRequest request){
 		if(StringUtils.isBlank(id)){
 			return badRequest("参数错误");
 		}
@@ -901,6 +933,11 @@ 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/dao/CourseTeacherDao.java

@@ -1,12 +1,27 @@
 package com.xboe.module.course.dao;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Repository;
 
 import com.xboe.core.orm.BaseDao;
 import com.xboe.module.course.entity.CourseTeacher;
 
+import java.util.Collections;
+import java.util.List;
+
+@Slf4j
 @Repository
 public class CourseTeacherDao extends BaseDao<CourseTeacher> {
 	
-	//List<CourseTeacher> 
+	//List<CourseTeacher>
+
+    public List<CourseTeacher> findByCourseId(String courseId) {
+        try {
+            return sqlFindList("SELECT * FROM boe_course_teacher WHERE course_id = ?1", courseId);
+        } catch (Exception e) {
+            log.warn("查询课程教师列表失败", e);
+            return Collections.emptyList();
+        }
+    }
+
 }

servers/boe-server-all/src/main/java/com/xboe/module/course/dao/CourseTeacherModifyRecordDao.java

@@ -0,0 +1,31 @@
+package com.xboe.module.course.dao;
+import java.time.LocalDateTime;
+
+import com.xboe.core.orm.BaseDao;
+import com.xboe.module.course.entity.CourseTeacher;
+import com.xboe.module.course.entity.CourseTeacherModifyRecord;
+import com.xboe.module.course.util.RequestIdUtil;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author guo jia
+ */
+@Repository
+public class CourseTeacherModifyRecordDao extends BaseDao<CourseTeacherModifyRecord> {
+
+    public void insertRecord(String type, String location, CourseTeacher courseTeacher, String body) {
+        CourseTeacherModifyRecord entity = new CourseTeacherModifyRecord();
+        entity.setRequestId(RequestIdUtil.getCurrentRequestId());
+        entity.setType(type);
+        entity.setLocation(location);
+        entity.setTeacherId(courseTeacher.getTeacherId());
+        entity.setTeacherName(courseTeacher.getTeacherName());
+        entity.setCourseId(courseTeacher.getCourseId());
+        entity.setBody(body);
+        entity.setDeleted(0);
+        entity.setCreateTime(LocalDateTime.now());
+        entity.setUpdateTime(LocalDateTime.now());
+        save(entity);
+    }
+
+}

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

@@ -33,7 +33,10 @@ 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/CourseTeacherModifyRecord.java

@@ -0,0 +1,94 @@
+package com.xboe.module.course.entity;
+
+import com.xboe.core.SysConstant;
+import lombok.Data;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.time.LocalDateTime;
+
+/**
+ * 讲师操作记录表
+ * 为了监控PngCode-SZX-1241问题临时创建的表
+ */
+@Data
+@Entity
+@Table(name = SysConstant.TABLE_PRE + "course_teacher_modify_record")
+public class CourseTeacherModifyRecord {
+
+    /**
+     * 主键ID
+     */
+    @Id
+    @GeneratedValue
+    private Long id;
+
+    /**
+     * 请求ID
+     * 同一个请求ID表示删除操作是在一次请求中完成的
+     */
+    private String requestId;
+
+    /**
+     * 操作类型
+     * INSERT、UPDATE、DELETE
+     */
+    private String type;
+
+    /**
+     * 位置
+     */
+    private String location;
+
+    /**
+     * 讲师账号ID
+     */
+    private String teacherId;
+
+    /**
+     * 讲师姓名
+     */
+    private String teacherName;
+
+    /**
+     * 在线课ID
+     */
+    private String courseId;
+
+    /**
+     * 请求体
+     */
+    private String body;
+
+    /**
+     * 删除标识
+     */
+    private Integer deleted;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    /**
+     * 创建人ID
+     */
+    private Long createId;
+
+    /**
+     * 创建人姓名
+     */
+    private String createName;
+
+    /**
+     * 更新人ID
+     */
+    private Long updateId;
+}

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

@@ -342,4 +342,5 @@ public interface ICourseService {
 
 
     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/CourseServiceImpl.java

@@ -1,32 +1,6 @@
 package com.xboe.module.course.service.impl;
 
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Function;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-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.hibernate.mapping.IdGenerator;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
-
+import cn.hutool.json.JSONUtil;
 import com.xboe.TempFilterConfig;
 import com.xboe.account.service.IAccountService;
 import com.xboe.common.OrderCondition;
@@ -35,31 +9,39 @@ import com.xboe.common.beans.KeyValue;
 import com.xboe.common.utils.IDGenerator;
 import com.xboe.common.utils.StringUtil;
 import com.xboe.core.event.IEventDataSender;
-import com.xboe.module.course.dao.CourseContentDao;
-import com.xboe.module.course.dao.CourseCrowdDao;
-import com.xboe.module.course.dao.CourseDao;
-import com.xboe.module.course.dao.CourseExamDao;
-import com.xboe.module.course.dao.CourseHRBPAuditDao;
-import com.xboe.module.course.dao.CourseHomeWorkDao;
-import com.xboe.module.course.dao.CourseSectionDao;
-import com.xboe.module.course.dao.CourseTeacherDao;
-import com.xboe.module.course.dao.CourseUpdateLogDao;
+import com.xboe.core.orm.*;
+import com.xboe.module.course.dao.*;
 import com.xboe.module.course.dto.CourseFullDto;
 import com.xboe.module.course.dto.CourseQueryDto;
 import com.xboe.module.course.dto.RankingDto;
-import com.xboe.module.course.entity.Course;
-import com.xboe.module.course.entity.CourseCrowd;
-import com.xboe.module.course.entity.CourseHRBPAudit;
-import com.xboe.module.course.entity.CourseSection;
-import com.xboe.module.course.entity.CourseTeacher;
-import com.xboe.module.course.entity.CourseUpdateLog;
+import com.xboe.module.course.entity.*;
 import com.xboe.module.course.service.ICourseFullTextSearch;
 import com.xboe.module.course.service.ICourseService;
 import com.xboe.module.interaction.service.ICourseGradeService;
 import com.xboe.system.authority.service.IResDataManagerService;
 import com.xboe.system.logs.dao.SysLogAuditDao;
-
 import lombok.extern.slf4j.Slf4j;
+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.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -116,7 +98,11 @@ public class CourseServiceImpl implements ICourseService {
     @Autowired(required = false)
     private IEventDataSender eventSender;
 
+    @Resource
+    RestHighLevelClient restHighLevelClient;
 
+    @Resource
+    private CourseTeacherModifyRecordDao courseTeacherModifyRecordDao;
   
     /**
      * 生成过滤条件
@@ -174,6 +160,8 @@ 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));
             }
 
         }
@@ -826,6 +814,23 @@ public class CourseServiceImpl implements ICourseService {
 
     @Override
     public void delete(String id, boolean erasable, String aid, String name, String remark) {
+        // 增加操作boe_course_teacher表记录
+        String body = "courseId=" + id + " aid=" + aid + " name=" + name + " remark=" + remark;
+        String location = "/xboe/m/course/manage/delete";
+        List<CourseTeacher> teacherList = courseTeacherDao.findByCourseId(id);
+        String jsonStr = JSONUtil.toJsonStr(teacherList);
+        log.info("teacherList:{}", jsonStr);
+        try {
+            List<List> list = JSONUtil.toList(jsonStr, List.class);
+            list.forEach(item -> {
+                for (Object teacher : item) {
+                    courseTeacherModifyRecordDao.insertRecord("DELETE", location, (CourseTeacher) teacher, body);
+                }
+            });
+        } catch (Exception e) {
+            log.warn("增加操作boe_course_teacher表记录失败", e);
+        }
+
         if (!erasable) {
             courseDao.setDeleted(id);
             courseDao.updateFieldById(id, "name", "已删除" + name);
@@ -855,12 +860,14 @@ public class CourseServiceImpl implements ICourseService {
                     log.error("未配置事件消息发送的实现");
                 }
             }
+
+            // 删除ES数据
+            deletedStudyResourceBatchByCourseIdAndType(id,c.getType());
         } else {
             //彻底删除，课件设置为无课程状态
             courseDao.setDeleted(id);
         }
         //记录删除日志信息
-
     }
 
     @Override
@@ -907,6 +914,9 @@ public class CourseServiceImpl implements ICourseService {
             for (CourseTeacher ct : full.getTeachers()) {
                 ct.setCourseId(c.getId());
                 courseTeacherDao.save(ct);
+
+                // 增加操作boe_course_teacher表记录
+                courseTeacherModifyRecordDao.insertRecord("DELETE", "/xboe/m/course/manage/save", ct, JSONUtil.toJsonStr(full));
             }
         }
         if (full.getCrowds() != null && !full.getCrowds().isEmpty()) {
@@ -989,12 +999,29 @@ public class CourseServiceImpl implements ICourseService {
         c.setSysVersion(courseDao.getVersion(c.getId()));
         full.getCourse().setSysVersion(c.getSysVersion());
 
+        // 增加操作boe_course_teacher表记录
+        String body = null;
+        String location = null;
+        try {
+            body = JSONUtil.toJsonStr(full);
+            location = "/xboe/m/course/manage/save";
+            List<CourseTeacher> teacherList = courseTeacherDao.findByCourseId(c.getId());
+            for (CourseTeacher teacher : teacherList) {
+                courseTeacherModifyRecordDao.insertRecord("DELETE", location, teacher, body);
+            }
+        } catch (Exception e) {
+            log.warn("增加操作boe_course_teacher表记录失败", e);
+        }
+
         //先清空教师信息， 教师信息如果不一样了，也要加入到日志中
         courseTeacherDao.deleteByField("courseId", c.getId());
         if (full.getTeachers() != null && !full.getTeachers().isEmpty()) {
             for (CourseTeacher ct : full.getTeachers()) {
                 ct.setCourseId(c.getId());
                 courseTeacherDao.saveOrUpdate(ct);
+
+                // 增加操作boe_course_teacher表记录
+                courseTeacherModifyRecordDao.insertRecord("INSERT", location, ct, body);
             }
         }
         //先清空受众信息,受众信息如果不一样了，也要加入到日志中
@@ -1043,12 +1070,29 @@ public class CourseServiceImpl implements ICourseService {
         c.setSysVersion(courseDao.getVersion(c.getId()));
         full.getCourse().setSysVersion(c.getSysVersion());
 
+        // 增加操作boe_course_teacher表记录
+        String body = null;
+        String location = null;
+        try {
+            body = JSONUtil.toJsonStr(full);
+            location = "/xboe/m/course/manage/submit";
+            List<CourseTeacher> teacherList = courseTeacherDao.findByCourseId(c.getId());
+            for (CourseTeacher teacher : teacherList) {
+                courseTeacherModifyRecordDao.insertRecord("DELETE", location, teacher, body);
+            }
+        } catch (Exception e) {
+            log.warn("增加操作boe_course_teacher表记录失败", e);
+        }
+
         //先清空教师信息， 教师信息如果不一样了，也要加入到日志中
         courseTeacherDao.deleteByField("courseId", c.getId());
         if (full.getTeachers() != null && !full.getTeachers().isEmpty()) {
             for (CourseTeacher ct : full.getTeachers()) {
                 ct.setCourseId(c.getId());
                 courseTeacherDao.saveOrUpdate(ct);
+
+                // 增加操作boe_course_teacher表记录
+                courseTeacherModifyRecordDao.insertRecord("INSERT", location, ct, body);
             }
         }
         //先清空受众信息,受众信息如果不一样了，也要加入到日志中
@@ -1078,12 +1122,29 @@ public class CourseServiceImpl implements ICourseService {
         c.setPublishTime(LocalDateTime.now());
         courseDao.update(c);
 
+        // 增加操作boe_course_teacher表记录
+        String body = null;
+        String location = null;
+        try {
+            body = "body=" + JSONUtil.toJsonStr(full) + " aid=[" + aid + "] aname=[" + aname + "] ";
+            location = "/xboe/m/course/audit/submit-publish";
+            List<CourseTeacher> teacherList = courseTeacherDao.findByCourseId(c.getId());
+            for (CourseTeacher teacher : teacherList) {
+                courseTeacherModifyRecordDao.insertRecord("DELETE", location, teacher, body);
+            }
+        } catch (Exception e) {
+            log.warn("增加操作boe_course_teacher表记录失败", e);
+        }
+
         //先清空教师信息， 教师信息如果不一样了，也要加入到日志中
         courseTeacherDao.deleteByField("courseId", c.getId());
         if (full.getTeachers() != null && !full.getTeachers().isEmpty()) {
             for (CourseTeacher ct : full.getTeachers()) {
                 ct.setCourseId(c.getId());
                 courseTeacherDao.saveOrUpdate(ct);
+
+                // 增加操作boe_course_teacher表记录
+                courseTeacherModifyRecordDao.insertRecord("INSERT", location, ct, body);
             }
         }
         //先清空受众信息,受众信息如果不一样了，也要加入到日志中
@@ -1987,5 +2048,17 @@ 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/course/util/RequestIdUtil.java

@@ -0,0 +1,50 @@
+package com.xboe.module.course.util;
+
+import cn.hutool.core.util.HexUtil;
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+import java.security.SecureRandom;
+
+/**
+ * @author guo jia
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class RequestIdUtil {
+
+    private static final SecureRandom RANDOM = new SecureRandom();
+
+    public static final String REQUEST_ID_KEY = "requestId";
+
+    public static String genRequestId() {
+        byte[] bytes = new byte[8];
+        RequestIdUtil.RANDOM.nextBytes(bytes);
+        return HexUtil.encodeHexStr(bytes);
+    }
+
+    public static void genAndSetRequestId() {
+        setRequestId(genRequestId());
+    }
+
+    public static void setRequestId(String requestId) {
+        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        if (attributes != null) {
+            HttpServletRequest request = attributes.getRequest();
+            request.setAttribute(REQUEST_ID_KEY, requestId);
+        }
+    }
+
+    public static String getCurrentRequestId() {
+        ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        String requestId = null;
+        if (attributes != null) {
+            HttpServletRequest request = attributes.getRequest();
+            requestId = (String) request.getAttribute(REQUEST_ID_KEY);
+        }
+        return requestId;
+    }
+
+}

servers/boe-server-all/src/main/java/com/xboe/module/popup/entity/Popup.java

@@ -1,5 +1,6 @@
 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;
@@ -24,12 +25,14 @@ 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/school/study/api/StudyCourseApi.java

@@ -10,11 +10,14 @@ 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;
 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;
@@ -232,7 +235,30 @@ 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) {
@@ -275,19 +301,6 @@ 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);
@@ -579,8 +592,8 @@ public class StudyCourseApi extends ApiBaseController{
 		}
 		try {
 			studyService.finishVideoStudyItem(itemId, studyId,courseId,cnum,token);
-			List<StudyCourse> allUserList = thirdApi.getStudyCourseList(studyId ,courseId, token);
-			log.info("在线课学习记录"+allUserList);
+//			List<StudyCourse> allUserList = thirdApi.getStudyCourseList(studyId ,courseId, token);
+//			log.info("在线课学习记录"+allUserList);
 			return success(true);
 		}catch(Exception e) {
 			log.error("记录内容学习完成错误",e);
@@ -625,7 +638,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("参数错误");
 		}
@@ -655,7 +668,91 @@ 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/StudyCourseTask.java

@@ -1,5 +1,7 @@
 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;
@@ -10,10 +12,13 @@ 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
@@ -26,13 +31,15 @@ public class StudyCourseTask {
 
     private final IStudyService studyService;
     private final StringRedisTemplate redisTemplate;
+    @Resource
+    private ThirdApi thirdApi;
 
     /**
      * 定时任务
      * 获取redis 中学习结束的数据更新入库
      * */
-    @XxlJob("saveStudyCourseItemLastTime")
-    public void saveStudyCourseItemLastTime() {
+    @XxlJob("saveStudyCourseItemLastTime2")
+    public void saveStudyCourseItemLastTime2() {
         // 1. 定义匹配模式（匹配所有目标key）
         final String KEY_PATTERN = "studyContentId:*:last_active";
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss");
@@ -59,7 +66,6 @@ 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;
@@ -69,19 +75,15 @@ 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) {
@@ -102,5 +104,159 @@ 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);
+                        log.info("-定时任务 saveStudyCourseItemLastTime ---redisValue = " + redisValue);
+                        if (redisValue == null) continue;
+                        String[] partValues = redisValue.split("&");
+                        int studyVideoTtime = Integer.parseInt(partValues[0]);
+                        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/service/IStudyService.java

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

@@ -10,6 +10,7 @@ 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;
@@ -170,15 +171,32 @@ public class StudyExamServiceImpl implements IStudyExamService{
 			}
 			builder.addGroupBy("studyId");
 			List<StudyExam> list1 = dao.findList(builder.builder());
-			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("----------判断进度完毕----------------------");
+			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--判断进度完毕----------------------");
+				}
 			}
+
 		} catch (Exception exception) {
 			exception.printStackTrace();
 			log.info("------异常----------------------：" +exception.getMessage());

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

@@ -116,34 +116,74 @@ 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) {
@@ -166,7 +206,21 @@ public class StudyServiceImpl implements IStudyService{
 
 	@Override	
 	public List<StudyCourseItem> findByStudyId(String studyId) {
-		return scItemDao.findList(OrderCondition.desc("lastTime"),FieldFilters.eq("studyId", studyId));
+		List<StudyCourseItem> list = 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
@@ -228,11 +282,12 @@ 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 " +
+				"IFNULL(b.finish_time, '0') as finish_time, IFNULL(b.progress, 0) as progress, IFNULL(b.status, 1) as status,b.score " +
 				"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 " +
+				"(select bsc.id, bsc.course_id, bsc.course_name, bsc.aname, item.finish_time, item.progress, item.status,MAX(item.score) score " +
 				"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 " +
@@ -261,6 +316,9 @@ 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);
@@ -357,6 +415,7 @@ 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

@@ -0,0 +1,19 @@
+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/resources/application.yml

@@ -73,4 +73,5 @@ 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