linshi

# Conflicts:
#	modules/boe-module-es/src/main/java/com/xboe/module/elasticsearc/ElasticsearchConfig.java
#	servers/boe-server-all/pom.xml
#	servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java
#	servers/boe-server-all/src/main/resources/application-pro.properties
#	servers/boe-server-all/src/main/resources/application-test.properties
#	servers/boe-server-all/src/main/resources/application.properties

servers/boe-server-all/pom.xml

@@ -219,13 +219,13 @@
         <dependency>
             <groupId>org.elasticsearch</groupId>
             <artifactId>elasticsearch</artifactId>
-            <version>7.9.0</version> <!-- 请根据实际需求选择合适的版本 -->
+            <version>7.10.2</version> <!-- 请根据实际需求选择合适的版本 -->
         </dependency>
 
         <dependency>
             <groupId>org.elasticsearch.client</groupId>
             <artifactId>elasticsearch-rest-high-level-client</artifactId>
-            <version>7.9.0</version> <!-- 请根据实际需求选择合适的版本 -->
+            <version>7.10.2</version> <!-- 请根据实际需求选择合适的版本 -->
         </dependency>
 
         <dependency>
@@ -237,9 +237,10 @@
         <dependency>
             <groupId>com.xuxueli</groupId>
             <artifactId>xxl-job-core</artifactId>
-            <version>2.3.0</version> <!-- 请根据实际需求选择版本 -->
+            <version>2.3.0</version>
         </dependency>
 
+
     </dependencies>
     <build>
         <plugins>
@@ -269,9 +270,9 @@
     </build>
     <profiles>
         <profile>
-            <id>prod</id>
+            <id>pro</id>
             <properties>
-                <profileActive>prod</profileActive>
+                <profileActive>pro</profileActive>
             </properties>
         </profile>
         <profile>

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

@@ -8,11 +8,9 @@ import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.boe.feign.api.courseweb.entity.ExamTestDto;
 import com.boe.feign.api.courseweb.entity.ProjectStudyDto;
-import com.boe.feign.api.courseweb.remote.ExternalRemoteClient;
 import com.boe.feign.api.courseweb.remote.OffCourseRemoteClient;
 import com.boe.feign.api.courseweb.remote.ProjectAdminRemoteClient;
 import com.boe.feign.api.courseweb.remote.ProjectRemoteClient;
-import com.boe.feign.api.courseweb.reps.ExamStudyRecordParam;
 import com.boe.feign.api.infrastructure.entity.CommonSearchVo;
 import com.boe.feign.api.infrastructure.entity.Dict;
 import com.boe.feign.api.infrastructure.remote.DictRemoteClient;
@@ -24,11 +22,11 @@ import com.boe.feign.api.usercenter.reps.AudienceMemberVo;
 import com.boe.feign.api.usercenter.reps.Response;
 import com.xboe.api.infrastructure.res.InfraResult;
 import com.xboe.api.vo.*;
-import com.xboe.module.course.dto.CourseParam;
-import com.xboe.module.course.dto.ScoreParam;
 import com.xboe.common.PageList;
 import com.xboe.common.Pagination;
 import com.xboe.core.JsonResponse;
+import com.xboe.module.course.dto.CourseParam;
+import com.xboe.module.course.dto.ScoreParam;
 import com.xboe.module.course.vo.StudyCourseVo;
 import com.xboe.module.course.vo.TeacherVo;
 import com.xboe.module.dict.entity.DictDto;
@@ -75,8 +73,6 @@ public class ThirdApi {
 
     @Resource
     private ProjectRemoteClient projectRemoteClient;
-    @Resource
-    ExternalRemoteClient externalRemoteClient;
 
     @Resource
     private DictRemoteClient dictRemoteClient;
@@ -96,10 +92,9 @@ public class ThirdApi {
     private String syncCourseStudent;
     @Value("${coursesuilt.syncOnLineScore}")
     private String syncOnLineScore;
-    @Value("${coursesuilt.updateOnLineStatua}")
-    private String updateOnLineStatua;
-    @Value("${coursesuilt.delOnLineById}")
-    private String delOnLineById;
+    @Value("${coursesuilt.updateOnLineStatus}")
+    private String updateOnLineStatus;
+
 
     //获取例外人员的id
     public List<String> getUserId() {
@@ -267,19 +262,11 @@ public class ThirdApi {
     }
 
     public List<StudyCourse> getStudyCourseList(String studyId, String courseId, String token) {
-        log.info(" 1  studyId = "+ studyId + " ,courseId = " + courseId );
-        if ( studyId == null || courseId == null ){
-            log.error(" 在线课学习记录 参数不能为空 ");
-            return new ArrayList<>();
-        }
         StudyCourseVo studyCourseVo = new StudyCourseVo();
         studyCourseVo.setStudyId(studyId);
         studyCourseVo.setCourseId(courseId);
         ProjectStudyDto projectStudyDto = new ProjectStudyDto();
-//        BeanUtil.copyProperties(studyCourseVo, studyCourseVo);
-        projectStudyDto.setStudyId(Long.parseLong(studyId));
-        projectStudyDto.setCourseId(Long.parseLong(courseId));
-        log.info(" 12 在线课学习记录 studyId = "+ projectStudyDto.getStudyId() + " ,courseId = " + projectStudyDto.getCourseId() );
+        BeanUtil.copyProperties(studyCourseVo, studyCourseVo);
         projectRemoteClient.updateStudyStatus(projectStudyDto);
         return new ArrayList<>();
     }
@@ -389,22 +376,10 @@ public class ThirdApi {
                         .body()).orElseThrow(() -> new RuntimeException("token校验失败"));
         log.info("syncOnLineScore = " + resp);
     }
-    public void updateOnLineStatua(CourseParam param, String token){
+    public void updateOnLineStatus(CourseParam param, String token){
         String resp = Optional.ofNullable(
-                HttpRequest.post(updateOnLineStatua).body(JSONUtil.toJsonStr(param)).header("token", token).execute()
+                HttpRequest.post(updateOnLineStatus).body(JSONUtil.toJsonStr(param)).header("token", token).execute()
                         .body()).orElseThrow(() -> new RuntimeException("token校验失败"));
         log.info("updateOrSaveCourse = " + resp);
     }
-
-    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/config/ConditionException.java

@@ -0,0 +1,25 @@
+package com.xboe.config;
+
+public class ConditionException extends RuntimeException{
+    private Integer code;
+    private String message;
+
+
+    public ConditionException(Integer code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+    public ConditionException(String message) {
+        this(600, message);
+    }
+
+    public Integer getCode() {
+        return this.code;
+    }
+
+    @Override
+    public String getMessage() {
+        return message;
+    }
+}

servers/boe-server-all/src/main/java/com/xboe/config/JwtUtils.java

@@ -0,0 +1,63 @@
+package com.xboe.config;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
+import com.xboe.common.utils.Sha256Mac;
+import org.apache.commons.codec.binary.Base64;
+
+import java.util.Map;
+
+/**
+ * Jwt工具类
+ *
+ * @author ruoyi
+ */
+public class JwtUtils {
+
+    public static final String secretKey = "JDF_BOE";
+
+    /**
+     * 从数据声明生成令牌
+     *
+     * @param claims 数据声明
+     * @return 令牌
+     */
+    public static String createToken(Map<String, Object> claims) {
+        JSONObject header = new JSONObject();
+        header.put("alg", "HS256");
+        header.put("type", "token");
+        String payload64 = Base64.encodeBase64String(JSON.toJSONString(claims).getBytes());
+        String header64 = Base64.encodeBase64String(header.toString().getBytes());
+        String sign = Sha256Mac.sha256_mac(header64 + payload64, secretKey);
+        return header64 + "." + payload64 + "." + sign;
+    }
+
+    /**
+     * 从令牌中获取数据声明
+     *
+     * @param token 令牌
+     * @return 数据声明
+     */
+    public static Map<String, Object> parseToken(String token) throws ConditionException {
+        String[] tokens = token.split("\\.");
+        if (tokens.length != 3) {
+            throw new ConditionException("token不合法 : " + token);
+        }
+        String payload = new String(Base64.decodeBase64(tokens[1]));
+        String sign = Sha256Mac.sha256_mac(tokens[0] + tokens[1], secretKey);
+        if (sign.equals(tokens[2])) {
+            JSONObject jsonObject = JSON.parseObject(payload);
+            long exp = jsonObject.getLong("exp");
+            long now = System.currentTimeMillis() / 1000;
+            if (now > exp) {
+                throw new ConditionException("token过期 : " + token);
+            }
+            Map<String, Object> map = JSON.parseObject(payload, new TypeReference<Map<String, Object>>() {
+            });
+            return map;
+        } else {
+            throw new ConditionException("token错误 : " + token);
+        }
+    }
+
+}

servers/boe-server-all/src/main/java/com/xboe/config/WebConfig.java

@@ -1,5 +1,6 @@
 package com.xboe.config;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
@@ -7,11 +8,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.http.MediaType;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.cbor.MappingJackson2CborHttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
-import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 import java.util.List;
@@ -21,15 +20,6 @@ public class WebConfig implements WebMvcConfigurer {
 
     private static final Logger logger = LoggerFactory.getLogger(WebConfig.class);
 
-    @Override
-    public void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
-        configurer.favorParameter(true)
-                .defaultContentType(MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML)
-                .parameterName("mediaType")
-                .mediaType("json", MediaType.APPLICATION_JSON)
-                .mediaType("xml", MediaType.APPLICATION_XML);
-    }
-
     //结果处理器
     @Bean
     public MappingJackson2HttpMessageConverter mappingJackson2HttpMessageConverter(ObjectMapper objectMapper) {
@@ -40,10 +30,9 @@ public class WebConfig implements WebMvcConfigurer {
     public ObjectMapper objectMapper() {
         ObjectMapper mapper = new ObjectMapper();
         mapper.registerModule(new JavaTimeModule());
-        mapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true);
+        mapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY,true);
         return mapper;
     }
-
     /**
      * 在默认的消息转换器基础上添加或移除某些转换器
      * 保证StringHttpMessageConverter在FastJsonHttpMessageConverter前被调用

servers/boe-server-all/src/main/java/com/xboe/constants/CacheName.java

@@ -22,6 +22,8 @@ public interface CacheName {
      */
     String NAME_USER = "user";
 
+    String NAME_INFO = "userInfo";
+
     /**
      * 用户名缓存KEY前缀
      */

servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java

@@ -122,20 +122,13 @@ public class OutSideDataServiceImpl implements IOutSideDataService {
 	            //这里应该是单独的线程去处理
 	        	user.setId(getNodeText(result.get("userId")));//最新接口变化，id改成userId
 	        	String band=getNodeText(result.get("bandCode"));
-				try {
-					if(StringUtils.isNotBlank(band) && band.length()>4 && band.contains("band")) {
-						String bandNum=band.substring(4);
-						user.setBandLevel(Integer.valueOf(bandNum));
-					}else if (StringUtils.isNotBlank(band) && band.length()>4 && band.contains("Level")) {
-						String bandNum=band.substring(5);
-						user.setBandLevel(Integer.valueOf(bandNum));
-					}else {
-						user.setBandLevel(0);
-					}
-				} catch (NumberFormatException e) {
-					user.setBandLevel(0);
-				}
-				user.setAvatar(getNodeText(result.get("avatar")));
+	        	if(StringUtils.isNotBlank(band) && band.length()>4) {
+	        		String bandNum=band.substring(4);
+	        		user.setBandLevel(Integer.valueOf(bandNum));
+	        	}else {
+	        		user.setBandLevel(0);
+	        	}
+	        	user.setAvatar(getNodeText(result.get("avatar")));
 	        	user.setCode(getNodeText(result.get("userNo")));
 	        	
 	        	if(StringUtils.isBlank(user.getCode())) {

servers/boe-server-all/src/main/java/com/xboe/data/service/impl/DataUserSyncServiceImpl.java

@@ -2,16 +2,11 @@ package com.xboe.data.service.impl;
 
 import java.time.LocalDateTime;
 
-import javax.annotation.Resource;
 import javax.transaction.Transactional;
 
 import com.boe.feign.api.serverall.entity.UserData;
-import com.xboe.constants.CacheName;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cache.Cache;
-import org.springframework.cache.CacheManager;
-import org.springframework.cache.annotation.Cacheable;
 import org.springframework.retry.annotation.Recover;
 import org.springframework.retry.annotation.Retryable;
 import org.springframework.stereotype.Service;
@@ -44,9 +39,6 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService {
     @Autowired
     TeacherDao teacherDao;
 
-    @Resource
-    private CacheManager cacheManager;
-
 
     @Override
     @Transactional
@@ -67,8 +59,6 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService {
                 a.setDeleted(user.getDeleted());
             }
             a.setLoginName(user.getCode());
-            a.setMobile(user.getMobile());
-            a.setEmail(user.getEmail());
             log.info("更新账号code");
             accountDao.update(a);
         } else {
@@ -81,18 +71,14 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService {
             a.setRegTime(LocalDateTime.now());
             a.setSysId(user.getKid());
             a.setStatus(1);
-            a.setMobile(user.getMobile());
-            a.setEmail(user.getEmail());
             accountDao.save(a);
             log.info("账号不存在，新添加账号【" + user.getId() + "】");
         }
-
         if (u != null) {
             //更新部分用户字段
             u.setDepartId(user.getDepartId());
             u.setDepartName(user.getDepartName());
             u.setName(user.getName());
-            u.setMobileNo(user.getMobile());
             //2022-12-8 去掉用户类型的更新，因为返回的数据都是学员，
             //u.setUserType(user.getUserType());
             if (user.getLearningDuration() > 0) { //不大于0才会更新
@@ -120,17 +106,9 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService {
             } else {
                 u.setShowHome(true);//band16以下，及其它无bandLevel的信息
             }
-            u.setMobileNo(user.getMobile());
             userDao.save(u);
             log.info("添加新用户");
         }
-
-        Cache cache = cacheManager.getCache(CacheName.NAME_USER);
-        if(cache != null) {
-            cache.evict(CacheName.KEY_ACCOUNT + user.getId());
-            cache.evict(CacheName.KEY_USER + user.getId());
-        }
-
         //对机构的判断，不为空时才会处理，为空时不处理
         if (StringUtils.isNotBlank(user.getDepartId())) {
             org = orgDao.get(user.getDepartId());

servers/boe-server-all/src/main/java/com/xboe/module/boecase/api/CasesApi.java

@@ -140,9 +140,6 @@ public class CasesApi extends ApiBaseController {
             List<Cases> cases = views.getList();
             if (CollUtil.isNotEmpty(cases)) {
                 for (Cases c : cases) {
-                    if ("null".equals(c.getSummary())) {
-                        c.setSummary(null);
-                    }
                     StringBuffer stringBuffer = new StringBuffer();
                     List<CasesMajorType> caseId = casesMajorTypeDao.findList(FieldFilters.eq("caseId", c.getId()));
                     if (caseId != null && !caseId.isEmpty()) {

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

@@ -9,7 +9,6 @@ import javax.servlet.http.HttpServletRequest;
 
 import com.xboe.api.ThirdApi;
 import com.xboe.module.course.dto.CourseParam;
-import com.xboe.module.course.service.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -29,6 +28,10 @@ import com.xboe.module.course.entity.Course;
 import com.xboe.module.course.entity.CourseAudit;
 import com.xboe.module.course.entity.CourseContent;
 import com.xboe.module.course.entity.CourseHRBPAudit;
+import com.xboe.module.course.service.ICourseAuditService;
+import com.xboe.module.course.service.ICourseContentService;
+import com.xboe.module.course.service.ICourseHRBPAuditService;
+import com.xboe.module.course.service.ICourseService;
 import com.xboe.standard.enums.BoedxContentType;
 import com.xboe.standard.enums.BoedxCourseType;
 
@@ -57,8 +60,7 @@ public class CourseAuditApi  extends ApiBaseController{
 	private ICourseContentService ccontentService;
 	@Resource
 	private ThirdApi thirdApi;
-	@Resource
-	private ICourseTagService tagService;
+
 
 	/**
 	 * 教师需要审核的课程
@@ -357,7 +359,7 @@ public class CourseAuditApi  extends ApiBaseController{
 				String token = request.getHeader("Xboe-Access-Token");
 				CourseParam param = new CourseParam();
 				param.setId(courseId);
-				thirdApi.updateOnLineStatua(param,token);
+				thirdApi.updateOnLineStatus(param,token);
 			}
 			return success(true);
 		} catch (Exception e) {
@@ -422,21 +424,6 @@ public class CourseAuditApi  extends ApiBaseController{
 		dto.getCourse().setEnabled(true);//设置启用状态问题
 		dto.getCourse().setPublished(false);//重新提交审核设置为未发布状态
 		try {
-			log.info("------课程提审-- 标签相关开始 ------- 课程ID = {} " , dto.getCourse().getId());
-			Course oldCourse = StringUtils.isBlank(dto.getCourse().getId()) ? null : courseService.get(dto.getCourse().getId());
-			if(oldCourse!=null && StringUtils.isNotEmpty(oldCourse.getTags())){
-				String[] tagArray = oldCourse.getTags().split(",");
-				// 检查每个元素是否为纯数字
-				for (String tag : tagArray) {
-					if (!tag.matches("\\d+")) { // 使用正则表达式检查是否为纯数字
-						log.info("-------- 不是纯数字 ------- tag = {} " , tag);
-						oldCourse.setTags(null); // 兼容
-						break;
-					}
-				}
-			}
-			tagService.updateTags(oldCourse,dto.getCourse(),cuser);
-			log.info("-----课程提审--- 标签相关结束 -------");
 
 			courseService.submitAndPublish(dto,cuser.getAccountId(),cuser.getName());
 			log.info("---------------在线课开始同步到讲师管理 ------- token = " + token);

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

@@ -11,12 +11,7 @@ import com.boe.feign.api.serverall.entity.UserData;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.xboe.api.ThirdApi;
-import com.xboe.core.orm.FieldFilters;
-import com.xboe.core.orm.IFieldFilter;
-import com.xboe.core.orm.QueryBuilder;
 import com.xboe.data.outside.IOutSideDataService;
-import com.xboe.module.course.entity.CourseTag;
-import com.xboe.module.course.service.*;
 import com.xboe.module.course.vo.TeacherVo;
 import com.xboe.school.study.entity.StudyCourse;
 import com.xboe.school.study.service.IStudyCourseService;
@@ -39,6 +34,11 @@ import com.xboe.module.course.dto.CourseTeacherDto;
 import com.xboe.module.course.entity.Course;
 import com.xboe.module.course.entity.CourseCrowd;
 import com.xboe.module.course.entity.CourseTeacher;
+import com.xboe.module.course.service.CourseToCourseFullText;
+import com.xboe.module.course.service.ICourseContentService;
+import com.xboe.module.course.service.ICourseFullTextSearch;
+import com.xboe.module.course.service.ICourseService;
+import com.xboe.module.course.service.ICourseTeacherService;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -63,8 +63,7 @@ public class CourseFullTextApi  extends ApiBaseController{
 	ICourseFullTextSearch fullTextSearch;
 	@Resource
 	IOrganizationService organizationService;
-	@Autowired
-	ICourseTagService courseTagService;
+
 	@Resource
 	IStudyCourseService IStudyCourseService;
 
@@ -77,8 +76,6 @@ public class CourseFullTextApi  extends ApiBaseController{
 	@Autowired
 	StringRedisTemplate redisTemplate;
 
-
-
 	/**
 	 * 课程的初始化
 	 * @return
@@ -288,9 +285,9 @@ public class CourseFullTextApi  extends ApiBaseController{
 		paras.setTypes(dto.getTypes());//多个分类的情况
 		//用户的companyId
 		paras.setCompanyId(dto.getCompanyId());
-		if(StringUtils.isNotBlank(dto.getAudiences())) {
-			paras.setAudiences(dto.getAudiences().split(","));
-		}
+//		if(StringUtils.isNotBlank(dto.getAudiences())) {
+//			paras.setAudiences(dto.getAudiences().split(","));
+//		}
 		if(StringUtils.isNotBlank(userIds)) {
 			paras.setSysCreateAids(userIds.split(","));
 		}
@@ -313,34 +310,7 @@ public class CourseFullTextApi  extends ApiBaseController{
 		}
 
 		paras.setDevice(dto.getDevice());
-		String tagIds = dto.getTags();
-		log.info("课程查询 tagIds = " + tagIds);
-		if (tagIds != null && tagIds != ""){
-			paras.setTags(tagIds);
-		}else {
-			String tagName = dto.getKeyword();
-			log.info("课程查询 关键字 = " + tagName);
-			if (StringUtils.isNotEmpty(tagName)){
-				//精准查询
-//				CourseTag courseTag = courseTagService.getTagByName(tagName);
-//				log.info("课程查询 关键字对应标签 = " + courseTag);
-//				if (courseTag != null){
-//					paras.setTags(courseTag.getId());
-//				}
-				// 获取所有标签并进行模糊匹配
-				List<CourseTag> allTags = courseTagService.getAllTags();
-				List<String> matchedTagIds = new ArrayList<>();
-				for (CourseTag tag : allTags) {
-					// 使用模糊匹配（不区分大小写）
-					if (tag.getTagName() != null && tag.getTagName().toLowerCase().contains(tagName.toLowerCase())) {
-						matchedTagIds.add(tag.getId());
-					}
-				}
-				if (!matchedTagIds.isEmpty()) {
-					paras.setTags(String.join(",", matchedTagIds));
-				}
-			}
-		}
+
 		try {
 			//后续会根据当前用户的资源归属查询
 			PageList<CourseFullText> coursePageList = fullTextSearch.search(ICourseFullTextSearch.DEFAULT_INDEX_NAME,pager.getStartRow(), pager.getPageSize(),paras);
@@ -432,12 +402,6 @@ public class CourseFullTextApi  extends ApiBaseController{
 						c.setKeywordsList(keywordsList);
 					}
 				}
-				if (StringUtils.isNotBlank(c.getTags()) && c.getTags().matches("[0-9,]+")) {
-					List<CourseTag> tagList = courseTagService.getTagsByIds(c.getTags());
-					List<String> tags = tagList.stream().map(CourseTag::getTagName).collect(Collectors.toList());
-					c.setTagsList(tags);
-				}
-
 			}
 
 

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

@@ -9,8 +9,6 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.xboe.api.ThirdApi;
 import com.xboe.module.course.dto.*;
-import com.xboe.module.course.entity.*;
-import com.xboe.module.course.service.*;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -30,6 +28,19 @@ import com.xboe.data.dto.UserOrgIds;
 import com.xboe.data.outside.IOutSideDataService;
 import com.xboe.data.service.IDataUserSyncService;
 import com.xboe.module.assistance.service.IEmailService;
+import com.xboe.module.course.entity.Course;
+import com.xboe.module.course.entity.CourseContent;
+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.service.ICourseContentService;
+import com.xboe.module.course.service.ICourseCrowdService;
+import com.xboe.module.course.service.ICourseHRBPAuditService;
+import com.xboe.module.course.service.ICourseSectionService;
+import com.xboe.module.course.service.ICourseService;
+import com.xboe.module.course.service.ICourseTeacherService;
 import com.xboe.module.excel.ExportsExcelSenderUtil;
 import com.xboe.standard.enums.BoedxContentType;
 import com.xboe.standard.enums.BoedxCourseType;
@@ -80,10 +91,10 @@ public class CourseManageApi extends ApiBaseController{
 	
 	@Resource
 	private ICourseHRBPAuditService hrbpAuditService;
-	@Resource
-	private ICourseTagService tagService;
+	
 	@Resource
 	IOutSideDataService outSideDataService;
+	
 	@Autowired
     IDataUserSyncService userSyncService;
 	@Resource
@@ -158,18 +169,14 @@ public class CourseManageApi extends ApiBaseController{
 		List<CourseSection> sectionlist=sectionService.getByCourseId(id);
 		List<CourseTeacher> teachers=courseService.findTeachersByCourseId(id);
 		List<CourseCrowd> crowds=courseService.findCrowdByCourseId(id);
-		if (StringUtils.isNotBlank(course.getTags()) && course.getTags().matches("[0-9,]+")){
-			List<CourseTag> tagList = tagService.getTagsByIds(course.getTags());
-			rs.put("tagList", tagList);
-		}
-
-
+		
+		//
 		rs.put("course",course);
 		rs.put("contents",cclist);
 		rs.put("sections",sectionlist);
 		rs.put("teachers",teachers);
 		rs.put("crowds",crowds);
-
+		
 		
 		return success(rs);
 		
@@ -283,25 +290,6 @@ public class CourseManageApi extends ApiBaseController{
 		
 		//填充必要的信息
 		try {
-			log.info("-------- 标签相关开始 ------- 课程ID = {} " , dto.getCourse().getId());
-			CurrentUser userInfo = getCurrent();
-			Course oldCourse = StringUtils.isBlank(dto.getCourse().getId()) ? null : courseService.get(dto.getCourse().getId());
-			log.info("-------- 标签相关 ------- oldtags = {} " , oldCourse.getTags());
-			if(oldCourse!=null && StringUtils.isNotEmpty(oldCourse.getTags())){
-				String[] tagArray = oldCourse.getTags().split(",");
-				// 检查每个元素是否为纯数字
-				for (String tag : tagArray) {
-					if (!tag.matches("\\d+")) { // 使用正则表达式检查是否为纯数字
-						log.info("-------- 不是纯数字 ------- tag = {} " , tag);
-						oldCourse.setTags(null); // 兼容
-						break;
-					}
-				}
-			}
-			log.info("-------- 标签相关 updateTags ------- oldtags = {} " , oldCourse.getTags());
-			tagService.updateTags(oldCourse,dto.getCourse(),userInfo);
-			log.info("-------- 标签相关结束 -------");
-
 			if(StringUtils.isBlank(dto.getCourse().getId())) {
 				//只有在第一次添加保存时才会这样
 				fillCourseData(dto.getCourse());
@@ -357,10 +345,6 @@ public class CourseManageApi extends ApiBaseController{
 				//修改后重置，重新提交审核，重新发布
 				courseService.update(course,true);
 			}
-			//查询是否需要标签提示
-			String aid=getCurrent().getAccountId();
-			Boolean isTip = courseService.getCourseTip(aid);
-			course.setIsTip(isTip);
 			return success(course);
 		} catch (Exception e) {
 			log.error("整体保存课程信息错误",e);
@@ -902,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("参数错误");
 		}
@@ -917,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);
@@ -1190,10 +1169,5 @@ public class CourseManageApi extends ApiBaseController{
 		return success(courses);
 	}
 
-	@PostMapping("/saveTip")
-	public JsonResponse<Boolean> saveTip(){
-		String aid=getCurrent().getAccountId();
-		courseService.saveTip(aid);
-		return success(true);
-	}
+
 }

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

@@ -314,10 +314,8 @@ public class CoursePortalApi extends ApiBaseController{
 			User user = userService.get(ct.getTeacherId());
 			if(t!=null) {
 				ct.setRemark(t.getDescription());
-				ct.setSupplier(t.getSupplier());
-				ct.setTeacherType(t.getTeacherType());
 				if(redisTemplate.opsForValue().get(ct.getTeacherId())!=null){
-					if(Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1") && ( t==null ||  t.getTeacherType() == 1)){
+					if(Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1")){
 						ct.setTeacherName("BOE教师");
 					}
 					teacherCourseDto.setCourseId(ct.getCourseId());
@@ -329,15 +327,13 @@ public class CoursePortalApi extends ApiBaseController{
 					teacherCourseDto.setSysCreateBy(ct.getSysCreateBy());
 					teacherCourseDto.setSysCreateTime(ct.getSysCreateTime());
 					teacherCourseDto.setId(ct.getId());
-					if(user!=null){
-						teacherCourseDto.setUserNo(user.getUserNo());
-					}
+					teacherCourseDto.setUserNo(user.getUserNo());
 					teacherCourseDtos.add(teacherCourseDto);
 				}else if (redisTemplate.opsForValue().get(ct.getTeacherId())==null){
 					List<String> list=new ArrayList<>();
 					list.add(ct.getTeacherId());
 					getTeacherInfo(request.getHeader("Xboe-Access-Token"),list);
-					if(Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1") && ( t==null ||  t.getTeacherType() == 1)){
+					if(Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1")){
 						ct.setTeacherName("BOE教师");
 					}
 					teacherCourseDto.setCourseId(ct.getCourseId());
@@ -349,9 +345,7 @@ public class CoursePortalApi extends ApiBaseController{
 					teacherCourseDto.setSysCreateBy(ct.getSysCreateBy());
 					teacherCourseDto.setSysCreateTime(ct.getSysCreateTime());
 					teacherCourseDto.setId(ct.getId());
-					if(user!=null){
-						teacherCourseDto.setUserNo(user.getUserNo());
-					}
+					teacherCourseDto.setUserNo(user.getUserNo());
 					teacherCourseDtos.add(teacherCourseDto);
 				}
 			}

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

@@ -1,192 +0,0 @@
-package com.xboe.module.course.api;
-
-import com.xboe.common.OrderCondition;
-import com.xboe.common.PageList;
-import com.xboe.common.Pagination;
-import com.xboe.core.CurrentUser;
-import com.xboe.core.JsonResponse;
-import com.xboe.core.api.ApiBaseController;
-import com.xboe.core.orm.FieldFilters;
-import com.xboe.core.orm.IFieldFilter;
-import com.xboe.module.article.entity.Article;
-import com.xboe.module.article.service.IArticleService;
-import com.xboe.module.course.dto.CourseTagQueryDto;
-import com.xboe.module.course.dto.CourseTagRelationDto;
-import com.xboe.module.course.entity.CourseTag;
-import com.xboe.module.course.entity.CourseTagRelation;
-import com.xboe.module.course.service.ICourseTagService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Pattern;
-
-/**
- * @ClassName:CourseTagApi
- * @author:zhengge@oracle.com
- * @since:2025/7/2614:27
- */
-@Slf4j
-@RestController
-@RequestMapping(value="/xboe/m/coursetag")
-public class CourseTagApi extends ApiBaseController {
-
-    @Resource
-    ICourseTagService courseTagService;
-
-    /**
-     * 标签列表：分页查询
-     * @param pager
-     * @param courseTagQueryDto
-     * @return
-     */
-   /* @RequestMapping(value="/page",method= {RequestMethod.GET,RequestMethod.POST})
-    public JsonResponse<PageList<CourseTag>> find(Pagination pager, CourseTagQueryDto courseTagQueryDto){
-        log.info("标签列表：分页查询 pager = " + pager);
-        log.info("标签列表：分页查询 courseTagQueryDto = " + courseTagQueryDto);
-        List<IFieldFilter> filters=new ArrayList<IFieldFilter>();
-        OrderCondition order = null;
-        if (courseTagQueryDto != null){
-            String tagId = courseTagQueryDto.getId();
-            String tagName = courseTagQueryDto.getTagName();
-            Boolean isHot = courseTagQueryDto.getIsHot();
-            String orderField = courseTagQueryDto.getOrderField();
-            Boolean isAsc = courseTagQueryDto.getOrderAsc();
-            if (StringUtils.isNotBlank(tagId)){
-                filters.add(FieldFilters.eq("id",tagId));
-            }
-            //课程标签名称:模糊查询
-            if (StringUtils.isNotBlank(tagName)){
-                filters.add(FieldFilters.like("tagName",tagName));
-            }
-            // 构建排序条件：支持先按lastSetHotTime降序，再按动态字段升/降序排列‌
-            if (isHot !=null ){
-                filters.add(FieldFilters.eq("isHot",isHot));
-                //order = OrderCondition.desc("lastSetHotTime");//固定降序
-            }
-            // 动态排序处理
-            if (StringUtils.isNotBlank(orderField)) {
-                if (order == null) {
-                    order = isAsc ?  OrderCondition.asc(orderField) : OrderCondition.desc(orderField);
-                } else {
-                    order = isAsc ? order.asc(orderField) : order.desc(orderField); // 链式追加排序条件
-                }
-            }
-        }
-        log.info("标签列表：分页查询 调用接口 filters = " + filters);
-        log.info("标签列表：分页查询 调用接口 order = " + order);
-        PageList<CourseTag> list=courseTagService.query(pager.getPageIndex(),pager.getPageSize(),filters,order);
-        return success(list);
-    }
-*/
-    /**
-     * 修改指定id的课程标签的公共属性
-     * @param id
-     * @param isPublic
-     * @return
-     */
-/*
-    @RequestMapping(value="/changePublicStatus",method= RequestMethod.POST)
-    public JsonResponse<Void> changePublicStatus(Long id,Boolean isPublic){
-        courseTagService.changePublicStatus(id,isPublic);
-        return success(null);
-    }
-*/
-
-    /**
-     * 修改指定id的课程标签的热点属性
-     * @param id
-     * @param isHot
-     * @return
-     */
-/*    @RequestMapping(value="/changeHotStatus",method= RequestMethod.POST)
-    public JsonResponse<Void> changeHotStatus(Long id,Boolean isHot){
-        courseTagService.changeHotStatus(id,isHot);
-        return success(null);
-    }*/
-
-    /**
-     * 分页查询：指定id的标签关联的所有课程
-     * @param courseTagQueryDto
-     * @return
-     */
-/*
-    @RequestMapping(value="/showCourseByTag",method= RequestMethod.POST)
-    public JsonResponse<PageList<CourseTagRelationDto>> showCourseByTag(Pagination pager, CourseTagQueryDto courseTagQueryDto){
-        PageList<CourseTagRelationDto> list=null;
-        if (courseTagQueryDto != null) {
-            Long tagId = Long.valueOf(courseTagQueryDto.getId());
-            Boolean isAsc = courseTagQueryDto.getOrderAsc()!=null?courseTagQueryDto.getOrderAsc():false;
-            list=courseTagService.getCourseByTag(pager.getPageIndex(),pager.getPageSize(),tagId,isAsc);
-        }
-        return success(list);
-    }
-*/
-
-    /**
-     * 解除指定id的课程和某个标签之间的关联关系
-     * @return
-     */
-/*
-    @RequestMapping(value="/unbind",method= RequestMethod.POST)
-    public JsonResponse<Void> unbindCourseTagRelation(CourseTagRelationDto courseTagRelationDto){
-        if (courseTagRelationDto!=null){
-            courseTagService.unbind(courseTagRelationDto.getId());
-            return success(null);
-        }
-        return error("解绑失败！");
-    }
-*/
-
-    /**
-     * 模糊检索标签
-     * @return 符合检索条件的所有公共标签
-     */
-    @RequestMapping(value="/searchTags",method= RequestMethod.POST)
-    public JsonResponse<List<CourseTag>> searchTags(String tagName,String typeId ,HttpServletRequest request){
-
-        CurrentUser cuser = getCurrent();
-        String aid = cuser.getAccountId();
-        List<CourseTag> courseTagList = courseTagService.searchTags(tagName,aid,typeId);
-        return success(courseTagList);
-    }
-
-    /**
-     * 创建新标签,并与当前课程绑定
-     * @param courseTagRelationDto
-     * @return
-     */
-    @RequestMapping(value="/createTag",method= RequestMethod.POST)
-    public JsonResponse<CourseTag> createTag(CourseTagRelationDto courseTagRelationDto){
-        if (StringUtils.isNotBlank(courseTagRelationDto.getTagName()) && !Pattern.matches("^[\\u4e00-\\u9fa5a-zA-Z0-9_-]+$", courseTagRelationDto.getTagName())) {
-            return error("标签名称只能包含中文、英文、数字、下划线和中横线");
-        }
-        if (courseTagRelationDto!=null){
-            CourseTag courseTag = courseTagService.createTag(courseTagRelationDto);
-            if (courseTag == null ){
-                return error("创建标签失败！");
-            }
-            return success(courseTag);
-        }
-        return error("创建标签失败！");
-    }
-
-    /**
-     * 创建新标签,并与当前课程绑定
-     * @param courseTagRelationDto
-     * @return
-     */
-    @RequestMapping(value="/getHotTagList",method= RequestMethod.POST)
-    public JsonResponse<List<CourseTag>> getHotTagList(CourseTagRelationDto courseTagRelationDto){
-            List<CourseTag> hotTagList = courseTagService.getHotTagList(courseTagRelationDto);
-            return success(hotTagList);
-    }
-
-}

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

@@ -1,16 +1,20 @@
 package com.xboe.module.course.api;
 
-import java.util.Base64;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import cn.hutool.json.JSONUtil;
+import com.xboe.constants.CacheName;
+import com.xboe.data.outside.IOutSideDataService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.web.bind.annotation.CookieValue;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -33,13 +37,18 @@ import com.xboe.module.course.service.ICourseFileService;
 public class CourseWareApi extends ApiBaseController {
 
 	private String cookieName = "PLAYSIGN_TIME";
-
+	@Autowired
+	IOutSideDataService outsideDataService;
 	@Resource
 	private ICourseFileService courseFileService;
 
 	@Resource
 	private XFileUploader fileUploader;
 
+
+	@Resource
+	RedisTemplate<String, Object> redisTemplate;
+
 	private static Set<String> allowUrlSet = new HashSet<String>();
 
 	static {
@@ -50,7 +59,7 @@ public class CourseWareApi extends ApiBaseController {
 
 	/**
 	 * 资源地址的加密，返回加密后的地址
-	 * 
+	 *
 	 * @param request
 	 * @param response
 	 * @param cfid     资源地址的id
@@ -85,25 +94,22 @@ public class CourseWareApi extends ApiBaseController {
 
 	/**
 	 * 获取资源，在header中保存
-	 * 
+	 *
 	 * @param request
 	 * @param response
-	 * @param cfid
-	 * @param cf
 	 * @throws Exception
 	 */
 	@GetMapping("/resource")
-	public JsonResponse<String> getVideo(HttpServletRequest request, HttpServletResponse response, String sign) throws Exception {
+	public JsonResponse<String> getVideo(HttpServletRequest request, HttpServletResponse response, String sign,
+										 @CookieValue(name = "token",required = false)String token
+	) throws Exception {
 
 		if (StringUtils.isBlank(sign)) {
 			return badRequest("非法请求");
-			// return;
 		}
-
 		String httpReferer = request.getHeader("referer");
 		if (StringUtils.isBlank(httpReferer)) {
 			return badRequest("非法请求");
-			// return "非法请求";
 		}
 
 		boolean has=false;
@@ -115,21 +121,37 @@ public class CourseWareApi extends ApiBaseController {
 
 		if(!has) {
 			return badRequest("页面不存在");
-			//return "非法请求";
 		}
-
-		//读取cookies中的时间
-		String cookieTime = getSignTimeCookie(request);
-		if (StringUtils.isBlank(cookieTime)) {
-			return badRequest("不支持的请求");
-			// return;
+//		String token = request.getHeader("Xboe-Access-Token");
+//		if (StringUtils.isEmpty(token)) {
+//			token = request.getHeader("token");
+//		}
+//		读取cookies中的时间
+//		String cookieTime = getSignTimeCookie(request);
+//		if (StringUtils.isBlank(cookieTime)) {
+//			return badRequest("不支持的请求");
+//		}
+		String userInfo = CacheName.NAME_INFO + ":"+ token;
+		log.info("请求头里的token值：:"+token);
+		log.info("从 Redis 获取的userInfo:"+userInfo);
+		Object o = redisTemplate.opsForValue().get(userInfo);
+		if (o == null) {
+			log.error("从 Redis 获取的值为 null ,", userInfo);
+			return badRequest("token验证错误");
 		}
-
+		// 将对象转换为字符串
+		String userNoStr = o.toString();
+		// 检查字符串是否为空或空白
+		if (StringUtils.isBlank(userNoStr)) {
+			log.error("从 Redis 获取的值为空或空白,", userInfo);
+			return badRequest("token验证错误");
+		}
+		HashMap bean = JSONUtil.toBean(userNoStr, HashMap.class);
+		Object userNo = bean.get("userNo");
 		byte[] signBytes = Base64.getDecoder().decode(sign);
 		// byte[] signBytes = RSAUtil.decryptBase64(sign);
 		byte[] signDecryt = RSAUtil.decryptByPrivateKey(ConfigSecretKey.TEMP_PRIVATESTR, signBytes);
 		String signStr = new String(signDecryt);
-		// System.out.println("解密后的字符串："+signStr);
 		// 第一个/前端是时间
 		int index = signStr.indexOf("/");
 		if (index <= 0) {
@@ -139,8 +161,15 @@ public class CourseWareApi extends ApiBaseController {
 		}
 
 		String time = signStr.substring(0, signStr.indexOf("/"));// 时间字符中，long
+		String[] split = signStr.split("/");
 		String cfid = signStr.substring(index+1);// 文件路径
+		log.info("解密后的字符串:"+signStr);
 
+		log.info("workNum工号对比:"+split[2]);
+		log.info("userNo工号对比:"+userNo);
+		if (!split[2].equals(userNo)){
+			return badRequest("token验证失效");
+		}
 //		if (!time.equals(cookieTime)) {
 //			log.info("请求头时间和解析后的时间对比:"+"解析时间:"+time+"    请求头时间："+cookieTime);
 //			log.info("解密后的字符串的时间拼接:"+signStr);
@@ -172,7 +201,7 @@ public class CourseWareApi extends ApiBaseController {
 
 	/**
 	 * 读取cookies值
-	 * 
+	 *
 	 * @param request
 	 * @return
 	 */

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

@@ -10,6 +10,8 @@ import com.xboe.core.orm.BaseDao;
 import com.xboe.core.orm.IFieldFilter;
 import com.xboe.module.course.entity.CourseFile;
 
+import javax.transaction.Transactional;
+
 
 @Repository
 public class CourseFileDao extends BaseDao<CourseFile> {
@@ -21,4 +23,5 @@ public class CourseFileDao extends BaseDao<CourseFile> {
         PageList<CourseFile> page = this.getGenericDao().findPage(pageIndex, pageSize, getEntityClass(), filters,order);
         return page;
     }
+
 }

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

@@ -1,202 +0,0 @@
-package com.xboe.module.course.dao;
-
-import com.xboe.common.OrderCondition;
-import com.xboe.common.PageList;
-import com.xboe.core.SysConstant;
-import com.xboe.core.orm.BaseDao;
-import com.xboe.core.orm.FieldFilters;
-import com.xboe.core.orm.IFieldFilter;
-import com.xboe.core.orm.IQuery;
-import com.xboe.module.course.entity.Course;
-import com.xboe.module.course.entity.CourseFile;
-import com.xboe.module.course.entity.CourseTag;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.jdbc.core.BeanPropertyRowMapper;
-import org.springframework.stereotype.Repository;
-
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @ClassName:CourseTagDao
- * @author:zhengge@oracle.com
- * @since:2025/7/2516:50
- */
-
-@Slf4j
-@Repository
-public class CourseTagDao extends BaseDao<CourseTag> {
-    @PersistenceContext
-    private EntityManager entityManager;
-
-    /**
-     * 获取热门标签列表(前10条)
-     * @return 热门标签列表
-     */
-    public List<CourseTag> getHotTagList() {
-            // 原生SQL：注意表名和列名需与数据库实际一致
-            String sql = "select t.*,COUNT(r.tag_id) AS relation_count\n" +
-                    "from boe_course_tag t\n" +
-                    "left join boe_course_tag_relation r\n" +
-                    "on t.id = r.tag_id AND r.deleted =0 \n" +
-                    "where t.deleted =0 and t.is_hot = true and t.status =0  \n" +
-                    "GROUP BY t.id\n" +
-                    "order by t.last_set_hot_time desc";  // 数据库字段为last_set_hot_time
-
-            // 创建原生查询并指定结果映射到CourseTag实体
-            javax.persistence.Query query = entityManager.createNativeQuery(sql, CourseTag.class);
-
-            // 分页：取前10条
-            query.setFirstResult(0);
-            query.setMaxResults(10);
-
-            // 执行查询并返回结果（已映射为CourseTag类型）
-            return query.getResultList();
-    }
-
-    /**
-     * 根据课程类型获取热门标签列表(前10条)
-     * @param sysType1 系统类型1
-     * @param sysType2 系统类型2
-     * @param sysType3 系统类型3
-     * @return 热门标签列表
-     */
-    public List<CourseTag> getHotTagListBySysTypes(String sysType1, String sysType2, String sysType3) {
-        // 原生SQL：注意表名和列名需与数据库实际一致（此处假设表名为course_tag、course_type_tag_relation）
-        String sql = "SELECT DISTINCT c.* FROM boe_course_tag c " +
-                "JOIN boe_course_type_tag_relation r ON c.id = r.tag_id " +
-                "WHERE r.deleted = 0 and c.status =0 " +
-                "AND c.is_hot = true ";  // 假设数据库字段为is_hot（与实体属性isHot对应）
-        if (StringUtils.isNotBlank(sysType1)){
-            sql += "AND r.sys_type1 = ?1 ORDER BY c.last_set_hot_time DESC";
-        }else if(StringUtils.isNotBlank(sysType2)){
-            sql += "AND r.sys_type2 = ?1 ORDER BY c.last_set_hot_time DESC";
-        }else {
-            sql += "AND r.sys_type3 = ?1 ORDER BY c.last_set_hot_time DESC";
-        }
-        // 创建原生查询并指定结果映射到CourseTag实体
-        javax.persistence.Query query = entityManager.createNativeQuery(sql, CourseTag.class);
-
-        // 绑定参数（注意参数索引从1开始）
-        if (StringUtils.isNotBlank(sysType1)){
-            query.setParameter(1, sysType1);
-        } else if (StringUtils.isNotBlank(sysType2)) {
-            query.setParameter(1, sysType2);
-        }else {
-            query.setParameter(1, sysType3);
-        }
-        // 分页：取前10条
-        query.setFirstResult(0);
-        query.setMaxResults(10);
-
-        // 执行查询并返回结果（已映射为CourseTag类型）
-        return query.getResultList();
-    }
-
-    public List<CourseTag> getTagsByIds(String id) {
-        String sql = "select * from " + SysConstant.TABLE_PRE + "course_tag where id in (" + id + "0)";
-        // 创建原生查询并指定结果映射到CourseTag实体
-        javax.persistence.Query query = entityManager.createNativeQuery(sql, CourseTag.class);
-        return query.getResultList();
-    }
-
-    public CourseTag getTagByName(String tagName) {
-        CourseTag courseTag = this.findOne(FieldFilters.eq("tag_name", tagName),FieldFilters.eq("deleted", false),FieldFilters.eq("status", 0));
-        return courseTag;
-    }
-
-    public PageList<CourseTag> getList() {
-        log.info("------- getList -----------  ");
-        String sql = "select * from boe_course_tag order by sys_create_time desc limit 10";
-        javax.persistence.Query query = entityManager.createNativeQuery(sql, CourseTag.class);
-        log.info("------- getList -----------getResultList =  " + query.getResultList() );
-        PageList<CourseTag> pageList = new PageList<>();
-        pageList.setCount(query.getResultList().size());
-        pageList.setPageSize(1);
-        pageList.setList(query.getResultList());
-
-        return pageList;
-    }
-
-    public List<CourseTag> searchTags(String tagName, String userId, String typeId) {
-        StringBuilder sql = new StringBuilder();
-        List<Object> parameters = new ArrayList<>();
-
-        // 只查询实际存在的字段
-        sql.append("SELECT id, tag_name, is_public, is_hot, use_count, last_set_public_time, last_set_hot_time, deleted, sys_create_time ");
-        sql.append("FROM ( ");
-        sql.append("    SELECT t.id, t.tag_name, t.is_public, t.is_hot, t.use_count, t.last_set_public_time, t.last_set_hot_time, t.deleted, t.sys_create_time,t.sys_update_time ");
-        sql.append("    FROM boe_course_tag_relation r  ");
-        sql.append("    INNER JOIN boe_course_tag t ON r.tag_id = t.id  ");
-        sql.append("    WHERE r.deleted = 0 AND t.deleted = 0 AND t.is_public = 0  AND t.status = 0 ");
-        if (StringUtils.isNotBlank(userId)) {
-            sql.append("        AND r.sys_create_aid = ? ");
-            parameters.add(Long.valueOf(userId));
-        }
-        if (StringUtils.isNotBlank(tagName)) {
-            sql.append("    AND t.tag_name LIKE ? ");
-            parameters.add("%" + tagName + "%");
-        }
-        sql.append("    GROUP BY t.id, t.tag_name, t.is_public, t.is_hot, t.use_count, t.last_set_public_time, t.last_set_hot_time, t.deleted, t.sys_create_time,t.sys_update_time ");
-        sql.append("    UNION ALL ");
-        sql.append("    SELECT id, tag_name, is_public, is_hot, use_count, last_set_public_time, last_set_hot_time, deleted, sys_create_time,sys_update_time ");
-        sql.append("    FROM boe_course_tag  ");
-        sql.append("    WHERE deleted = 0 AND is_public = 1 AND status = 0 ");
-        if (StringUtils.isNotBlank(tagName)) {
-            sql.append("    AND tag_name LIKE ? ");
-            parameters.add("%" + tagName + "%");
-        }
-        sql.append(") AS all_tags ");
-        sql.append("ORDER BY  ");
-
-        if (StringUtils.isNotBlank(typeId)) {
-            sql.append("    CASE WHEN id IN ( ");
-            sql.append("        SELECT tag_id  ");
-            sql.append("        FROM boe_course_type_tag_relation  ");
-            sql.append("        WHERE deleted = 0  ");
-            sql.append("            AND (sys_type1 = ? ");
-            sql.append("                 OR sys_type2 = ? ");
-            sql.append("                 OR sys_type3 = ?) ");
-            sql.append("        GROUP BY tag_id ");
-            sql.append("    ) THEN 0 ELSE 1 END ");
-            parameters.add(Long.valueOf(typeId));
-            parameters.add(Long.valueOf(typeId));
-            parameters.add(Long.valueOf(typeId));
-        }
-
-        sql.append("    sys_update_time DESC");
-        log.info("查询标签 searchTags sql = {} ", sql);
-        // 不使用实体类映射，手动处理结果集
-        Query query = entityManager.createNativeQuery(sql.toString());
-
-        for (int i = 0; i < parameters.size(); i++) {
-            query.setParameter(i + 1, parameters.get(i));
-        }
-
-        @SuppressWarnings("unchecked")
-        List<Object[]> results = query.getResultList();
-        List<CourseTag> courseTags = new ArrayList<>();
-
-        for (Object[] result : results) {
-            CourseTag tag = new CourseTag();
-            // 设置基本字段
-            if (result[0] != null) tag.setId(String.valueOf(result[0]));
-            if (result[1] != null) tag.setTagName(String.valueOf(result[1]));
-            if (result[2] != null) tag.setIsPublic(Boolean.valueOf(String.valueOf(result[2])));
-            if (result[3] != null) tag.setIsHot(Boolean.valueOf(String.valueOf(result[3])));
-            if (result[4] != null) tag.setUseCount(Integer.valueOf(String.valueOf(result[4])));
-            courseTags.add(tag);
-        }
-
-        return courseTags;
-    }
-
-
-
-
-
-}

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

@@ -1,130 +0,0 @@
-package com.xboe.module.course.dao;
-
-import com.xboe.common.PageList;
-import com.xboe.core.orm.BaseDao;
-import com.xboe.module.course.dto.CourseTagRelationDto;
-import com.xboe.module.course.entity.CourseTagRelation;
-import org.springframework.stereotype.Repository;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @ClassName:CourseTagRelationDao
- * @author:zhengge@oracle.com
- * @since:2025/7/2815:09
- */
-@Repository
-public class CourseTagRelationDao extends BaseDao<CourseTagRelation> {
-
-    @PersistenceContext
-    private EntityManager entityManager;
-
-    private String sqlStr = "SELECT " +
-            "    r1.id as id, " +
-            "    c.id as courseId, " +
-            "    r1.tag_id as tagId, " +
-            "    c.`name` as courseName, " +
-            "    r1.sys_create_by as sysCreateBy, " +
-            "    r1.sys_create_time as sysCreateTime, " +
-            "    COALESCE(GROUP_CONCAT(DISTINCT t.tag_name ORDER BY t.tag_name), '') AS otherTags " +
-            "FROM " +
-            "    boe_course c " +
-            "JOIN " +
-            "    boe_course_tag_relation r1 ON c.id = r1.course_id " +
-            "LEFT JOIN " +
-            "    ( " +
-            "        boe_course_tag_relation r2 " +
-            "        JOIN boe_course_tag t ON r2.tag_id = t.id AND t.deleted = 0 " +
-            "    ) " +
-            "    ON c.id = r2.course_id AND r2.tag_id != r1.tag_id " +
-            "WHERE " +
-            "    r1.tag_id = :tagId AND r1.deleted = 0 " +
-            "    AND c.id IN ( " +
-            "        SELECT course_id " +
-            "        FROM boe_course_tag_relation " +
-            "        WHERE tag_id = :tagId " +
-            "    ) " +
-            "GROUP BY " +
-            "    c.id, c.`name` ";
-
-    public PageList<CourseTagRelationDto> findCoursesWithRelatedTagsDesc(Integer pageIndex, Integer pageSize, Long tagId){
-        String sql = sqlStr + " ORDER BY r1.sys_create_time DESC";
-        Query query = entityManager.createNativeQuery(sql);
-        query.setParameter("tagId", tagId);
-        query.setFirstResult((pageIndex - 1) * pageSize); // 设置起始位置
-        query.setMaxResults(pageSize); // 设置每页大小
-
-        Query countQuery = entityManager.createNativeQuery(sql);
-        countQuery.setParameter("tagId", tagId);
-        List<Object[]> totalresults = countQuery.getResultList();
-
-        List<Object[]> results = query.getResultList();
-        List<CourseTagRelationDto> list = results.stream()
-                .map(row -> {
-                    String id = String.valueOf(row[0]);
-                    String courseId = String.valueOf(row[1]);
-                    String tagId2 = String.valueOf(row[2]);
-                    return new CourseTagRelationDto(
-                            id,
-                            courseId,
-                            tagId2,
-                            (String) row[3],
-                            (String) row[4],
-                            (Date) row[5],
-                            (String) row[6]
-                    );
-                })
-                .collect(Collectors.toList());
-        return new PageList<CourseTagRelationDto>(list,totalresults!=null?totalresults.size():0);
-    }
-
-    public PageList<CourseTagRelationDto> findCoursesWithRelatedTagsAsc(Integer pageIndex, Integer pageSize, Long tagId) {
-        String sql = sqlStr + " ORDER BY r1.sys_create_time ASC";
-        Query query = entityManager.createNativeQuery(sql);
-        query.setParameter("tagId", tagId);
-        query.setFirstResult((pageIndex - 1) * pageSize); // 设置起始位置
-        query.setMaxResults(pageSize); // 设置每页大小
-
-        Query countQuery = entityManager.createNativeQuery(sql);
-        countQuery.setParameter("tagId", tagId);
-        List<Object[]> totalresults = countQuery.getResultList();
-
-        List<Object[]> results = query.getResultList();
-        List<CourseTagRelationDto> list = results.stream()
-                .map(row ->{
-                    String id = String.valueOf(row[0]);
-                    String courseId = String.valueOf(row[1]);
-                    String tagId2 = String.valueOf(row[2]);
-                    return new CourseTagRelationDto(
-                            id,
-                            courseId,
-                            tagId2,
-                            (String) row[3],
-                            (String) row[4],
-                            (Date) row[5],
-                            (String) row[6]
-                    );
-                        })
-                .collect(Collectors.toList());
-        return new PageList<CourseTagRelationDto>(list,totalresults!=null?totalresults.size():0);
-    }
-
-    public void reTagRelDelStatus(String id,String name) {
-        String sql = "UPDATE boe_course_tag_relation SET deleted = FALSE, sys_update_by = '" + name +
-                "', sys_update_time = NOW() WHERE id = " + id;
-        Query query = entityManager.createNativeQuery(sql);
-        query.executeUpdate();
-    }
-
-    public void reTypeTagRelDelStatus(String id,String name) {
-        String sql = "UPDATE boe_course_type_tag_relation SET deleted = FALSE, sys_update_by = '" + name +
-                "', sys_update_time = NOW() WHERE id = " + id;
-        Query query = entityManager.createNativeQuery(sql);
-        query.executeUpdate();
-    }
-}

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

@@ -1,17 +0,0 @@
-package com.xboe.module.course.dao;
-
-import com.xboe.core.orm.BaseDao;
-import com.xboe.module.course.entity.CourseTagRelation;
-import com.xboe.module.course.entity.CourseTypeTagRelation;
-import org.springframework.stereotype.Repository;
-
-/**
- * @ClassName:CourseTypeTagRelationDao
- * @author:zhengge@oracle.com
- * @since:2025/8/113:42
- */
-@Repository
-public class CourseTypeTagRelationDao extends BaseDao<CourseTypeTagRelation> {
-
-
-}

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

@@ -1,12 +0,0 @@
-package com.xboe.module.course.dao;
-
-import com.xboe.core.orm.BaseDao;
-import com.xboe.module.course.entity.Tip;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Repository;
-
-
-@Slf4j
-@Repository
-public class TipDao extends BaseDao<Tip> {
-}

servers/boe-server-all/src/main/java/com/xboe/module/course/dto/CourseQueryDto.java

@@ -1,6 +1,5 @@
 package com.xboe.module.course.dto;
 
-import com.xboe.module.course.entity.CourseTag;
 import lombok.Data;
 
 import java.util.List;
@@ -141,6 +140,4 @@ public class CourseQueryDto {
      */
     private String userId;
 
-    private String tags;
-
 }

servers/boe-server-all/src/main/java/com/xboe/module/course/dto/CourseTagQueryDto.java

@@ -1,40 +0,0 @@
-package com.xboe.module.course.dto;
-
-import lombok.Data;
-
-/**
- * 课程标签查询的条件对象
- * @ClassName:CourseTagQueryDto
- * @author:zhengge@oracle.com
- * @since:2025/7/2517:02
- */
-@Data
-public class CourseTagQueryDto {
-
-    /**
-     * 标签id
-     */
-    private String id;
-
-    /**
-     * 标签名称
-     */
-    private String tagName;
-
-
-    /**
-     * 是否热点标签（ 0-否(默认) 1-是）
-     */
-    private Boolean isHot;
-
-    /**
-     * 排序字段
-     */
-    private String orderField;
-
-    /**
-     * 排序顺序
-     */
-    private Boolean orderAsc;
-
-}

servers/boe-server-all/src/main/java/com/xboe/module/course/dto/CourseTagRelationDto.java

@@ -1,49 +0,0 @@
-package com.xboe.module.course.dto;
-
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import javax.persistence.Column;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * @ClassName:CourseTagRelationDto
- * @author:zhengge@oracle.com
- * @since:2025/7/2815:00
- */
-@Data
-@NoArgsConstructor
-public class CourseTagRelationDto{
-
-    private String id;
-    private String courseId;
-    private String tagId;
-    private String tagName;
-    private String courseName;
-    private String sysCreateBy;
-    private Date sysCreateTime;
-    private String otherTags; // 改为字符串类型，与 GROUP_CONCAT 结果匹配
-    private String sysType1;
-    private String sysType2;
-    private String sysType3;
-
-    // 添加匹配查询字段顺序的构造函数
-    public CourseTagRelationDto(
-            String id,
-            String courseId,
-            String tagId,
-            String courseName,
-            String sysCreateBy,
-            Date sysCreateTime,
-            String otherTags
-    ) {
-        this.id = id;
-        this.courseId = courseId;
-        this.tagId = tagId;
-        this.courseName = courseName;
-        this.sysCreateBy = sysCreateBy;
-        this.sysCreateTime = sysCreateTime;
-        this.otherTags = otherTags;
-    }
-}

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

@@ -396,13 +396,7 @@ public class Course extends BaseEntity {
 
     @Transient
     private String teacher;
-
-    /**
-     * 新增在线课时是否需要标签提示
-     */
-    @Transient
-    private Boolean isTip;
-
+    
     public Course(String id,String name,String summary,String coverImg,String sysCreateAid,String sysCreateBy,Integer type,LocalDateTime publishTime){
         super.setId(id);
         this.name=name;

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

@@ -1,98 +0,0 @@
-package com.xboe.module.course.entity;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.xboe.core.SysConstant;
-import com.xboe.core.orm.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import java.time.LocalDateTime;
-
-/**
- * 在线课程的标签类
- * @ClassName:CourseTag
- * @author:zhengge@oracle.com
- * @since:2025/7/25 16:37
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Entity
-@Table(name = SysConstant.TABLE_PRE+"course_tag")
-public class CourseTag extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 标签名称
-     */
-    @Column(name = "tag_name",nullable=false, length = 50)
-    private String tagName;
-
-    /**
-     * 是否设置为公共标签
-     */
-    @Column(name = "is_public",length = 1)
-    private Boolean isPublic;
-
-    /**
-     * 是否设置为热点标签
-     */
-    @Column(name = "is_hot",length = 1)
-    private Boolean isHot;
-
-    /**
-     * 使用次数(关联课程数)
-     */
-    @Column(name = "use_count",length = 1)
-    private Integer useCount;
-
-    /**
-     * 1临时， 0正式
-     */
-    @Column(name = "status",length = 1)
-    private Integer status;
-
-    /**
-     * 最近设置为公共标签的时间
-     */
-    @Column(name = "last_set_public_time", nullable = true)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime lastSetPublicTime;
-
-    /**
-     * 最近设置为热点标签的时间
-     */
-    @Column(name = "last_set_hot_time", nullable = true)
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime lastSetHotTime;
-
-    public CourseTag() {
-
-    }
-    public CourseTag(Long id, Boolean isPublic,Boolean isHot) {
-        this.setId(String.valueOf(id));
-        this.isPublic=isPublic;
-        this.isHot=isHot;
-    }
-
-
-    public CourseTag(String id,String tagName,String sysCreateBy,String sysCreateAid,LocalDateTime sysCreateTime,
-                     Boolean isPublic,Boolean isHot,Integer useCount,LocalDateTime lastSetPublicTime,LocalDateTime lastSetHotTime,Boolean deleted){
-        this.setId(id);
-        this.setTagName(tagName);
-        super.setSysCreateBy(sysCreateBy);
-        super.setSysCreateAid(sysCreateAid);
-        super.setSysCreateTime(sysCreateTime);
-        this.isPublic = isPublic;
-        this.isHot = isHot;
-        this.useCount = useCount;
-        this.lastSetPublicTime = lastSetPublicTime;
-        this.lastSetHotTime = lastSetHotTime;
-        super.setDeleted(deleted);
-    }
-
-
-}

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

@@ -1,37 +0,0 @@
-package com.xboe.module.course.entity;
-
-import com.xboe.core.SysConstant;
-import com.xboe.core.orm.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-/**
- * @ClassName:CourseTagRelation
- * @author:zhengge@oracle.com
- * @since:2025/7/2814:54
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Entity
-@Table(name = SysConstant.TABLE_PRE+"course_tag_relation")
-public class CourseTagRelation extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 课程Id
-     */
-    @Column(name = "course_id",length = 20)
-    private Long courseId;
-
-    /**
-     * 标签id
-     */
-    @Column(name = "tag_id",length = 20)
-    private Long tagId;
-
-}

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

@@ -49,12 +49,4 @@ public class CourseTeacher extends IdBaseEntity {
     @Transient
     private String code;
 
-    /**供应商*/
-    @Transient
-    private String supplier;
-
-    /**讲师类型 1 内部讲师  2外部讲师*/
-    @Transient
-    private Integer teacherType;
-
 }

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

@@ -1,39 +0,0 @@
-package com.xboe.module.course.entity;
-
-import com.xboe.core.SysConstant;
-import com.xboe.core.orm.BaseEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
-/**
- * @ClassName:CourseTypeTagRelation
- * @author:zhengge@oracle.com
- * @since:2025/8/111:02
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Entity
-@Table(name = SysConstant.TABLE_PRE+"course_type_tag_relation")
-public class CourseTypeTagRelation extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    @Column(name = "sys_type1",length = 20)
-    private String sysType1;
-
-    @Column(name = "sys_type2",length = 20)
-    private String sysType2;
-
-    @Column(name = "sys_type3",length = 20)
-    private String sysType3;
-
-    @Column(name = "tag_id",length = 20)
-    private String tagId;
-
-
-
-}

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

@@ -1,36 +0,0 @@
-package com.xboe.module.course.entity;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.xboe.core.SysConstant;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import javax.persistence.*;
-import java.time.LocalDateTime;
-
-/**
- * @author by lyc
- * @date 2025/11/10
- */
-@Data
-@Entity
-@EqualsAndHashCode(callSuper = false)
-@Table(name = "tip")
-public class Tip {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id", length = 20)
-    private Long id;
-
-    @Column(name = "aid", length = 30)
-    private String aid;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Column(name = "create_time", length = 30)
-    private LocalDateTime create_time;
-
-    // 0 标签提示
-    @Column(name = "type", length = 3)
-    private Integer type;
-
-}

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

@@ -52,7 +52,6 @@ public class CourseToCourseFullText {
 		cft.setTeacher("");
 		cft.setTeacherCode("");
 		cft.setType(c.getType());
-		cft.setTags(c.getTags());
 		if(c.getOpenCourse()==null) {
 			cft.setOpenCourse(0);
 		}else {

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

@@ -54,4 +54,6 @@ public interface ICourseFileService {
      * @param deleted
      */
     void delete(String id,boolean deleted);
+
+//    void updateDuration(String contentRefId, Integer duration);
 }

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

@@ -341,12 +341,8 @@ public interface ICourseService {
     List<Course> mobiledelList(Integer num,CourseQueryDto courseQueryDto);
 
 
-    List<Course> findByIds(List<String> courseIds);
-    void deletedStudyResourceBatchByCourseIdAndType(String courseId,Integer courseType);
 
-    void saveTip(String aid);
 
-    Boolean getCourseTip(String aid);
 
-//    void getPhpCourseData();
+
 }

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

@@ -1,97 +0,0 @@
-package com.xboe.module.course.service;
-
-import com.xboe.common.OrderCondition;
-import com.xboe.common.PageList;
-import com.xboe.core.CurrentUser;
-import com.xboe.core.JsonResponse;
-import com.xboe.core.orm.IFieldFilter;
-import com.xboe.module.article.entity.Article;
-import com.xboe.module.course.dto.CourseTagQueryDto;
-import com.xboe.module.course.dto.CourseTagRelationDto;
-import com.xboe.module.course.entity.Course;
-import com.xboe.module.course.entity.CourseTag;
-import com.xboe.module.course.entity.CourseTagRelation;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import java.util.List;
-
-/**
- * @InterfaceName:ICourseTagService
- * @author:zhengge@oracle.com
- * @since:2025/7/2516:53
- */
-public interface ICourseTagService {
-
-    /**
-     * 分页查询标签列表,使用自定义filter
-     * @param pageIndex
-     * @param pageSize
-     * @return
-     */
-    PageList<CourseTag> query(Integer pageIndex, Integer pageSize, List<IFieldFilter> filters, OrderCondition order);
-
-    /**
-     * 分页查询指定id标签关联的课程列表,使用自定义filter
-     * @param pageIndex
-     * @param pageSize
-     * @return
-     */
-    PageList<CourseTagRelationDto> getCourseByTag(Integer pageIndex, Integer pageSize, Long tagId, Boolean isAsc);
-
-    /**
-     * 修改指定id的课程标签的公共属性
-     * @param id
-     * @param isPublic
-     * @return
-     */
-    void changePublicStatus(Long id,Boolean isPublic);
-
-    /**
-     * 修改指定id的课程标签的热点属性
-     * @param id
-     * @param isHot
-     * @return
-     */
-    void changeHotStatus(Long id,Boolean isHot);
-
-    /**
-     * 解除指定id的课程和某个标签之间的关联关系
-     * @return
-     */
-    void unbind(String id);
-
-    /**
-     * 根据标签名称进行检索(模糊查询)
-     * @param tagName
-     * @return 符合检索条件的所有公共标签
-     */
-    List<CourseTag> searchTags(String tagName,String userId,String typeId);
-
-    /**
-     * 创建新标签,并与当前课程绑定
-     * @param courseTagRelationDto
-     * @return
-     */
-    CourseTag createTag(CourseTagRelationDto courseTagRelationDto);
-
-    /**
-     * 根据课程类型获取热点标签
-     * @param courseTagRelationDto
-     * @return
-     */
-    List<CourseTag> getHotTagList(CourseTagRelationDto courseTagRelationDto);
-
-    /**
-     * 根据多个id获取标签
-     * @param id
-     * @return
-     */
-    List<CourseTag> getTagsByIds(String id);
-
-    CourseTag getTagByName(String tagName);
-
-    void updateTags(Course oldCourse,Course newCourse,CurrentUser userInfo);
-
-    List<CourseTag> getAllTags();
-}

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

@@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.xboe.common.OrderCondition;
+import com.xboe.common.PageList;
 import com.xboe.core.cache.IXaskCache;
 import com.xboe.core.cache.XaskCacheProvider;
 import com.xboe.core.orm.FieldFilters;
@@ -14,11 +15,9 @@ import com.xboe.core.orm.UpdateBuilder;
 import com.xboe.module.course.dao.*;
 import com.xboe.module.course.dto.CourseContentDto;
 import com.xboe.module.course.dto.SortItem;
-import com.xboe.module.course.entity.CourseAssess;
-import com.xboe.module.course.entity.CourseContent;
-import com.xboe.module.course.entity.CourseExam;
-import com.xboe.module.course.entity.CourseHomeWork;
+import com.xboe.module.course.entity.*;
 import com.xboe.module.course.service.ICourseContentService;
+import com.xboe.module.course.service.ICourseFileService;
 import com.xboe.module.exam.dao.ExamPaperDao;
 import com.xboe.module.exam.vo.TestQuestionVo;
 import com.xboe.standard.enums.BoedxContentType;
@@ -57,7 +56,8 @@ public class CourseContentServiceImpl implements ICourseContentService {
 
     @Resource
     private ExamPaperDao examPaperDao;
-
+	@Resource
+	private ICourseFileService courseFileService;
 
 	@Override
 	@Transactional
@@ -83,6 +83,7 @@ public class CourseContentServiceImpl implements ICourseContentService {
 			ccDao.save(cc);
 		}else {
 			ccDao.update(cc);
+//			courseFileService.updateDuration(cc.getContentRefId(),cc.getDuration());
 			cc.setSysVersion(ccDao.getVersion(cc.getId()));
 		}
 		//添加或保存其它信息

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

@@ -98,4 +98,14 @@ public class CourseFileServiceImpl implements ICourseFileService {
 	public CourseFile get(String id) {
 		return courseFileDao.get(id);
 	}
+
+
+//	@Override
+//	public void updateDuration(String contentRefId,Integer duration) {
+//		if (duration == null) {
+//			duration = 0;
+//		}
+//		String sql = "UPDATE boe_course_file SET duration = "+ duration+" WHERE id = "+ contentRefId+" ";
+//		courseFileDao.sqlUpdate(sql);
+//	}
 }

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,28 +14,11 @@ import java.util.stream.Stream;
 import javax.annotation.Resource;
 import javax.management.Query;
 
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.http.HttpRequest;
-import cn.hutool.http.HttpResponse;
-import cn.hutool.http.HttpUtil;
-import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson2.JSON;
 import com.xboe.api.ThirdApi;
 import com.xboe.core.orm.*;
-import com.xboe.module.course.dao.*;
-import com.xboe.module.course.dto.CourseTagRelationDto;
-import com.xboe.module.course.entity.*;
-import com.xboe.module.course.service.ICourseTagService;
 import com.xboe.school.study.dao.StudyCourseDao;
 import com.xboe.school.study.entity.StudyCourse;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.http.client.HttpClient;
-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;
@@ -52,9 +34,24 @@ 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.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.service.ICourseFullTextSearch;
 import com.xboe.module.course.service.ICourseService;
 import com.xboe.module.interaction.service.ICourseGradeService;
@@ -94,8 +91,7 @@ public class CourseServiceImpl implements ICourseService {
 
     @Resource
     private CourseHRBPAuditDao courseHRBPAuditDao;
-    @Resource
-    private ICourseTagService courseTagService;
+
 
     @Resource
     private SysLogAuditDao logAuditDao;//审核日志记录
@@ -119,11 +115,8 @@ public class CourseServiceImpl implements ICourseService {
     @Autowired(required = false)
     private IEventDataSender eventSender;
 
-    @Resource
-    RestHighLevelClient restHighLevelClient;
-    @Resource
-    private TipDao tipDao;
 
+  
     /**
      * 生成过滤条件
      *
@@ -455,7 +448,6 @@ public class CourseServiceImpl implements ICourseService {
         List<Course> paginate = paginate(listByFilters2, pageIndex, pageSize);
         PageList<Course> rs = new PageList<>();
         rs.setCount(listByFilters2.size());
-        rs.setPageSize(pageSize);
         rs.setList(paginate);
         return rs;
     }
@@ -488,7 +480,7 @@ public class CourseServiceImpl implements ICourseService {
         String sql = "SELECT DISTINCT\n" +
                 "rt.course_id\n" +
                 "FROM\n" +
-                "boe_new.student s INNER JOIN boe_new.router_task rt on s.pid=rt.router_id inner join boe_course c on c.id=rt.course_id\n" +
+                "boe.student s INNER JOIN boe.router_task rt on s.pid=rt.router_id inner join boe_course c on c.id=rt.course_id\n" +
                 "\n" +
                 "WHERE\n" +
                 "\n" +
@@ -511,7 +503,7 @@ public class CourseServiceImpl implements ICourseService {
         String sql = "SELECT DISTINCT\n" +
                 "pt.course_id\n" +
                 "FROM\n" +
-                "boe_new.student s INNER JOIN boe_new.project_task pt on s.pid=pt.project_id inner join boe_course c on c.id=pt.course_id\n" +
+                "boe.student s INNER JOIN boe.project_task pt on s.pid=pt.project_id inner join boe_course c on c.id=pt.course_id\n" +
                 "\n" +
                 "WHERE\n" +
                 "\n" +
@@ -568,8 +560,8 @@ public class CourseServiceImpl implements ICourseService {
         String sql = "SELECT DISTINCT\n" +
                 "\tc.id \n" +
                 "FROM\n" +
-                "\tboe_new.student s\n" +
-                "\tINNER JOIN boe_new.grow_task gt ON s.pid = gt.grow_id\n" +
+                "\tboe.student s\n" +
+                "\tINNER JOIN boe.grow_task gt ON s.pid = gt.grow_id\n" +
                 "\tINNER JOIN boe_course c ON gt.course_id = c.id \n" +
                 "WHERE\n" +
                 "\ts.type = 14 \n" +
@@ -861,14 +853,12 @@ public class CourseServiceImpl implements ICourseService {
                     log.error("未配置事件消息发送的实现");
                 }
             }
-
-            // 删除ES数据
-            deletedStudyResourceBatchByCourseIdAndType(id,c.getType());
         } else {
             //彻底删除，课件设置为无课程状态
             courseDao.setDeleted(id);
         }
         //记录删除日志信息
+
     }
 
     @Override
@@ -881,11 +871,6 @@ public class CourseServiceImpl implements ICourseService {
     public Course getAddView(String id) {
         Course c = courseDao.get(id);
         courseDao.updateFieldById(id, "views", c.getViews() + 1);
-        if (StringUtils.isNotBlank(c.getTags()) && c.getTags().matches("[0-9,]+")) {
-            List<CourseTag> tagList = courseTagService.getTagsByIds(c.getTags());
-            String tags = tagList.stream().map(CourseTag::getTagName).collect(Collectors.joining(","));
-            c.setTags(tags);
-        }
         return c;
     }
 
@@ -980,6 +965,7 @@ public class CourseServiceImpl implements ICourseService {
 
         Course c = full.getCourse();//当前的课程信息
         Course nowCourse = courseDao.get(c.getId());//修改之前的课程信息
+
         StringBuffer stringBuffer = new StringBuffer("[");
         //追加日志内容
         appendUpdateLog(stringBuffer, nowCourse, c);
@@ -997,30 +983,6 @@ public class CourseServiceImpl implements ICourseService {
         if (c.getVisible() == null) {
             c.setVisible(true);
         }
-        /*if (c.getTags() != null && !c.getTags().isEmpty()){
-            CourseTagRelationDto courseTagRelationDto = new CourseTagRelationDto();
-            courseTagRelationDto.setCourseId(c.getId());
-            courseTagRelationDto.setSysType1(c.getSysType1());
-            courseTagRelationDto.setSysType2(c.getSysType2());
-            courseTagRelationDto.setSysType3(c.getSysType3());
-            String tags = c.getTags();
-            List<CourseTag> tagList = courseTagService.getTagsByIds(tags);
-            if (ObjectUtil.isNotEmpty(tagList)){
-                for (CourseTag tag : tagList) {
-                    courseTagRelationDto.setTagName(tag.getTagName());
-                    courseTagService.createTag(courseTagRelationDto);
-                }
-            }
-        }*/
-
-        if (!nowCourse.getSysVersion().equals(c.getSysVersion())) {
-            log.warn("乐观锁冲突 - 课程ID: {}, 期望版本: {}, 实际版本: {}",
-                    c.getId(), c.getSysVersion(), nowCourse.getSysVersion());
-//            throw new RuntimeException("数据已被其他用户修改，请刷新页面后重试");
-            // 基本无概率同时修改同一课程 如有 以最后提交为准
-            c.setSysVersion(courseDao.getVersion(c.getId()));
-        }
-
         courseDao.update(c);
         c.setSysVersion(courseDao.getVersion(c.getId()));
         full.getCourse().setSysVersion(c.getSysVersion());
@@ -1108,13 +1070,12 @@ public class CourseServiceImpl implements ICourseService {
 
     @Override
     public void submitAndPublish(CourseFullDto full, String aid, String aname) throws Exception {
+
         Course c = full.getCourse();//当前的课程信息
-        log.info(" 课程 c = " + c.getId());
-        log.info(" 课程 c = " + c);
         c.setPublished(true);
         c.setPublishTime(LocalDateTime.now());
         courseDao.update(c);
-        log.info(" 课程 c = " + c.getId());
+
         //先清空教师信息， 教师信息如果不一样了，也要加入到日志中
         courseTeacherDao.deleteByField("courseId", c.getId());
         if (full.getTeachers() != null && !full.getTeachers().isEmpty()) {
@@ -1180,7 +1141,7 @@ public class CourseServiceImpl implements ICourseService {
 
     /***
      * 发布全文索引
-     * @param
+     * @param c
      */
 //	private void fullTextPublish(Course c) {
 //		if(fullTextSearch==null) {
@@ -1606,13 +1567,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) {
@@ -2024,142 +1978,5 @@ public class CourseServiceImpl implements ICourseService {
         return courseDao.findListByHql("Select new Course(id,studys,score) from Course where id in(?1)", ids);
     }
 
-    /*
-    private class Result{
-        private Boolean success;
-        private Data data;
-        private class Data{
-            private List<Map<String,Object>> result;
 
-            public List<Map<String, Object>> getResult() {
-                return result;
-            }
-
-            public void setResult(List<Map<String, Object>> result) {
-                this.result = result;
-            }
-        }
-
-        public void setData(Data data) {
-            this.data = data;
-        }
-
-        public Boolean getSuccess() {
-            return success;
-        }
-
-        public void setSuccess(Boolean success) {
-            this.success = success;
-        }
-
-        public Data getData() {
-            return data;
-        }
-    }
-
-    @Override
-    public void getPhpCourseData() {
-        HttpRequest request = HttpUtil.createGet("https://u.boe.com/api/b1/new-employee/course-list");
-        HttpResponse response = request.execute();
-        String body = response.body();
-        Result result = JSON.parseObject(body,Result.class);
-        log.info("php课程数据获取成功");
-        List<Map<String,Object>> phpCourseDataList = result.getData().getResult();
-        for (Map<String, Object> phpCourseData : phpCourseDataList){
-            log.info("开始同步数据:"+phpCourseData.get("course_name"));
-        }
-        List<Map<String,Object>> phpStudyCourseList = null;
-        // 查询数据库中是否存在php课程数据
-        for (int i = 0; i < phpCourseDataList.size(); i++) {
-            // 查询php的课程数据在数据库中是否已经存在
-            String phpCourseName = (String) phpCourseDataList.get(i).get("course_name");
-            Boolean exist = isCourseName(phpCourseName,"");
-            if (!exist){
-                log.info(phpCourseName+"不存在,开始同步");
-                Course newCourse = new Course();
-                // 设置学习人数
-                int studys = Integer.parseInt(phpCourseDataList.get(i).get("learned_number").toString());
-                newCourse.setStudys(studys);
-                // 设置系统版本
-                int version = Integer.parseInt(phpCourseDataList.get(i).get("version").toString());
-                newCourse.setSysVersion(version);
-                // 设置电脑端还是手机端可见
-                int pcDevice = Integer.parseInt(phpCourseDataList.get(i).get("is_display_pc").toString());
-                int mobileDevice = Integer.parseInt(phpCourseDataList.get(i).get("is_display_mobile").toString());
-                if (pcDevice == 1 &&  mobileDevice == 1){
-                    newCourse.setDevice(3);
-                } else if (pcDevice == 0 && mobileDevice == 1) {
-                    newCourse.setDevice(2);
-                }else if(pcDevice == 1 && mobileDevice == 0){
-                    newCourse.setDevice(1);
-                }
-                // 判断是否按照顺序学习
-                int orderStudy = Integer.parseInt(phpCourseDataList.get(i).get("mod_type").toString());
-                newCourse.setOrderStudy(orderStudy == 1 ? true : false);
-                // 设置课程简介
-                String summary = (String) phpCourseDataList.get(i).get("course_desc_nohtml");
-                newCourse.setSummary(summary);
-                // 设置课程类型
-                int courseType = Integer.parseInt(phpCourseDataList.get(i).get("course_type").toString());
-                newCourse.setType(courseType == 0 ? 20 : 30);
-                // 设置学习时长
-                int courseTime = Integer.parseInt(phpCourseDataList.get(i).get("course_period").toString());
-                newCourse.setStudyTime(courseTime);
-                // 设置课程封面
-                newCourse.setCoverImg("https://u.boe.com/pc/images/bgimg/course.png");
-                newCourse.setName(phpCourseName);
-                newCourse.setStatus(5);
-                newCourse.setComments(0);
-                newCourse.setDeleted(false);
-                newCourse.setEnabled(true);
-                newCourse.setFavorites(0);
-                newCourse.setIsTop(false);
-                newCourse.setViews(0);
-                newCourse.setPraises(0);
-                newCourse.setTrampleCount(0);
-                newCourse.setShares(0);
-                newCourse.setScore(0f);
-
-                courseDao.save(newCourse);
-            }else {
-                log.info(phpCourseName+"存在");
-            }
-        }
-
-    }
-    */
-
-    @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();
-        }
-    }
-
-    @Override
-    public void saveTip(String aid) {
-        Tip item = new Tip();
-        item.setAid(aid);
-        item.setType(0);
-        item.setCreate_time(LocalDateTime.now());
-        tipDao.save(item);
-    }
-
-    @Override
-    public Boolean getCourseTip(String aid) {
-        log.info("getCourseTip aid = {} ",aid);
-        List<Tip> list = tipDao.findList(FieldFilters.eq("aid", aid));
-        log.info("getCourseTip list = {} ",list);
-        if (list != null && !list.isEmpty()){
-            return false;//已提示
-        }
-        return true; //用户需要提示
-    }
 }

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

@@ -1,877 +0,0 @@
-package com.xboe.module.course.service.impl;
-
-import com.xboe.common.OrderCondition;
-import com.xboe.common.PageList;
-import com.xboe.core.CurrentUser;
-import com.xboe.core.orm.BaseEntity;
-import com.xboe.core.orm.FieldFilters;
-import com.xboe.core.orm.IFieldFilter;
-import com.xboe.core.orm.QueryBuilder;
-import com.xboe.module.course.dao.CourseDao;
-import com.xboe.module.course.dao.CourseTagDao;
-import com.xboe.module.course.dao.CourseTagRelationDao;
-import com.xboe.module.course.dao.CourseTypeTagRelationDao;
-import com.xboe.module.course.dto.CourseTagRelationDto;
-import com.xboe.module.course.entity.Course;
-import com.xboe.module.course.entity.CourseTag;
-import com.xboe.module.course.entity.CourseTagRelation;
-import com.xboe.module.course.entity.CourseTypeTagRelation;
-import com.xboe.module.course.service.ICourseService;
-import com.xboe.module.course.service.ICourseTagService;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import javax.annotation.Resource;
-import java.time.LocalDateTime;
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- * @ClassName:CourseTagServiceImpl
- * @author:zhengge@oracle.com
- * @since:2025/7/2516:55
- */
-@Slf4j
-@Service
-@Transactional
-public class CourseTagServiceImpl implements ICourseTagService {
-
-    @Resource
-    private CourseTagDao courseTagDao;
-    @Resource
-    PublishCourseUtil publishUtil;
-    @Resource
-    private CourseTagRelationDao courseTagRelationDao;
-
-    @Resource
-    private CourseTypeTagRelationDao courseTypeTagRelationDao;
-    @Resource
-    private CourseDao courseDao;
-
-    /**
-     * 课程标签分页查询
-     * @param pageIndex
-     * @param pageSize
-     * @param filters
-     * @param order
-     * @return
-     */
-    @Override
-    public PageList<CourseTag> query(Integer pageIndex, Integer pageSize, List<IFieldFilter> filters, OrderCondition order) {
-        try {
-          /*  QueryBuilder query=QueryBuilder.from(CourseTag.class);
-            query.setPageIndex(pageIndex);
-            query.setPageSize(pageSize);
-            filters.add(FieldFilters.eq("deleted",false));
-            query.addFilters(filters);
-            if(order!=null) {
-                query.addOrder(order);
-            }else {
-                query.addOrder(OrderCondition.desc("sysCreateTime"));
-            }
-            log.info("标签列表：分页查询 调用接口IMPL query = " + query.builder().toString());
-            return courseTagDao.findPage(query.builder());*/
-
-            if(pageSize==100){
-               log.info("--- 11 ----------------------");
-               return courseTagDao.getList();
-            }else{
-                log.info("--- 22 ----------------------");
-                QueryBuilder query = QueryBuilder.from(CourseTag.class);
-                query.setPageIndex(pageIndex);
-                query.setPageSize(pageSize);
-                filters.add(FieldFilters.eq("deleted", false));
-//            query.addFilters(filters);
-                query.addOrder(OrderCondition.desc("sysCreateTime"));
-                return courseTagDao.findPage(query.builder());
-            }
-
-        } catch (Exception e) {
-            log.error("课程标签分页查询异常 = " + e.getMessage());
-            throw new RuntimeException(e);
-        }
-    }
-
-    /**
-     * 分页查询指定id标签关联的课程
-     * @param pageIndex
-     * @param pageSize
-     * @param tagId
-     * @param isAsc
-     * @return
-     */
-    @Override
-    public PageList<CourseTagRelationDto> getCourseByTag(Integer pageIndex, Integer pageSize, Long tagId, Boolean isAsc) {
-        PageList<CourseTagRelationDto> list = null;
-        if(isAsc) {
-            list =  courseTagRelationDao.findCoursesWithRelatedTagsAsc(pageIndex,pageSize,tagId);
-        }else {
-            list =  courseTagRelationDao.findCoursesWithRelatedTagsDesc(pageIndex,pageSize,tagId);
-        }
-        return list;
-    }
-
-    /**
-     * 修改指定id的课程标签的公共属性
-     * @param id
-     * @param isPublic
-     * @return
-     */
-    @Override
-    public void changePublicStatus(Long id, Boolean isPublic) {
-        CourseTag courseTag = courseTagDao.findOne(FieldFilters.eq("id", String.valueOf(id)));
-        if (courseTag!=null){
-            courseTag.setIsPublic(isPublic);
-            courseTag.setLastSetPublicTime(isPublic?LocalDateTime.now():null);
-            courseTagDao.update(courseTag);
-        }
-    }
-
-    /**
-     * 修改指定id的课程标签的热点属性
-     * @param id
-     * @param isHot
-     * @return
-     */
-    @Override
-    public void changeHotStatus(Long id, Boolean isHot) {
-        CourseTag courseTag = courseTagDao.findOne(FieldFilters.eq("id", String.valueOf(id)));
-        if (courseTag!=null){
-            courseTag.setIsHot(isHot);
-            courseTag.setLastSetHotTime(isHot?LocalDateTime.now():null);
-            courseTagDao.update(courseTag);
-        }
-    }
-
-    /**
-     * 解除指定id的课程和某个标签之间的关联关系
-     * @return
-     */
-    @Override
-    public void unbind(String id) {
-        //根据主键查询关联关系
-        CourseTagRelation courseTagRelation = courseTagRelationDao.findOne(FieldFilters.eq("id", id));
-        if (courseTagRelation != null){
-            //修改该标签关联课程数
-            CourseTag courseTag = courseTagDao.findOne(FieldFilters.eq("id", String.valueOf(courseTagRelation.getTagId())));
-            if (courseTag != null){
-                courseTag.setUseCount(courseTag.getUseCount()>1?courseTag.getUseCount()-1:0);
-                courseTagDao.updateFieldById(courseTag.getId(),"useCount",courseTag.getUseCount());
-            }
-            //解绑(删除关联关系)
-            courseTagRelationDao.setDeleted(id);
-            Course course = courseDao.get(courseTagRelation.getCourseId().toString());
-            String tags = course.getTags();
-            if (StringUtils.isNotBlank(tags)){
-                String[] tagIds = tags.split(",");
-                List<String> tagIdList = new ArrayList<>();
-                for (String tagId : tagIds){
-                    if (!tagId.equals(courseTagRelation.getTagId().toString())){
-                        tagIdList.add(tagId);
-                    }
-                }
-                // 数据格式:1,2,3
-                String s = StringUtils.join(tagIdList, ",");
-                if (!"".equals(s)){
-                    s+=",";
-                }
-                course.setTags(s);
-            }
-            // 同步ES
-            publishUtil.fullTextPublish(course);
-        }
-    }
-
-    /**
-     * 根据标签名称进行检索(模糊查询)
-     * @param tagName
-     * @return 符合检索条件的所有公共标签
-     */
-    public List<CourseTag> searchTags(String tagName){
-        QueryBuilder query=QueryBuilder.from(CourseTag.class);
-        List<IFieldFilter> filters = new ArrayList<>();
-        filters.add(FieldFilters.eq("deleted",false));//未删除
-        filters.add(FieldFilters.eq("isPublic",true));//公共标签
-        filters.add(FieldFilters.like("tagName",tagName));//模糊检索
-        query.addFilters(filters);
-        List<CourseTag> courseTagList = courseTagDao.findList(query.builder());
-        return courseTagList;
-    }
-
-    @Override
-    public List<CourseTag> searchTags(String tagName,String userId,String typeId){
-        List<CourseTag>  tagList = courseTagDao.searchTags(tagName,userId,typeId);
-        return tagList;
-    }
-
-    /**
-     * 创建新标签,并与指定课程绑定
-     * @return
-     */
-    /*@Override
-    public CourseTag createTag(CourseTagRelationDto courseTagRelationDto) {
-        CourseTag courseTag = null;
-        String tagName = courseTagRelationDto.getTagName();
-        Long courseId = Long.valueOf(courseTagRelationDto.getCourseId());
-        //1.创建标签：先判断是否已经存在该标签
-        QueryBuilder query=QueryBuilder.from(CourseTag.class);
-        List<IFieldFilter> filters = new ArrayList<>();
-        filters.add(FieldFilters.eq("tagName",tagName));//精确匹配
-        query.addFilters(filters);
-        List<CourseTag> courseTagList = courseTagDao.findList(query.builder());
-        if (courseTagList==null || courseTagList.size()==0){//1.1 如果该标签不存在，则新建标签
-            courseTag = new CourseTag();
-            courseTag.setTagName(tagName);
-            courseTag.setIsPublic(false);
-            courseTag.setIsHot(false);
-            courseTag.setUseCount(1);
-            courseTagDao.save(courseTag);
-            //新建一条标签和课程的关联关系
-            CourseTagRelation courseTagRelation = new CourseTagRelation();
-            courseTagRelation.setTagId(Long.valueOf(courseTag.getId()));
-            courseTagRelation.setCourseId(courseId);
-            courseTagRelationDao.save(courseTagRelation);
-        }else {//1.2 否则修改标签
-            courseTag=courseTagList.get(0);
-            // 当同一标签被3个及以上课管创建时，默认开启这个标签的公共化
-            if(courseTag.getUseCount() >= 3){
-                courseTag.setIsPublic(true);
-            }
-            courseTag.setDeleted(false);//有可能是之前被删除的标签，这里恢复为有效
-            //查找改课程与这个标签是否已经建立关联关系
-            query=QueryBuilder.from(CourseTagRelation.class);
-            filters = new ArrayList<>();
-            filters.add(FieldFilters.eq("tagId",Long.valueOf(courseTag.getId())));//精确匹配
-            filters.add(FieldFilters.eq("courseId",courseId));//精确匹配
-            query.addFilters(filters);
-            List<CourseTagRelation> courseTagRelationList = courseTagRelationDao.findList(query.builder());
-            //1.2.1 如果还未建立关联关系，则新建一条标签和课程的关联关系
-            if (courseTagRelationList==null || courseTagRelationList.size()==0){
-                CourseTagRelation courseTagRelation = new CourseTagRelation();
-                courseTagRelation.setTagId(Long.valueOf(courseTag.getId()));
-                courseTagRelation.setCourseId(courseId);
-                courseTagRelationDao.save(courseTagRelation);
-                //更新该标签的关联课程数量
-                courseTag.setUseCount(courseTag.getUseCount()+1);
-            }else {//1.2.2 否则修改该标签和课程的关联关系
-                CourseTagRelation courseTagRelation = courseTagRelationList.get(0);
-                if (courseTagRelation.getDeleted()){//之前"解绑",这里恢复为有效
-                    courseTagRelation.setDeleted(false);
-                    courseTagRelationDao.saveOrUpdate(courseTagRelation);
-                    //更新该标签的关联课程数量
-                    courseTag.setUseCount(courseTag.getUseCount()+1);
-                }
-            }
-            courseTagDao.saveOrUpdate(courseTag);
-        }
-        //2.创建该标签和课程分类之间的关联关系
-        courseTagRelationDto.setTagId(courseTag.getId());
-        createCourseTypeAndTagRelation(courseTagRelationDto);
-        return courseTag;
-    }
-*/
-    @Override
-    public CourseTag getTagByName(String tagName) {
-        CourseTag courseTag = courseTagDao.getTagByName(tagName);
-        return courseTag;
-    }
-
-    @Override
-    public List<CourseTag> getTagsByIds(String id) {
-        // id=17,18
-        List<CourseTag> courseTagList = courseTagDao.getTagsByIds(id);
-        return courseTagList;
-    }
-
-    /**
-     * 获取热门标签
-     * @param courseTagRelationDto
-     * @return
-     */
-    @Override
-    public List<CourseTag> getHotTagList(CourseTagRelationDto courseTagRelationDto) {
-        List<CourseTag> hotTagList = null;
-        if (StringUtils.isNotBlank(courseTagRelationDto.getSysType1()) ||
-                StringUtils.isNotBlank(courseTagRelationDto.getSysType2()) ||
-                StringUtils.isNotBlank(courseTagRelationDto.getSysType3())){
-            String sysType1 = courseTagRelationDto.getSysType1();
-            String sysType2 = courseTagRelationDto.getSysType2();
-            String sysType3 = courseTagRelationDto.getSysType3();
-            hotTagList = courseTagDao.getHotTagListBySysTypes(sysType1,sysType2,sysType3);
-        }else {
-            hotTagList = courseTagDao.getHotTagList();
-        }
-        return hotTagList;
-    }
-
-    /**
-     * 创建标签和课程分类之间的关联关系
-     * @param courseTagRelationDto
-     */
-    private void createCourseTypeAndTagRelation(CourseTagRelationDto courseTagRelationDto){
-        String sysType1 = courseTagRelationDto!=null?courseTagRelationDto.getSysType1():null;
-        String tagId = courseTagRelationDto!=null?courseTagRelationDto.getTagId():null;
-        if (StringUtils.isNotBlank(sysType1) && StringUtils.isNotBlank(tagId)){
-            String sysType2 = courseTagRelationDto.getSysType2();
-            String sysType3 = courseTagRelationDto.getSysType3();
-            //判断数据库中该课程分类和标签是否已经存在关联关系
-            if (!isHadCourseTypeAndTagRelation(courseTagRelationDto,true)){//不存在，则新建
-                CourseTypeTagRelation courseTypeTagRelation = new CourseTypeTagRelation();
-                courseTypeTagRelation.setSysType1(sysType1);
-                courseTypeTagRelation.setSysType2(StringUtils.isNotBlank(sysType2)?sysType2:"0");
-                courseTypeTagRelation.setSysType3(StringUtils.isNotBlank(sysType3)?sysType3:"0");
-                courseTypeTagRelation.setTagId(tagId);
-                courseTypeTagRelationDao.save(courseTypeTagRelation);
-            }
-        }
-    }
-
-    /**
-     * 判断数据库制定的课程分类和标签是否已经存在关联关系
-     * @param courseTagRelationDto
-     * @param clearFlag 清理标识  true：清理已存在的数据，只保留一条有效数据
-     * @return  true:已存在；false:不存在
-     */
-    private Boolean isHadCourseTypeAndTagRelation(CourseTagRelationDto courseTagRelationDto,Boolean clearFlag){
-        QueryBuilder query=QueryBuilder.from(CourseTypeTagRelation.class);
-        List<IFieldFilter> filters = new ArrayList<>();
-        filters.add(FieldFilters.eq("sysType1",courseTagRelationDto.getSysType1()));//一级分类
-        filters.add(FieldFilters.eq("sysType2",courseTagRelationDto.getSysType1()));//二级分类
-        filters.add(FieldFilters.eq("sysType3",courseTagRelationDto.getSysType1()));//三级分类
-        filters.add(FieldFilters.eq("tagId",courseTagRelationDto.getTagId()));
-        List<CourseTypeTagRelation> courseTypeTagRelList = courseTypeTagRelationDao.findList(query.addFilters(filters).builder());
-        Boolean isExist = (courseTypeTagRelList!=null && courseTypeTagRelList.size()>0)?true:false;
-        if (isExist && clearFlag ){
-            List<CourseTypeTagRelation> toRemove = new ArrayList<>();
-            for (CourseTypeTagRelation courseTypeTagRel : courseTypeTagRelList) {
-                if (courseTypeTagRel.getDeleted()) {//如果是逻辑删的本次物理删除
-                    courseTypeTagRelationDao.getGenericDao().delete(courseTypeTagRel);
-                    toRemove.add(courseTypeTagRel);
-                }
-            }
-            courseTypeTagRelList.removeAll(toRemove);//移除逻辑删的数据
-            //如果还存在有效数据
-            if (courseTypeTagRelList!=null && courseTypeTagRelList.size()>0){
-                //只保留一条有效数据，其余物理删除
-                for (int i = courseTypeTagRelList.size() - 1; i >= 1; i--) {
-                    CourseTypeTagRelation courseTypeTagRel = courseTypeTagRelList.get(i);
-                    if (courseTypeTagRel.getDeleted()) {
-                        courseTypeTagRelationDao.getGenericDao().delete(courseTypeTagRel);
-                        courseTypeTagRelList.remove(i); // 倒序删除不影响未遍历的索引
-                    }
-                }
-                isExist = true;//存在一条有效数据
-            }else {
-                isExist = false;//不存在有效数据了
-            }
-        }
-        return isExist;
-    }
-
-
-
-    /**
-     * 创建新标签
-     * @param courseTagRelationDto
-     * @return
-     */
-    @Override
-    public CourseTag createTag(CourseTagRelationDto courseTagRelationDto) {
-        CourseTag courseTag = null;
-        String tagName = courseTagRelationDto.getTagName();
-        //1.创建标签：先判断是否已经存在该标签
-        QueryBuilder query=QueryBuilder.from(CourseTag.class);
-        List<IFieldFilter> filters = new ArrayList<>();
-        filters.add(FieldFilters.eq("tagName",tagName));//精确匹配
-        filters.add(FieldFilters.eq("status",0));//正式
-        filters.add(FieldFilters.eq("deleted",false));//未删除的
-        query.addFilters(filters);
-        List<CourseTag> courseTagList = courseTagDao.findList(query.builder());
-        if (courseTagList==null || courseTagList.isEmpty() || !courseTagList.get(0).getIsPublic()){//1.1 如果该标签不存在 或私有标签，则新建标签
-            courseTag = new CourseTag();
-            courseTag.setTagName(tagName);
-            courseTag.setIsPublic(false);
-            courseTag.setIsHot(false);
-            courseTag.setStatus(1);
-            courseTag.setUseCount(1);
-            //初始给个时间， 变更公共会更新时间 关闭公共会设置null 后续不在自动变更为公共
-            courseTag.setLastSetPublicTime(LocalDateTime.now());
-            courseTagDao.save(courseTag);
-        }
-        return courseTag;
-    }
-
-
-    @Override
-    public void updateTags(Course oldCourse, Course newCourse, CurrentUser userInfo) {
-        log.info(" --- 标签修改 --- 在线课参数 oldCourse = {} " , oldCourse);
-        log.info(" --- 标签修改 --- 在线课参数 newCourse = {} " , newCourse);
-        log.info(" --- 标签修改 --- 用户信息 userInfo = {} " , userInfo);
-
-        // 获取新旧课程的标签ID列表
-        List<String> oldTagIds = getTagIdsFromCourse(oldCourse);
-        List<String> newTagIds = getTagIdsFromCourse(newCourse);
-        log.info(" --- 旧标签 oldTagIds = {} " , oldTagIds);
-        log.info(" --- 新修改  newTagIds = {} " , newTagIds);
-        if (oldCourse == null || oldTagIds.isEmpty()) {
-            // 新增课程 - 处理所有新标签
-            handleNewCourseTags(newCourse, newTagIds, userInfo);
-        } else {
-            // 编辑课程 - 比较差异并处理
-            handleEditCourseTags(oldCourse, newCourse, oldTagIds, newTagIds, userInfo);
-        }
-        log.info("完成课程标签更新: courseId={}", newCourse != null ? newCourse.getId() : "null");
-    }
-
-    @Override
-    public List<CourseTag> getAllTags() {
-        QueryBuilder query=QueryBuilder.from(CourseTag.class);
-        List<IFieldFilter> filters = new ArrayList<>();
-        filters.add(FieldFilters.eq("deleted",false));//未删除
-        filters.add(FieldFilters.eq("status",0));//正式标签
-        query.addFilters(filters);
-        List<CourseTag> courseTagList = courseTagDao.findList(query.builder());
-        return courseTagList;
-    }
-
-    /**
-     * 从课程对象中提取标签ID列表
-     */
-    private List<String> getTagIdsFromCourse(Course course) {
-        if (course == null || StringUtils.isBlank(course.getTags())) {
-            return new ArrayList<>();
-        }
-
-        String tags = course.getTags();
-        // 去除结尾的逗号并分割
-        if (tags.endsWith(",")) {
-            tags = tags.substring(0, tags.length() - 1);
-        }
-
-        if (StringUtils.isBlank(tags)) {
-            return new ArrayList<>();
-        }
-
-        return Arrays.asList(tags.split(","));
-    }
-
-    /**
-     * 处理新增课程的标签逻辑
-     */
-    private void handleNewCourseTags(Course newCourse, List<String> newTagIds, CurrentUser userInfo) {
-        log.info("处理新增课程的标签逻辑: courseId={}, tagCount={}", newCourse != null ? newCourse.getId() : "null", newTagIds.size());
-        String courseId = newCourse.getId();
-
-        for (String tagId : newTagIds) {
-            if (StringUtils.isBlank(tagId)) {
-                continue;
-            }
-
-            // 获取标签信息
-            CourseTag tag = courseTagDao.findOne(FieldFilters.eq("id", tagId.trim()));
-            if (tag == null) {
-                log.warn("标签不存在: {}", tagId);
-                continue;
-            }
-
-            //合并临时标签
-            tag = mergeTag(tag);
-
-            // 创建课程-标签关联关系
-            createCourseTagRelation(courseId, tag, userInfo);
-
-            // 创建分类-标签关联关系
-            createCourseTypeTagRelations(newCourse, tag, userInfo);
-
-            // 更新标签使用计数并检查是否设置为公共标签
-            updateTagUseCountAndPublicStatus(tag, userInfo);
-        }
-        log.info("完成新增课程标签处理: courseId={}", newCourse != null ? newCourse.getId() : "null");
-    }
-
-    /**
-     * 处理编辑课程的标签逻辑
-     */
-    private void handleEditCourseTags(Course oldCourse, Course newCourse,
-                                      List<String> oldTagIds, List<String> newTagIds, CurrentUser userInfo) {
-        log.info("处理编辑课程的标签逻辑: courseId={}, oldTagCount={}, newTagCount={}, toRemove={}, toAdd={}",
-                newCourse != null ? newCourse.getId() : "null",
-                oldTagIds.size(), newTagIds.size(),
-                oldTagIds.stream().filter(tagId -> !newTagIds.contains(tagId)).count(),
-                newTagIds.stream().filter(tagId -> !oldTagIds.contains(tagId)).count());
-
-        String courseId = newCourse.getId();
-
-        // 找出需要删除的标签（存在于旧课程但不在新课程中）
-        List<String> tagsToRemove = oldTagIds.stream()
-                .filter(tagId -> !newTagIds.contains(tagId))
-                .collect(Collectors.toList());
-
-        // 找出需要新增的标签（存在于新课程但不在旧课程中）
-        List<String> tagsToAdd = newTagIds.stream()
-                .filter(tagId -> !oldTagIds.contains(tagId))
-                .collect(Collectors.toList());
-
-        // 处理标签删除
-        for (String tagId : tagsToRemove) {
-            removeCourseTagRelation(courseId, tagId, userInfo);
-        }
-
-        // 处理标签新增
-        for (String tagId : tagsToAdd) {
-            CourseTag tag = courseTagDao.findOne(FieldFilters.eq("id", tagId.trim()));
-            if (tag == null) {
-                log.warn("标签不存在: {}", tagId);
-                continue;
-            }
-            //如果已有同名的正式标签 则需要合并
-            //合并临时标签
-            tag = mergeTag(tag);
-
-            // 创建课程-标签关联关系
-            createCourseTagRelation(courseId, tag, userInfo);
-
-            // 创建分类-标签关联关系
-            createCourseTypeTagRelations(newCourse, tag, userInfo);
-
-            // 更新标签使用计数并检查是否设置为公共标签
-            updateTagUseCountAndPublicStatus(tag, userInfo);
-        }
-
-        // 处理分类变化导致的标签关联关系更新
-        if (hasCourseTypeChanged(oldCourse, newCourse)) {
-            updateCourseTypeTagRelations(oldCourse, newCourse, newTagIds, userInfo);
-        }
-        log.info("完成编辑课程标签处理: courseId={}", newCourse != null ? newCourse.getId() : "null");
-    }
-
-
-    /**
-     * 合并标签
-     */
-    private CourseTag mergeTag(CourseTag tag){
-        //只处理临时标签 正式的忽略
-        if (tag.getStatus()==1){
-            QueryBuilder query=QueryBuilder.from(CourseTag.class);
-            List<IFieldFilter> filters = new ArrayList<>();
-            filters.add(FieldFilters.eq("tagName",tag.getTagName()));//精确匹配
-            filters.add(FieldFilters.eq("status",0));//正式
-            filters.add(FieldFilters.eq("deleted",false));//未删除的
-            query.addFilters(filters);
-            List<CourseTag> courseTagList = courseTagDao.findList(query.builder());
-            log.info("标签合并 createTag courseTagList = {} " , courseTagList);
-            //如果无同名正式标签 则转正
-            //有同名正式标签 则合并
-            if (courseTagList != null && !courseTagList.isEmpty()) {
-                //删除临时标签
-                tag.setSysUpdateBy("系统合并删除");
-                tag.setSysUpdateTime(LocalDateTime.now());
-                courseTagDao.setDeleted(tag.getId());
-                //返回同名正式标签
-                tag = courseTagList.get(0);
-            }
-        }
-        return tag;
-    }
-
-    /**
-     * 创建课程-标签关联关系
-     */
-    private void createCourseTagRelation(String courseId, CourseTag tag, CurrentUser userInfo) {
-        log.debug("创建课程-标签关联关系: courseId={}, tagId={}, tagName={}",
-                courseId, tag != null ? tag.getId() : "null", tag != null ? tag.getTagName() : "null");
-
-        // 检查是否已存在关联关系
-        QueryBuilder query = QueryBuilder.from(CourseTagRelation.class);
-        List<IFieldFilter> filters = new ArrayList<>();
-        filters.add(FieldFilters.eq("courseId", Long.valueOf(courseId)));
-        filters.add(FieldFilters.eq("tagId", Long.valueOf(tag.getId())));
-//        filters.add(FieldFilters.eq("deleted", false));
-        query.addFilters(filters);
-
-        List<CourseTagRelation> existingRelations = courseTagRelationDao.findList(query.builder());
-
-        LocalDateTime now = LocalDateTime.now();
-
-        if (existingRelations.isEmpty()) {
-            // 新建关联关系
-            CourseTagRelation relation = new CourseTagRelation();
-            relation.setCourseId(Long.valueOf(courseId));
-            relation.setTagId(Long.valueOf(tag.getId()));
-
-            // 设置创建信息
-            relation.setSysCreateAid(userInfo.getAccountId());
-            relation.setSysCreateBy(userInfo.getName());
-            relation.setSysCreateTime(now);
-
-            // 设置更新信息
-            relation.setSysUpdateBy(userInfo.getName());
-            relation.setSysUpdateTime(now);
-
-            courseTagRelationDao.save(relation);
-        } else {
-            // 恢复已删除的关联关系
-            CourseTagRelation relation = existingRelations.get(0);
-            if (relation.getDeleted()) {
-                courseTagRelationDao.reTagRelDelStatus(relation.getId(),userInfo.getName());
-//                relation.setDeleted(false);
-                // 设置更新信息
-//                relation.setSysUpdateBy(userInfo.getName());
-//                relation.setSysUpdateTime(now);
-//                courseTagRelationDao.saveOrUpdate(relation);
-            }
-        }
-        log.debug("完成课程-标签关联关系创建: courseId={}, tagId={}", courseId, tag != null ? tag.getId() : "null");
-
-    }
-
-    /**
-     * 创建分类-标签关联关系
-     */
-    private void createCourseTypeTagRelations(Course course, CourseTag tag, CurrentUser userInfo) {
-        log.debug("创建分类-标签关联关系: courseId={}, tagId={}, sysType1={}, sysType2={}, sysType3={}",
-                course != null ? course.getId() : "null",
-                tag != null ? tag.getId() : "null",
-                course != null ? course.getSysType1() : "null",
-                course != null ? course.getSysType2() : "null",
-                course != null ? course.getSysType3() : "null");
-
-        String sysType1 = course.getSysType1();
-        String sysType2 = course.getSysType2();
-        String sysType3 = course.getSysType3();
-
-        // 根据分类级别创建相应的关联关系
-        if (StringUtils.isNotBlank(sysType3)) {
-            createSingleCourseTypeTagRelation(sysType1, sysType2, sysType3, tag.getId(), userInfo);
-        }else if (StringUtils.isNotBlank(sysType2)) {
-            createSingleCourseTypeTagRelation(sysType1, sysType2, "0", tag.getId(), userInfo);
-        }else if (StringUtils.isNotBlank(sysType1)) {
-            createSingleCourseTypeTagRelation(sysType1, "0", "0", tag.getId(), userInfo);
-        }
-    }
-
-    /**
-     * 创建单个分类-标签关联关系
-     */
-    private void createSingleCourseTypeTagRelation(String sysType1, String sysType2, String sysType3,
-                                                   String tagId, CurrentUser userInfo) {
-        // 检查是否已存在关联关系
-        QueryBuilder query = QueryBuilder.from(CourseTypeTagRelation.class);
-        List<IFieldFilter> filters = new ArrayList<>();
-        filters.add(FieldFilters.eq("sysType1", sysType1));
-        filters.add(FieldFilters.eq("sysType2", sysType2));
-        filters.add(FieldFilters.eq("sysType3", sysType3));
-        filters.add(FieldFilters.eq("tagId", tagId));
-//        filters.add(FieldFilters.eq("deleted", false));
-        query.addFilters(filters);
-
-        List<CourseTypeTagRelation> existingRelations = courseTypeTagRelationDao.findList(query.builder());
-
-        LocalDateTime now = LocalDateTime.now();
-
-        if (existingRelations.isEmpty()) {
-            // 新建关联关系
-            CourseTypeTagRelation relation = new CourseTypeTagRelation();
-            relation.setSysType1(sysType1);
-            relation.setSysType2(sysType2);
-            relation.setSysType3(sysType3);
-            relation.setTagId(tagId);
-
-            // 设置创建信息
-            relation.setSysCreateAid(userInfo.getAccountId());
-            relation.setSysCreateBy(userInfo.getName());
-            relation.setSysCreateTime(now);
-
-            // 设置更新信息
-            relation.setSysUpdateBy(userInfo.getName());
-            relation.setSysUpdateTime(now);
-
-            courseTypeTagRelationDao.save(relation);
-        } else {
-            // 恢复已删除的关联关系
-            CourseTypeTagRelation relation = existingRelations.get(0);
-            if (relation.getDeleted()) {
-                courseTagRelationDao.reTypeTagRelDelStatus(relation.getId(),userInfo.getName());
-//                relation.setDeleted(false);
-//                // 设置更新信息
-//                relation.setSysUpdateBy(userInfo.getName());
-//                relation.setSysUpdateTime(now);
-//                courseTypeTagRelationDao.saveOrUpdate(relation);
-            }
-        }
-    }
-
-    /**
-     * 移除课程-标签关联关系
-     */
-    private void removeCourseTagRelation(String courseId, String tagId, CurrentUser userInfo) {
-        log.debug("移除课程-标签关联关系: courseId={}, tagId={}", courseId, tagId);
-        // 查找关联关系
-        QueryBuilder query = QueryBuilder.from(CourseTagRelation.class);
-        List<IFieldFilter> filters = new ArrayList<>();
-        filters.add(FieldFilters.eq("courseId", Long.valueOf(courseId)));
-        filters.add(FieldFilters.eq("tagId", Long.valueOf(tagId)));
-        query.addFilters(filters);
-
-        List<CourseTagRelation> relations = courseTagRelationDao.findList(query.builder());
-
-        if (!relations.isEmpty()) {
-            CourseTagRelation relation = relations.get(0);
-
-            // 设置更新信息
-            relation.setSysUpdateBy(userInfo.getName());
-            relation.setSysUpdateTime(LocalDateTime.now());
-
-            // 逻辑删除关联关系
-            courseTagRelationDao.setDeleted(relation.getId());
-
-            // 更新标签使用计数
-            CourseTag tag = courseTagDao.findOne(FieldFilters.eq("id", tagId));
-            if (tag != null) {
-                tag.setUseCount(Math.max(0, tag.getUseCount() - 1));
-
-                // 设置更新信息
-                tag.setSysUpdateBy(userInfo.getName());
-                tag.setSysUpdateTime(LocalDateTime.now());
-
-                courseTagDao.update(tag);
-            }
-
-            // 检查是否需要删除分类-标签关联关系
-            checkAndRemoveCourseTypeTagRelation(tagId, userInfo);
-        }
-        log.debug("完成课程-标签关联关系移除: courseId={}, tagId={}", courseId, tagId);
-    }
-
-    /**
-     * 检查并删除分类-标签关联关系（如果没有其他课程使用）
-     */
-    private void checkAndRemoveCourseTypeTagRelation(String tagId, CurrentUser userInfo) {
-        // 检查是否还有其他课程使用这个标签
-        QueryBuilder query = QueryBuilder.from(CourseTagRelation.class);
-        List<IFieldFilter> filters = new ArrayList<>();
-        filters.add(FieldFilters.eq("tagId", Long.valueOf(tagId)));
-        filters.add(FieldFilters.eq("deleted", false));
-        query.addFilters(filters);
-
-        List<CourseTagRelation> activeRelations = courseTagRelationDao.findList(query.builder());
-
-        // 如果没有其他活跃的关联关系，删除分类-标签关联
-        if (activeRelations.isEmpty()) {
-            QueryBuilder typeQuery = QueryBuilder.from(CourseTypeTagRelation.class);
-            List<IFieldFilter> typeFilters = new ArrayList<>();
-            typeFilters.add(FieldFilters.eq("tagId", tagId));
-            typeQuery.addFilters(typeFilters);
-
-            List<CourseTypeTagRelation> typeRelations = courseTypeTagRelationDao.findList(typeQuery.builder());
-
-            LocalDateTime now = LocalDateTime.now();
-
-            for (CourseTypeTagRelation relation : typeRelations) {
-                // 设置更新信息
-                relation.setSysUpdateBy(userInfo.getName());
-                relation.setSysUpdateTime(now);
-
-                courseTypeTagRelationDao.setDeleted(relation.getId());
-            }
-        }
-    }
-
-    /**
-     * 更新标签使用计数并检查公共标签状态
-     */
-    private void updateTagUseCountAndPublicStatus(CourseTag tag, CurrentUser userInfo) {
-        log.debug("更新标签使用计数和公共状态: tagId={}, tagName={}, beforeUseCount={}",
-                tag != null ? tag.getId() : "null",
-                tag != null ? tag.getTagName() : "null",
-                tag != null ? tag.getUseCount() : "null");
-
-        // 将标签状态设置为正式(status=0)
-        if (tag != null && tag.getStatus() == 1) {
-            tag.setStatus(0); // 正式标签
-        }
-        // 统计当前活跃的关联关系数量
-        QueryBuilder query = QueryBuilder.from(CourseTagRelation.class);
-        List<IFieldFilter> filters = new ArrayList<>();
-        filters.add(FieldFilters.eq("tagId", Long.valueOf(tag.getId())));
-        filters.add(FieldFilters.eq("deleted", false));
-        query.addFilters(filters);
-
-        List<CourseTagRelation> activeRelations = courseTagRelationDao.findList(query.builder());
-        int activeCount = activeRelations.size();
-
-        tag.setUseCount(activeCount);
-
-        LocalDateTime now = LocalDateTime.now();
-
-        // 检查是否满足设置为公共标签的条件
-        if (activeCount >= 3 && tag.getLastSetPublicTime() != null) {
-            // 只有从未手动关闭过公共标签的才自动开启
-            tag.setIsPublic(true);
-            tag.setLastSetPublicTime(now);
-        }
-
-        // 设置更新信息
-        tag.setSysUpdateBy(userInfo.getName());
-        tag.setSysUpdateTime(now);
-
-        courseTagDao.update(tag);
-        log.debug("完成标签使用计数和公共状态更新: tagId={}, tagName={}, afterUseCount={}, isPublic={}",
-                tag != null ? tag.getId() : "null",
-                tag != null ? tag.getTagName() : "null",
-                tag != null ? tag.getUseCount() : "null",
-                tag != null ? tag.getIsPublic() : "null");
-    }
-
-    /**
-     * 检查课程分类是否发生变化
-     */
-    private boolean hasCourseTypeChanged(Course oldCourse, Course newCourse) {
-        return !Objects.equals(oldCourse.getSysType1(), newCourse.getSysType1()) ||
-                !Objects.equals(oldCourse.getSysType2(), newCourse.getSysType2()) ||
-                !Objects.equals(oldCourse.getSysType3(), newCourse.getSysType3());
-    }
-
-    /**
-     * 更新分类-标签关联关系（当分类变化时）
-     */
-    private void updateCourseTypeTagRelations(Course oldCourse, Course newCourse,
-                                              List<String> tagIds, CurrentUser userInfo) {
-        // 移除旧的分类-标签关联关系
-        for (String tagId : tagIds) {
-            checkAndRemoveCourseTypeTagRelation(tagId, userInfo);
-        }
-
-        // 创建新的分类-标签关联关系
-        for (String tagId : tagIds) {
-            CourseTag tag = courseTagDao.findOne(FieldFilters.eq("id", tagId.trim()));
-            if (tag != null) {
-                createCourseTypeTagRelations(newCourse, tag, userInfo);
-            }
-        }
-    }
-
-    /**
-     * 设置实体的创建信息（新增时使用）
-     */
-    private void setCreateInfo(BaseEntity entity, CurrentUser userInfo) {
-        LocalDateTime now = LocalDateTime.now();
-        entity.setSysCreateAid(userInfo.getAccountId());
-        entity.setSysCreateBy(userInfo.getName());
-        entity.setSysCreateTime(now);
-        entity.setSysUpdateBy(userInfo.getName());
-        entity.setSysUpdateTime(now);
-    }
-
-    /**
-     * 设置实体的更新信息（编辑时使用）
-     */
-    private void setUpdateInfo(BaseEntity entity, CurrentUser userInfo) {
-        entity.setSysUpdateBy(userInfo.getName());
-        entity.setSysUpdateTime(LocalDateTime.now());
-    }
-
-
-
-}

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

@@ -8,8 +8,6 @@ import java.util.Map;
 
 import javax.annotation.Resource;
 
-import com.boe.feign.api.courseweb.reps.ExamStudyRecordParam;
-import com.xboe.api.ThirdApi;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -39,10 +37,7 @@ public class AloneExamServiceImpl implements IAloneExamService{
 	
 	@Resource
 	AloneExamDao aeDao;
-	@Resource
-	private ThirdApi thirdApi;
-
-
+	
 	@Override
 	@Transactional
 	public void save(AloneExamAnswer aea){
@@ -106,18 +101,7 @@ public class AloneExamServiceImpl implements IAloneExamService{
 //				//这种情况汶是不存在的
 //			}
 		}
-
-        try {
-            ExamStudyRecordParam param = new ExamStudyRecordParam();
-            param.setTestId(aea.getTestId());
-            param.setAid(aea.getAid());
-            thirdApi.syncExamStudyRecord(param);
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-
-
-    }
+	}
 
 	@Override
 	@Transactional

servers/boe-server-all/src/main/java/com/xboe/module/filecloud/api/XFileBaseApi.java

@@ -10,7 +10,6 @@ import javax.servlet.http.HttpServletRequest;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;

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

@@ -43,7 +43,12 @@ public class PhpOnlineStudyRecordScheduledTasks {
     @Resource
     RestHighLevelClient restHighLevelClient;
 
-    // todo 定时、分批、数据库名
+    /**
+     * 定时同步PHP数据库数据到es中，计划定时20分钟执行一次。具体实现是，
+     * 第一步，查询最近半小时内完成任一课件的课程学习，获取的信息有课程ID，学员ID，学习状态、学习进度。
+     * 第二步，根据上述得到的课程ID，学员ID，查询es中的未完成的记录。
+     * 第三步，比对两者学习进度，如果不一致，以数据库学习记录为准，修改ES
+     */
     @XxlJob("phpOnlineStudyRecordSyncEsTask")
     public List<String> phpOnlineStudyRecordSyncEs(Long syncTimePointOfBegin, Long syncTimePointOfEnd, Integer isOnlyRead) throws IOException {
 
@@ -101,6 +106,9 @@ public class PhpOnlineStudyRecordScheduledTasks {
             // 获取ES中的数据
             List<CourseStudyDto> esDataList = getEsData(batch);
 
+            if (CollUtil.isEmpty(esDataList)){
+                continue;
+            }
 
             // 更新ES数据
             List<CourseStudyDto> toBeUpdatedEs = esDataList.stream()
@@ -130,12 +138,13 @@ public class PhpOnlineStudyRecordScheduledTasks {
             }
 
             // 调用批量更新方法
-//            toBeUpdatedEs(toBeUpdatedEs, indexName);
+            toBeUpdatedEs(toBeUpdatedEs);
         }
         return tempResultList;
     }
 
     private List<CourseStudyDto> getEsData(List<PhpOnlineDto> finishedCourseList) throws IOException {
+        log.info("待处理的数据：{}", finishedCourseList);
         SearchRequest searchRequest = new SearchRequest("new_study_resource");
         BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
 
@@ -151,11 +160,13 @@ public class PhpOnlineStudyRecordScheduledTasks {
             );
         }
 
-        SearchSourceBuilder sourceBuilder = new SearchSourceBuilder().query(boolQuery).timeout(new TimeValue(60, TimeUnit.SECONDS));
-        searchRequest.source(sourceBuilder);
-        if (boolQuery.hasClauses()) {
-            sourceBuilder.query(boolQuery);
+        if (!boolQuery.hasClauses()) {
+            return null;
         }
+        SearchSourceBuilder sourceBuilder = new SearchSourceBuilder()
+                .query(boolQuery)
+                .timeout(new TimeValue(60, TimeUnit.SECONDS))
+                .size(finishedCourseList.size() + 10);
         searchRequest.source(sourceBuilder);
 
         SearchResponse response = restHighLevelClient.search(searchRequest, RequestOptions.DEFAULT);
@@ -175,7 +186,7 @@ public class PhpOnlineStudyRecordScheduledTasks {
         return courseStudyDtoList;
     }
 
-    private void toBeUpdatedEs(List<CourseStudyDto> toBeUpdatedEsData, String indexName) {
+    private void toBeUpdatedEs(List<CourseStudyDto> toBeUpdatedEsData) {
         if (CollUtil.isEmpty(toBeUpdatedEsData)) {
             return;
         }
@@ -186,7 +197,7 @@ public class PhpOnlineStudyRecordScheduledTasks {
             docMap.put("progress", courseStudyDto.getProgress());
 
             // 创建更新请求，并传入单一的docMap
-            UpdateRequest updateRequest = new UpdateRequest(indexName, courseStudyDto.getId())
+            UpdateRequest updateRequest = new UpdateRequest("new_study_resource", courseStudyDto.getId())
                     .doc(docMap, XContentType.JSON);
 
             // 将请求添加到批量请求中
@@ -208,7 +219,11 @@ public class PhpOnlineStudyRecordScheduledTasks {
         }
     }
 
-
+    /**
+     * 第一步，查询最近报名的学习，获取的信息有课程ID，学员ID，学习状态、学习进度。
+     * 第二步，根据上述得到的课程ID，学员ID，查询es中的未完成的记录。
+     * 第三步，比对两者学习进度，如果不一致，以数据库学习记录为准，修改ES。
+     */
     public List<String> phpOnlineStudyRecordSyncEsOfFull(Long syncTimePointOfBegin, Long syncTimePointOfEnd, Integer isOnlyRead) throws IOException {
 
         log.info("开始同步PHP学习记录到ES");

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

@@ -1,21 +1,15 @@
 package com.xboe.school.study.api;
 
-import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
-import java.util.function.Function;
-import java.util.stream.Collectors;
 
-import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.nacos.shaded.com.google.common.util.concurrent.RateLimiter;
 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;
@@ -210,8 +204,6 @@ public class StudyCourseApi extends ApiBaseController{
 			Teacher t = teacherService.get(ct.getTeacherId());
 			if(t!=null) {
 				ct.setRemark(t.getDescription());
-				ct.setSupplier(t.getSupplier());
-				ct.setTeacherType(t.getTeacherType());
 			}
 			if(redisTemplate.opsForValue().get(ct.getTeacherId())==null){
 				List<String>list=new ArrayList<>();
@@ -220,11 +212,11 @@ public class StudyCourseApi extends ApiBaseController{
 				redisTemplate.opsForValue().set(teacherVo.get(0).getTeacherId(), teacherVo.get(0).getStatus());
 				//设置过期时间为1天
 				redisTemplate.expire(teacherVo.get(0).getTeacherId(), 24 * 60 * 60, TimeUnit.SECONDS);
-				if (Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1") && (  t==null ||  t.getTeacherType() == 1)){
+				if (Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1")){
 					ct.setTeacherName("BOE教师");
 				}
 			}
-			if (Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1") && (  t==null ||  t.getTeacherType() == 1)){
+			if (Objects.equals(redisTemplate.opsForValue().get(ct.getTeacherId()), "1")){
 				ct.setTeacherName("BOE教师");
 			}
 		}
@@ -259,36 +251,6 @@ public class StudyCourseApi extends ApiBaseController{
 			rs.put("progress", sc.getProgress());
 			//查询上次学习的是什么资源。查询用户的学习情况
 			List<StudyCourseItem> items=studyService.findByStudyId(sc.getId());
-			// 和内容匹配，根据内容的视频时长，计算学习进度
-			if(CollectionUtil.isNotEmpty(items) && CollectionUtil.isNotEmpty(cclist)){
-				// 根据ID转换map
-				Map<String, CourseContent> contentMap = cclist.stream().collect(Collectors.toMap(CourseContent::getId, Function.identity()));
-				for (StudyCourseItem item : items) {
-					CourseContent content = contentMap.get(item.getContentId());
-					if(null == content){
-						continue;
-					}
-
-					if(null==item.getLastStudyTime()
-							|| item.getLastStudyTime()<=0
-							|| null==content.getDuration()
-							|| content.getDuration()<=0){
-						continue;
-					}
-
-					BigDecimal lastStudyTime = new BigDecimal(item.getLastStudyTime());
-					BigDecimal duration = new BigDecimal(content.getDuration());
-					BigDecimal progress = lastStudyTime.divide(duration, 10, RoundingMode.HALF_UP);
-					if(progress.compareTo(BigDecimal.ZERO) < 0){
-						progress = BigDecimal.ZERO;
-					}else if(progress.compareTo(BigDecimal.ONE) > 0){
-						progress = BigDecimal.ONE;
-					}
-
-					item.setProgressVideo(progress);
-				}
-			}
-
 			rs.put("contentStudys",items);//学习的内容
 		}
 		
@@ -381,8 +343,6 @@ public class StudyCourseApi extends ApiBaseController{
 			}
 			//追加学习时长
 			studyService.appendStudyDuration(sci.getStudyId(),item.getId(),sci.getContentId(),sci.getDuration());
-
-			log.info(" 1 在线课学习记录 sci.getStudyId() = "+ sci.getStudyId() + " , sci.getCourseId() = " + sci.getCourseId() );
 			List<StudyCourse> allUserList = thirdApi.getStudyCourseList(sci.getStudyId() ,sci.getCourseId(), token);
 			log.info("在线课学习记录"+allUserList);
 			return success(item.getId());
@@ -613,7 +573,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("参数错误");
 		}
@@ -643,91 +603,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

@@ -3,16 +3,9 @@ package com.xboe.school.study.api;
 import java.io.IOException;
 import java.time.ZoneOffset;
 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 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;
@@ -49,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;
 
@@ -70,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,262 +0,0 @@
-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;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.data.redis.connection.RedisConnection;
-import org.springframework.data.redis.core.Cursor;
-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
- * @date 2025/3/3
- */
-@Component
-@Slf4j
-@RequiredArgsConstructor
-public class StudyCourseTask {
-
-    private final IStudyService studyService;
-    private final StringRedisTemplate redisTemplate;
-    @Resource
-    private ThirdApi thirdApi;
-
-    /**
-     * 定时任务
-     * 获取redis 中学习结束的数据更新入库
-     * */
-    @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");
-        // 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());
-                // 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 < 2) continue;
-                        String studyContentId = parts[1];
-                        // 7. 获取存储的时间点（示例逻辑）
-                        String redisValue = redisTemplate.opsForValue().get(redisKey);
-                        if (redisValue == null) continue;
-                        String[] partValues = redisValue.split("&");
-                        int lastStudyTime = Integer.parseInt(partValues[0]);
-                        LocalDateTime timestamp = null;
-                        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) {
-            log.error("定时任务执行异常", e);
-        }
-
-      /*  // 新增日志逻辑
-        if (ttl <= 172800) {
-            studyService.saveCourseExpireLog(
-                    studyContentId,
-                    lastStudyTime,
-                    redisKey,
-                    ttl,
-                    "system_job"
-            );
-        }*/
-
-    }
-
-
-    @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/dao/PhpOnlineCourseDao.java

@@ -95,20 +95,20 @@ public class PhpOnlineCourseDao extends BaseDao<PhpOnlineDto> {
             userBasicDataBase = "userbasic";
         }
 
-        List<String> userIds = objectList1.stream().map(objects -> String.valueOf(objects[1])).distinct().collect(Collectors.toList());
-        List<Object[]> objectList2 = this.sqlFindList("select kid,user_id from " + userBasicDataBase + ".user_account where kid in (?1) and deleted=0 and account_status = 0", userIds);
+        List<String> userIdOfPhpList = objectList1.stream().map(objects -> String.valueOf(objects[1])).distinct().collect(Collectors.toList());
+        List<Object[]> objectList2 = this.sqlFindList("select kid,user_id from " + userBasicDataBase + ".user_account where kid in (?1) and deleted=0 and account_status = 0", userIdOfPhpList);
 
         if (CollUtil.isEmpty(objectList1)) {
             log.info("新系统用户数据不存在");
             return null;
         }
 
-        Map<Object, Object> userIdToKidMap = objectList2.stream().collect(Collectors.toMap(object -> object[0], object -> object[1]));
+        Map<Object, Object> kidAndUserIdMap = objectList2.stream().collect(Collectors.toMap(object -> object[0], object -> object[1]));
 
         // 设置新系统用户ID
         recentLearnRecordList = recentLearnRecordList.stream()
                 .map(phpOnlineDto -> {
-                    Object userIdOfJavaObj = userIdToKidMap.get(phpOnlineDto.getUserIdOfPhp());
+                    Object userIdOfJavaObj = kidAndUserIdMap.get(phpOnlineDto.getUserIdOfPhp());
                     if (userIdOfJavaObj != null) {
                         phpOnlineDto.setUserIdOfJava(userIdOfJavaObj.toString());
                     }
@@ -209,7 +209,6 @@ public class PhpOnlineCourseDao extends BaseDao<PhpOnlineDto> {
         }
 
         // 拼接获取所有新系统用户id，这里不选择与上面的联表查询，有效率问题
-
         String userBasicDataBase;
         if (activeProfile.equals("pro")) {
             userBasicDataBase = "user_basic";

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

@@ -1,12 +1,10 @@
 package com.xboe.school.study.entity;
 
-import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
-import javax.persistence.Transient;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xboe.core.SysConstant;
@@ -130,12 +128,5 @@ public class StudyCourseItem extends IdEntity {
      */
     @Column(name = "status",length=1)
     private Integer status;
-
-    /**
-     * 视频播放进度
-     * */
-//    @Column(name = "progress_video")
-    @Transient
-    private BigDecimal progressVideo;
-
+    
 }

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

@@ -1,6 +1,5 @@
 package com.xboe.school.study.service;
 
-import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
@@ -8,6 +7,7 @@ import com.xboe.common.PageList;
 import com.xboe.school.study.dto.StudyContentDto;
 import com.xboe.school.study.entity.StudyCourseItem;
 import com.xboe.school.study.entity.StudyTime;
+import com.xboe.system.user.entity.User;
 
 /**
  * 学习情况处理,比较综合一个处理类
@@ -35,12 +35,11 @@ public interface IStudyService {
 	
 	/**
 	 * 更新最后的学习时间，及学习时间点
-	 *
 	 * @param studyContentId
 	 * @param lastStudyTime
 	 * @param aid
 	 */
-	void updateLastTime(String studyContentId, int lastStudyTime, String aid);
+	void updateLastTime(String studyContentId,int lastStudyTime,String aid);
 
 	/**
 	 * 资源学习记录
@@ -100,9 +99,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

@@ -1,6 +1,5 @@
 package com.xboe.school.study.service.impl;
 
-import java.time.Duration;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@@ -10,9 +9,12 @@ import java.util.Map;
 
 import javax.transaction.Transactional;
 
+import com.xboe.module.article.entity.Article;
+import com.xboe.module.interaction.entity.Shares;
+import com.xboe.school.study.entity.StudyCourse;
+import com.xboe.system.user.entity.User;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 
 import com.xboe.common.OrderCondition;
@@ -49,10 +51,7 @@ public class StudyServiceImpl implements IStudyService{
 	
 	@Autowired
 	UserDao userDao;
-	@Autowired
-	StringRedisTemplate redisTemplate;
-
-
+	
 	@Override
 	public StudyCourseItem checkHas(String studyId,String contentId) {
 		List<StudyCourseItem> items = scItemDao.findList(FieldFilters.eq("studyId", studyId),FieldFilters.eq("contentId", contentId));
@@ -116,74 +115,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 +165,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));
-		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;
+		return scItemDao.findList(OrderCondition.desc("lastTime"),FieldFilters.eq("studyId", studyId));
 	}
 
 	@Override
@@ -378,27 +323,9 @@ public class StudyServiceImpl implements IStudyService{
 	}
 
 	// 更新 前端传输已学习时长
-	@Override
-	public void updateLastTime(String studyContentId, int lastStudyTime,String aid) {
-		LocalDateTime now = LocalDateTime.now();
-		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss");
-		String value = lastStudyTime + "&" + now.format(formatter); // 使用ISO8601时间格式
-		log.info("-study-video-time-----value = " + value);
-		// 20250303 优化 多次更新改一次更新
-		// 更新Redis中的最后活跃时间（带30秒过期）
-		redisTemplate.opsForValue().set(
-				"studyContentId:" + studyContentId + ":last_active",
-				value,
-				Duration.ofSeconds(2592000)
-		);
-		log.info("-study-video-time-redis保存---value = " + value);
-//		Duration.ofDays(30)  也就是 2592000秒
-	}
-
 	@Override
 	@Transactional
-	public void updateStudyCourseItemLastTime(String studyContentId, int lastStudyTime,LocalDateTime timestamp) {
-		log.info("-study-video-time-定时---studyContentId = " + studyContentId + ",lastStudyTime = " + lastStudyTime + ", timestamp = " + timestamp);
+	public void updateLastTime(String studyContentId, int lastStudyTime,String aid) {
 		// 更新最后的学习时间点
 		LocalDateTime now=LocalDateTime.now();
 		UpdateBuilder update=UpdateBuilder.from(StudyCourseItem.class);
@@ -406,12 +333,11 @@ public class StudyServiceImpl implements IStudyService{
 		//只记录时间长的时候的处理
 		update.addFilter(FieldFilters.lt("lastStudyTime", lastStudyTime));
 		update.addUpdateField("lastStudyTime", lastStudyTime);
-		update.addUpdateField("lastTime", timestamp==null ? now : timestamp);
+		update.addUpdateField("lastTime", now);
 		scItemDao.update(update.builder());
-		log.info("-study-video-time-mysql保存---studyContentId = " + studyContentId);
+		//增加用户的学习时长,在api中调用
 	}
 
-
 	@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

@@ -1,9 +1,6 @@
 package com.xboe.system.api;
 
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLEncoder;
@@ -14,6 +11,11 @@ import java.util.Set;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import com.xboe.core.SysConstant;
+import com.xboe.standard.BaseConstant;
+import com.xboe.system.assist.entity.XUploadResultDto;
+import it.sauronsoftware.jave.Encoder;
+import it.sauronsoftware.jave.MultimediaInfo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -115,8 +117,23 @@ public class SysUploaderApi  extends ApiBaseController{
 //				ex.printStackTrace();
 				log.error("处理失败",ex);
 			}
-			
-			return wrap(xur);
+			Long ls = 0L;
+			XUploadResultDto dto=new XUploadResultDto();
+			String fileFullPath = SysConstant.getConfigValue(BaseConstant.CONFIG_UPLOAD_FILES_SAVEPATH) + xur.getFilePath();
+			try {
+				Encoder encoder = new Encoder();
+				MultimediaInfo m = encoder.getInfo(new File(fileFullPath));
+				ls = m.getDuration() / 1000;//秒
+			}catch (Exception e){
+				e.printStackTrace();
+				log.error("读取视频时长错误");
+			}
+			dto.setDuration(ls);
+			dto.setDisplayName(xur.getDisplayName());
+			dto.setFilePath(xur.getFilePath());
+			dto.setFileType(xur.getFileType());
+			dto.setHttpPath(xur.getHttpPath());
+			return wrap(dto);
 
 		} catch (Exception e) {
 			log.error("upload file error ",e);

servers/boe-server-all/src/main/java/com/xboe/system/assist/entity/XUploadResultDto.java

@@ -0,0 +1,9 @@
+package com.xboe.system.assist.entity;
+
+import com.xboe.core.upload.XUploadResult;
+import lombok.Data;
+
+@Data
+public class XUploadResultDto extends XUploadResult {
+    private Long duration;
+}

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

@@ -1,105 +1,159 @@
-boe:
-  domain: http://192.168.0.253
 spring:
+  # application.yml
   servlet:
     multipart:
-      max-file-size: 1000MB
-      max-request-size: 1000MB
-  web:
-    resources:
-      static-locations: file:E:/Projects/BOE/java/static
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 192.168.0.253:8848
-      config:
-        server-addr: 192.168.0.253:8848
+      max-file-size: 500MB
+      max-request-size: 500MB
   redis:
     database: 1
-    host: 192.168.0.253
+    host: 192.168.0.101
     password: boe@123
     port: 6379
+    lettuce:
+      pool:
+        max-active: 8
+        min-idle: 0
+        max-idle: 30
+        max-wait: 10000ms
+        shutdown-timeout: 100ms
   jpa:
+    database: MYSQL
+    properties:
+      hibernate:
+        naming_strategy: org.hibernate.cfg.EJB3NamingStrategy
+        dialect: org.hibernate.dialect.MySQL5InnoDBDialect
+        current_session_context_class: org.springframework.orm.hibernate5.SpringSessionContext
+    show-sql: true
     hibernate:
-      ddl-auto: none
+      ddl-auto: update
   datasource:
-    driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://192.168.0.253:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+    driverClassName: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://192.168.0.101:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
     username: root
     password: boe#1234A
-    type: com.zaxxer.hikari.HikariDataSource
-    hikari:
-      auto-commit: true
-      minimum-idle: 5
-      idle-timeout: 60000
-      connection-timeout: 30000
-      max-lifetime: 1800000
-      maximum-pool-size: 20
-logging:
-  level:
-    org:
-      hibernate:
-        SQL: ERROR
-  config: classpath:log/logback-@profileActive@.xml
+  web:
+    resources:
+      static-locations: file:E:/Projects/BOE/10/static
+server:
+  port: 9090
+  servlet:
+    multipart:
+      max-file-size: 500MB
+      max-request-size: 500MB
+    session:
+      timeout: 30m
+    encoding:
+      charset: UTF-8
+      enabled: true
+      force: true
+  tomcat:
+    uri-encoding: UTF-8
+    servlet:
+    multipart:
+      maxFileSize: 1024MB
+      maxRequestSize: 1024MB
+  mvc:
+    static-path-pattern: /cdn/**
+
+#logging.level.org.hibernate.SQL=DEBUG
+#logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
+#logging.config=classpath:log/logback-@profileActive@.xml
+
+# logging:
+#   config: classpath:log/logback-${spring.profiles.active}.xml
+#   level:
+#     org:
+#       hibernate:
+#         SQL: DEBUG
+#         type:
+#           descriptor:
+#             sql:
+#               BasicBinder: TRACE
+
+xcaching:
+  specs:
+    favorites:
+      timeout: 10s
+    praises:
+      timeout: 10s
+    shares:
+      timeout: 10s
+
 xboe:
   api:
     cross_filter: true
+  local:
+    dev: true
   upload:
     file:
-      temp_path: /tmp
+      temp_path: D:/Projects/BOE/10/static/temp
       save_path: /home/www/elearning/upload
-      http_path: http://192.168.0.253/upload
+      http_path: http://127.0.0.1/upload
   externalinterface:
     url:
-      system: http://127.0.0.1:9091
+      system: http://localhost:9091
   old:
     base:
-      url: http://192.168.0.253
+      url: http://192.168.0.101
+  server:
+    userbasic:
+      url: http://192.168.0.101/userbasic
   stat:
     base:
       url: http://127.0.0.1:9080
-  server:
-    userbasic:
-      url: http://192.168.0.253/userbasic
   elasticsearch:
     server:
-      ip: 192.168.0.253
+      ip: 192.168.0.101
       port: 9200
       user:
       password:
   email:
-    url: http://192.168.0.253/api/b1/email/send
+    url: http://192.168.0.101/api/b1/email/send
     from: boeu_learning@boe.com.cn
     user:
     security:
-  jasypt:
-    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
-    admin:
-      addresses: http://192.168.0.253/jobAdmin
-    executor:
-      appname: java-servers-job-api
-      port: 9995
-      address:
-      ip:
-      logpath: /var/log/xxl-job/dw/
-      logretentiondays: 30
-aop-log-record:
-  #是否开启日志记录
-  enabled: true
-  #不进行拦截的包或者类
-  excludeClassNames:
-  activemq:
-    broker-url: tcp://192.168.0.253:61616
-    user: admin
-    password: admin
-  elasticsearch:
-    host: 192.168.0.253
-    port: 9200
+
+jasypt:
+  encryptor:
+    algorithm: PBEWithMD5AndDES
+    iv-generator-classname: org.jasypt.iv.NoIvGenerator
+
+boe:
+  domain: http://127.0.0.1
+
+ok:
+  http:
+    connect-timeout: 30
+    read-timeout: 30
+    write-timeout: 30
+    max-idle-connections: 200
+    keep-alive-duration: 300
+
+
+
+orgTree:
+  orgTreeList: ${boe.domain}/userbasic/org/list
+  orgChildTreeList: ${boe.domain}/userbasic/org/childOrgs
+
+userBasic:
+  searchUserList: ${boe.domain}/userbasic/user/list
+  getUserBasicInfo: ${boe.domain}/userbasic/user/getUserBasicInfo
+  getTeacherIds: ${boe.domain}/userbasic/user/getTeacherInfo
+
+audience:
+  usersByAudienceList: ${boe.domain}/userbasic/audience/memberList
+  getOrgUsers: ${boe.domain}/userbasic/user/getOrgUsers
+
+statApi:
+  userdynamicList: ${boe.domain}/statApi/xboe/m/stat/userdynamic/list
+
+infrasApi:
+  dict: ${boe.domain}/infrasApi/dict/list
+
+manageApi:
+  stu:
+    offcourse: ${boe.domain}/manageApi/stu/offcourse/getOffCourseId
+  editExam: ${boe.domain}/manageApi/admin/project/editExam
+  getStudyStatus: ${boe.domain}/manageApi/stu/project/completeStatus
+coursesuilt:
+  getStudyStatus: ${boe.domain}/manageApi/stu/project/completeStatus

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

@@ -1,183 +0,0 @@
-spring:
-  # application.yml
-  servlet:
-    multipart:
-      max-file-size: 1000MB
-      max-request-size: 1000MB
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 10.251.129.51:8848
-      config:
-        server-addr: 10.251.129.51:8848
-  redis:
-    database: 1
-    host: 10.251.129.122
-    password: qwert!W588
-    port: 6379
-    lettuce:
-      pool:
-        max-active: 8
-        min-idle: 0
-        max-idle: 30
-        max-wait: 10000ms
-        shutdown-timeout: 100ms
-  jpa:
-    database: MYSQL
-    properties:
-      hibernate:
-        naming_strategy: org.hibernate.cfg.EJB3NamingStrategy
-        dialect: org.hibernate.dialect.MySQL5InnoDBDialect
-        current_session_context_class: org.springframework.orm.hibernate5.SpringSessionContext
-    show-sql: true
-    hibernate:
-      ddl-auto: update
-  datasource:
-    driverClassName: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://10.251.129.126:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
-    username: admin
-    password: boeRds01
-  web:
-    resources:
-      static-locations: file:E:/Projects/BOE/10/static
-server:
-  port: 9090
-  tomcat:
-    uri-encoding: UTF-8
-    servlet:
-    multipart:
-      maxFileSize: 1024MB
-      maxRequestSize: 1024MB
-  mvc:
-    static-path-pattern: /cdn/**
-
-#logging.level.org.hibernate.SQL=DEBUG
-#logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
-#logging.config=classpath:log/logback-@profileActive@.xml
-
-# logging:
-#   config: classpath:log/logback-${spring.profiles.active}.xml
-#   level:
-#     org:
-#       hibernate:
-#         SQL: DEBUG
-#         type:
-#           descriptor:
-#             sql:
-#               BasicBinder: TRACE
-
-xcaching:
-  specs:
-    favorites:
-      timeout: 10s
-    praises:
-      timeout: 10s
-    shares:
-      timeout: 10s
-
-xboe:
-  api:
-    cross_filter: true
-  local:
-    dev: true
-  upload:
-    file:
-      temp_path: /tmp
-      save_path: /home/www/elearning/upload
-      http_path: http://10.251.132.75/upload
-  externalinterface:
-    url:
-      system: http://localhost:9091
-  old:
-    base:
-      url: http://10.251.132.75
-  server:
-    userbasic:
-      url: http://10.251.132.75/userbasic
-  stat:
-    base:
-      url: http://10.251.132.75:9080
-  elasticsearch:
-    server:
-      ip: 10.251.129.21
-      port: 9200
-      user:
-      password:
-  email:
-    url: http://10.251.132.75/api/b1/email/send
-    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
-    iv-generator-classname: org.jasypt.iv.NoIvGenerator
-
-boe:
-  domain: http://10.251.132.75
-
-ok:
-  http:
-    connect-timeout: 30
-    read-timeout: 30
-    write-timeout: 30
-    max-idle-connections: 200
-    keep-alive-duration: 300
-
-
-
-orgTree:
-  orgTreeList: ${boe.domain}/userbasic/org/list
-  orgChildTreeList: ${boe.domain}/userbasic/org/childOrgs
-
-userBasic:
-  searchUserList: ${boe.domain}/userbasic/user/list
-  getUserBasicInfo: ${boe.domain}/userbasic/user/getUserBasicInfo
-  getTeacherIds: ${boe.domain}/userbasic/user/getTeacherInfo
-
-audience:
-  usersByAudienceList: ${boe.domain}/userbasic/audience/memberList
-  getOrgUsers: ${boe.domain}/userbasic/user/getOrgUsers
-
-statApi:
-  userdynamicList: ${boe.domain}/statApi/xboe/m/stat/userdynamic/list
-
-infrasApi:
-  dict: ${boe.domain}/infrasApi/dict/list
-
-manageApi:
-  stu:
-    offcourse: ${boe.domain}/manageApi/stu/offcourse/getOffCourseId
-  editExam: ${boe.domain}/manageApi/admin/project/editExam
-  getStudyStatus: ${boe.domain}/manageApi/stu/project/completeStatus
-coursesuilt:
-  getStudyStatus: ${boe.domain}/manageApi/stu/project/completeStatus
-
-xxl:
-  job:
-    admin:
-      addresses: http://10.251.132.75/jobAdmin
-    accessToken: 65ddc683-22f5-83b4-de3a-3c97a0a29af0
-    executor:
-      appname: java-servers-job-api
-      port: 9995
-      address:
-      ip:
-      logpath: /var/log/xxl-job/system/
-      logretentiondays: 30
-
-aop-log-record:
-  #是否开启日志记录
-  enabled: true
-  #不进行拦截的包或者类
-  excludeClassNames:
-  activemq:
-    broker-url: tcp://10.251.129.51:61616
-    user: admin
-    password: admin
-  elasticsearch:
-    host: 10.251.129.21
-    port: 9200

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

@@ -1,103 +0,0 @@
-spring:
-  servlet:
-    multipart:
-      max-file-size: 1000MB
-      max-request-size: 1000MB
-  web:
-    resources:
-      static-locations: file:E:/Projects/BOE/java/static
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 10.251.113.100:8848
-      config:
-        server-addr: 10.251.113.100:8848
-  redis:
-    database: 1
-    host: 10.251.88.213
-    password: qwert!W588
-    port: 6379
-  jpa:
-    hibernate:
-      ddl-auto: none
-  datasource:
-    driverClassName: com.mysql.jdbc.Driver
-    url: jdbc:mysql://10.251.88.216:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
-    username: admin
-    password: boeRds01
-    type: com.zaxxer.hikari.HikariDataSource
-    hikari:
-      auto-commit: true
-      minimum-idle: 5
-      idle-timeout: 60000
-      connection-timeout: 30000
-      max-lifetime: 1800000
-      maximum-pool-size: 20
-logging:
-  level:
-    org:
-      hibernate:
-        SQL: ERROR
-  config: classpath:log/logback-@profileActive@.xml
-xboe:
-  api:
-    cross_filter: true
-  upload:
-    file:
-      temp_path: /tmp
-      save_path: /home/www/elearning/upload
-      http_path: https://u.boe.com/upload
-  externalinterface:
-    url:
-      system: http://127.0.0.1:9091
-  old:
-    base:
-      url: https://u.boe.com
-  stat:
-    base:
-      url: http://127.0.0.1:9080
-  server:
-    userbasic:
-      url: https://u.boe.com/userbasic
-  elasticsearch:
-    server:
-      ip: 10.251.88.218
-      port: 9200
-      user:
-      password:
-  email:
-    url: https://u.boe.com/api/b1/email/send
-    from: boeu_learning@boe.com.cn
-    user:
-    security:
-  jasypt:
-    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
-    admin:
-      addresses: http://u.boe.com/jobAdmin
-    executor:
-      appname: java-servers-job-api
-      port: 9995
-      address:
-      ip:
-      logpath: /var/log/xxl-job/dw/
-      logretentiondays: 30
-aop-log-record:
-  #是否开启日志记录
-  enabled: true
-  #不进行拦截的包或者类
-  excludeClassNames:
-  activemq:
-    broker-url: tcp://10.251.113.100:61616
-    user: admin
-    password: admin
-  elasticsearch:
-    host: 10.251.88.218
-    port: 9200

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

@@ -2,17 +2,11 @@ spring:
   # application.yml
   servlet:
     multipart:
-      max-file-size: 1000MB
-      max-request-size: 1000MB
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 10.251.186.27:8848
-      config:
-        server-addr: 10.251.186.27:8848
+      max-file-size: 500MB
+      max-request-size: 500MB
   redis:
     database: 1
-    host: 10.251.160.38
+    host: 10.251.186.27
     password: qwert!W577
     port: 6379
     lettuce:
@@ -42,6 +36,16 @@ spring:
       static-locations: file:E:/Projects/BOE/10/static
 server:
   port: 9090
+  servlet:
+    multipart:
+      max-file-size: 500MB
+      max-request-size: 500MB
+    session:
+      timeout: 30m
+    encoding:
+      charset: UTF-8
+      enabled: true
+      force: true
   tomcat:
     uri-encoding: UTF-8
     servlet:
@@ -82,42 +86,40 @@ xboe:
     dev: true
   upload:
     file:
-      temp_path: /tmp
+      temp_path: /Projects/BOE/10/static/temp
       save_path: /home/www/elearning/upload
-      http_path: https://u-pre.boe.com/upload
+      http_path: http://127.0.0.1/upload
   externalinterface:
     url:
       system: http://localhost:9091
   old:
     base:
-      url: http://10.251.186.27
+      url: http://localhost
   server:
     userbasic:
-      url: http://10.251.186.27/userbasic
+      url: http://localhost/userbasic
   stat:
     base:
-      url: http://10.251.186.27:9080
+      url: http://localhost:9080
   elasticsearch:
     server:
       ip: 10.251.129.25
       port: 9200
-      user: elastic
-      password: Boe@es123
+      user:
+      password:
   email:
-    url: http://10.251.186.27/api/b1/email/send
+    url: http://localhost/api/b1/email/send
     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
     iv-generator-classname: org.jasypt.iv.NoIvGenerator
 
 boe:
-  domain: http://10.251.186.27
+  domain: http://127.0.0.1
 
 ok:
   http:
@@ -154,32 +156,4 @@ manageApi:
   editExam: ${boe.domain}/manageApi/admin/project/editExam
   getStudyStatus: ${boe.domain}/manageApi/stu/project/completeStatus
 coursesuilt:
-  getStudyStatus: ${boe.domain}/manageApi/stu/project/completeStatus
-
-xxl:
-  job:
-    admin:
-      addresses: http://10.251.186.27/jobAdmin
-    accessToken: 65ddc683-22f5-83b4-de3a-3c97a0a29af0
-    executor:
-      appname: java-servers-job-api
-      port: 9995
-      address:
-      ip:
-      logpath: /var/log/xxl-job/system/
-      logretentiondays: 30
-
-aop-log-record:
-  #是否开启日志记录
-  enabled: true
-  #不进行拦截的包或者类
-  excludeClassNames:
-  activemq:
-    broker-url: tcp://10.251.129.25:61616
-    user: admin
-    password: admin
-  elasticsearch:
-    host: 10.251.129.25
-    port: 9200
-    user: elastic
-    password: Boe@es123
+  getStudyStatus: ${boe.domain}/manageApi/stu/project/completeStatus

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

@@ -1,35 +1,41 @@
 spring:
-  profiles:
-    active: dev
-  application:
-    name: boe-server-all
+  # application.yml
+  servlet:
+    multipart:
+      max-file-size: 500MB
+      max-request-size: 500MB
   redis:
+    database: 1
+    host: 10.251.186.27
+    password: qwert!W577
+    port: 6379
     lettuce:
       pool:
         max-active: 8
         min-idle: 0
         max-idle: 30
         max-wait: 10000ms
-      shutdown-timeout: 100ms
-  jackson:
-    time-zone: GMT+8
-  mvc:
-    static-path-pattern: /cdn/**
+        shutdown-timeout: 100ms
   jpa:
     database: MYSQL
-    show-sql: false
     properties:
       hibernate:
         naming_strategy: org.hibernate.cfg.EJB3NamingStrategy
         dialect: org.hibernate.dialect.MySQL5InnoDBDialect
         current_session_context_class: org.springframework.orm.hibernate5.SpringSessionContext
-    database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
-logging:
-  config: classpath:log/logback-${spring.profiles.active}.xml
+    show-sql: true
+    hibernate:
+      ddl-auto: update
+  datasource:
+    driverClassName: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://10.251.160.40:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+    username: admin
+    password: boeRds01
+  web:
+    resources:
+      static-locations: file:E:/Projects/BOE/10/static
 server:
   port: 9090
-  tomcat:
-    uri-encoding: UTF-8
   servlet:
     multipart:
       max-file-size: 500MB
@@ -40,6 +46,80 @@ server:
       charset: UTF-8
       enabled: true
       force: true
+  tomcat:
+    uri-encoding: UTF-8
+    servlet:
+    multipart:
+      maxFileSize: 1024MB
+      maxRequestSize: 1024MB
+  mvc:
+    static-path-pattern: /cdn/**
+
+#logging.level.org.hibernate.SQL=DEBUG
+#logging.level.org.hibernate.type.descriptor.sql.BasicBinder=TRACE
+#logging.config=classpath:log/logback-@profileActive@.xml
+
+# logging:
+#   config: classpath:log/logback-${spring.profiles.active}.xml
+#   level:
+#     org:
+#       hibernate:
+#         SQL: DEBUG
+#         type:
+#           descriptor:
+#             sql:
+#               BasicBinder: TRACE
+
+xcaching:
+  specs:
+    favorites:
+      timeout: 10s
+    praises:
+      timeout: 10s
+    shares:
+      timeout: 10s
+
+xboe:
+  api:
+    cross_filter: true
+  local:
+    dev: true
+  upload:
+    file:
+      temp_path: /Projects/BOE/10/static/temp
+      save_path: /home/www/elearning/upload
+      http_path: http://127.0.0.1/upload
+  externalinterface:
+    url:
+      system: http://localhost:9091
+  old:
+    base:
+      url: http://localhost
+  server:
+    userbasic:
+      url: http://localhost/userbasic
+  stat:
+    base:
+      url: http://localhost:9080
+  elasticsearch:
+    server:
+      ip: 10.251.129.25
+      port: 9200
+      user:
+      password:
+  email:
+    url: http://localhost/api/b1/email/send
+    from: boeu_learning@boe.com.cn
+    user:
+    security:
+
+jasypt:
+  encryptor:
+    algorithm: PBEWithMD5AndDES
+    iv-generator-classname: org.jasypt.iv.NoIvGenerator
+
+boe:
+  domain: http://127.0.0.1
 
 ok:
   http:
@@ -48,30 +128,32 @@ ok:
     write-timeout: 30
     max-idle-connections: 200
     keep-alive-duration: 300
-boe:
-  domain: http://127.0.0.1
+
+
+
 orgTree:
   orgTreeList: ${boe.domain}/userbasic/org/list
   orgChildTreeList: ${boe.domain}/userbasic/org/childOrgs
+
 userBasic:
   searchUserList: ${boe.domain}/userbasic/user/list
-  getTeacherIds: ${boe.domain}/userbasic/user/getTeacherInfo
   getUserBasicInfo: ${boe.domain}/userbasic/user/getUserBasicInfo
+  getTeacherIds: ${boe.domain}/userbasic/user/getTeacherInfo
+
 audience:
   usersByAudienceList: ${boe.domain}/userbasic/audience/memberList
   getOrgUsers: ${boe.domain}/userbasic/user/getOrgUsers
+
 statApi:
   userdynamicList: ${boe.domain}/statApi/xboe/m/stat/userdynamic/list
+
 infrasApi:
   dict: ${boe.domain}/infrasApi/dict/list
+
 manageApi:
   stu:
     offcourse: ${boe.domain}/manageApi/stu/offcourse/getOffCourseId
   editExam: ${boe.domain}/manageApi/admin/project/editExam
-coursesuilt:
   getStudyStatus: ${boe.domain}/manageApi/stu/project/completeStatus
-  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
-  delOnLineById: ${boe.domain}/manageApi/admin/teacherRecord/delOnLineById
+coursesuilt:
+  getStudyStatus: ${boe.domain}/manageApi/stu/project/completeStatus

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

@@ -0,0 +1,24 @@
+spring:
+  application:
+    name: boe-server-all
+#  profiles:
+#    active: test
+  cloud:
+    nacos:
+      discovery:
+        server-addr: 10.251.186.27:8848
+      config:
+        server-addr: 10.251.186.27:8848
+#        file-extension: yaml
+#        namespace: fd5741ee-c2aa-4002-a9b0-43a11436d35c
+#        name: boe-server-all
+#        group: SERVER_GROUP
+#        extension-configs:
+#          - data-id: redis0.yaml
+#            group: COMMON_GROUP
+#            refresh: true
+
+#        shared-configs:
+#          - data-id: redis0.yaml
+#            group: COMMON_GROUP
+#            refresh: true

servers/boe-server-all/src/main/resources/log/logback-pre.xml

@@ -52,7 +52,4 @@
         <appender-ref ref="debug"/>
         <appender-ref ref="error"/>
     </root>
-    <root level="INFO">
-        <appender-ref ref="console"/>
-    </root>
 </configuration>

servers/boe-server-all/src/main/resources/log/logback-pro.xml

@@ -50,7 +50,6 @@
     <!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
     <root level="INFO">
         <appender-ref ref="info"/>
-        <appender-ref ref="console"/>
        <!-- <appender-ref ref="error"/> --> 
     </root>
 </configuration>

servers/boe-server-all/src/main/resources/log/logback-prod.xml

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration debug="false" scan="false">
-    <springProperty scop="context" name="spring.application.name" source="spring.application.name" defaultValue=""/>
-    <property name="log.path" value="/home/logs/${spring.application.name}"/>
-    <!-- 彩色日志格式 -->
-    <property name="CONSOLE_LOG_PATTERN"
-              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
-    <!-- 彩色日志依赖的渲染类 -->
-    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
-    <conversionRule conversionWord="wex"
-                    converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
-    <conversionRule conversionWord="wEx"
-                    converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
-    <!-- Console log output -->
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
-        </encoder>
-    </appender>
-
-    <!-- Log file debug output -->
-    <appender name="info" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/debug.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
-            <maxFileSize>50MB</maxFileSize>
-            <maxHistory>30</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
-        </encoder>
-    </appender>
-
-    <!-- Log file error output -->
-    <appender name="error" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/error.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
-            <maxFileSize>50MB</maxFileSize>
-            <maxHistory>30</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>ERROR</level>
-        </filter>
-    </appender>
-
-    <!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
-    <root level="INFO">
-        <appender-ref ref="info"/>
-<!--        <appender-ref ref="console"/>-->
-       <!-- <appender-ref ref="error"/> --> 
-    </root>
-</configuration>

servers/boe-server-all/src/main/resources/log/logback-test.xml

@@ -51,6 +51,5 @@
     <root level="INFO">
         <appender-ref ref="debug"/>
         <appender-ref ref="error"/>
-        <appender-ref ref="console"/>
     </root>
 </configuration>

servers/boe-server-basic/pom.xml

@@ -98,7 +98,7 @@
                 <filtering>true</filtering>
                 <directory>src/main/resources</directory>
                 <includes>
-                    <include>application-*.yml</include>
+                    <include>application-${profileActive}.yml</include>
                     <include>application.yml</include>
                 </includes>
             </resource>
@@ -136,9 +136,9 @@
     </build>
     <profiles>
         <profile>
-            <id>prod</id>
+            <id>pro</id>
             <properties>
-                <profileActive>prod</profileActive>
+                <profileActive>pro</profileActive>
             </properties>
         </profile>
         <profile>

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

@@ -1,13 +1,13 @@
-# application-pro.yml
+# application-dev.yml
 spring:
   redis:
-    database: 1
-    host: 192.168.0.253
-    password: boe@123
+    database: 2
     port: 6379
+    host: 192.168.0.101
+    password: boe@123
   jpa:
     hibernate:
-      ddl-auto: update
+      ddl-auto: none
     open-in-view: false
     properties:
       hibernate:
@@ -16,46 +16,41 @@ spring:
     driverClassName: com.mysql.jdbc.Driver
     db1:
       driverClassName: com.mysql.jdbc.Driver
-      jdbc-url: jdbc:mysql://192.168.0.253:3306/boe_basic?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+      jdbc-url: jdbc:mysql://192.168.0.101:3306/boe_basic?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
       username: root
       password: boe#1234A
     db2:
       driverClassName: com.mysql.jdbc.Driver
-      jdbc-url: jdbc:mysql://192.168.0.253:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
+      jdbc-url: jdbc:mysql://192.168.0.101:3306/boe_base?useSSL=false&useUnicode=true&characterEncoding=UTF8&zeroDateTimeBehavior=convertToNull
       username: root
       password: boe#1234A
-
-  web:
-    resources:
-      static-locations: file:E:/Projects/BOE/java/static
+    web:
+      resources:
+        static-locations: file:E:/Projects/BOE/java/static
 
 logging:
   level:
     org:
       hibernate:
-        SQL: ERROR
-        # type:
-        #   descriptor:
-        #     sql:
-        #       BasicBinder: TRACE
+        SQL: DEBUG
+        type:
+          descriptor:
+            sql:
+              BasicBinder: TRACE
   config: classpath:log/logback-dev.xml
 
-
-
 xboe:
-  api:
-    cross_filter: true
   upload:
     file:
-      temp_path: /tmp
-      save_path: /home/www/elearning/upload
-      http_path: http://192.168.0.253/upload
+      temp_path: E:/Projects/BOE/java/static/temp
+      save_path: E:/Projects/BOE/java/static/upload
+      http_path: http://localhost:9090/upload
   inner:
     data:
       sync:
-        baseurl: http://127.0.0.1:9090
+        baseurl: http://localhost:9090
 
 jasypt:
   encryptor:
     algorithm: PBEWithMD5AndDES
-    iv-generator-classname: org.jasypt.iv.NoIvGenerator
+    iv-generator-classname: org.jasypt.iv.NoIvGenerator

servers/boe-server-basic/src/main/resources/application-pro.yml

@@ -1,7 +1,9 @@
 # application-pro.yml
 spring:
+  profiles:
+    active: pro
   redis:
-    database: 1
+    database: 3
     host: 10.251.88.213
     password: qwert!W588
     port: 6379

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

@@ -1,7 +1,7 @@
 # application.yml
 spring:
   profiles:
-    active: dev
+    active: @profileActive@
   application:
     name: boe-server-basic
   jackson:
@@ -62,4 +62,4 @@ ok:
 
 # 设置logback.xml位置
 logging:
-  config: classpath:log/logback-${spring.profiles.active}.xml
+  config: classpath:log/logback-@profileActive@.xml

servers/boe-server-basic/src/main/resources/log/logback-prod.xml

@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration debug="false" scan="false">
-    <springProperty scop="context" name="spring.application.name" source="spring.application.name" defaultValue=""/>
-    <property name="log.path" value="/home/logs/${spring.application.name}"/>
-    <!-- 彩色日志格式 -->
-    <property name="CONSOLE_LOG_PATTERN"
-              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
-    <!-- 彩色日志依赖的渲染类 -->
-    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
-    <conversionRule conversionWord="wex"
-                    converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
-    <conversionRule conversionWord="wEx"
-                    converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
-    <!-- Console log output -->
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
-        </encoder>
-    </appender>
-
-    <!-- Log file debug output -->
-    <appender name="debug" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/debug.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${log.path}/%d{yyyy-MM, aux}/debug.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
-            <maxFileSize>50MB</maxFileSize>
-            <maxHistory>30</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
-        </encoder>
-    </appender>
-
-    <!-- Log file error output -->
-    <appender name="error" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/error.log</file>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${log.path}/%d{yyyy-MM}/error.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
-            <maxFileSize>50MB</maxFileSize>
-            <maxHistory>30</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>%date [%thread] %-5level [%logger{50}] %file:%line - %msg%n</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>ERROR</level>
-        </filter>
-    </appender>
-
-    <!-- Level: FATAL 0  ERROR 3  WARN 4  INFO 6  DEBUG 7 -->
-    <root level="WARN">
-        <appender-ref ref="debug"/>
-        <appender-ref ref="error"/>
-    </root>
-</configuration>