标签管理切换绑定的业务

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

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

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

@@ -10,7 +10,6 @@ import javax.servlet.http.HttpServletRequest;
 import com.xboe.api.ThirdApi;
 import com.xboe.module.course.dto.CourseParam;
 import org.apache.commons.lang3.StringUtils;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -322,7 +321,6 @@ public class CourseAuditApi  extends ApiBaseController{
 	 * @return
 	 */
 	@PostMapping("/hrbp-submit-audit")
-    @Transactional(rollbackFor = Exception.class)
 	public JsonResponse<Boolean> hrbpAudit(String auditId,String courseId,String title,Boolean pass,String remark, HttpServletRequest request){
 		if(StringUtils.isBlank(auditId)){
 			return badRequest("参数错误");
@@ -352,19 +350,22 @@ public class CourseAuditApi  extends ApiBaseController{
 			}
 		}
 		
-        CurrentUser cu=getCurrent();
-        service.hrbpSubmitAudit(auditId, courseId,open, pass,cu.getAccountId(),cu.getName(), remark);
+		try {
+			CurrentUser cu=getCurrent();
+			service.hrbpSubmitAudit(auditId, courseId,open, pass,cu.getAccountId(),cu.getName(), remark);
 
-        if (pass){
-            //修改在线课开课状态=已开课
-            String token = request.getHeader("Xboe-Access-Token");
-            CourseParam param = new CourseParam();
-            param.setId(courseId);
-            param.setOrgId(c.getOrgId());
-            param.setOrgName(c.getOrgName());
-            thirdApi.updateOrSaveCourse(param,token);
-        }
-        return success(true);
+			if (pass){
+				//修改在线课开课状态=已开课
+				String token = request.getHeader("Xboe-Access-Token");
+				CourseParam param = new CourseParam();
+				param.setId(courseId);
+				thirdApi.updateOnLineStatua(param,token);
+			}
+			return success(true);
+		} catch (Exception e) {
+			log.error("HRBP审核提交处理错误",e);
+			return error("审核处理失败",e.getMessage(),false);
+		}
 	}
 	
 	@PostMapping("/last-audit-list")
@@ -389,7 +390,6 @@ public class CourseAuditApi  extends ApiBaseController{
 	 * @param dto
 	 * @return
 	 */
-    @Transactional(rollbackFor = Exception.class)
 	@PostMapping("/submit-publish")
 	@AutoLog(module = "课程",action = "默认管理员提交发布",info = "")
 	public JsonResponse<Boolean> submitAndPublish(@RequestBody CourseFullDto dto, HttpServletRequest request){
@@ -423,16 +423,23 @@ public class CourseAuditApi  extends ApiBaseController{
 		dto.getCourse().setStatus(Course.STATUS_AUDIT_FINISH);//设置为审核通过状态
 		dto.getCourse().setEnabled(true);//设置启用状态问题
 		dto.getCourse().setPublished(false);//重新提交审核设置为未发布状态
+		try {
 
-        courseService.submitAndPublish(dto,cuser.getAccountId(),cuser.getName());
-        log.info("---------------在线课开始同步到讲师管理 ------- token = " + token);
-        CourseParam param = new CourseParam();
-        param.setId(dto.getCourse().getId());
-        param.setOrgId(dto.getCourse().getOrgId());
-        param.setOrgName(dto.getCourse().getOrgName());
-        thirdApi.updateOrSaveCourse(param,token);
-        log.info("---------------在线课同步到讲师管理完毕 -------");
-        return success(true);
+			courseService.submitAndPublish(dto,cuser.getAccountId(),cuser.getName());
+			log.info("---------------在线课开始同步到讲师管理 ------- token = " + token);
+			CourseParam param = new CourseParam();
+			param.setId(dto.getCourse().getId());
+			param.setOrgId(dto.getCourse().getOrgId());
+			param.setOrgName(dto.getCourse().getOrgName());
+			thirdApi.updateOrSaveCourse(param,token);
+			log.info("---------------在线课同步到讲师管理完毕 -------");
+			return success(true);
+		} catch (Exception e) {
+			log.error("默认管理员提交直接发布处理失败",e);
+			e.printStackTrace();
+			return error("发布课程失败",e.getMessage());
+		}
+		
 	}
 
 	

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

@@ -12,6 +12,8 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.xboe.api.ThirdApi;
 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;
@@ -34,11 +36,6 @@ 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,7 +60,8 @@ public class CourseFullTextApi  extends ApiBaseController{
 	ICourseFullTextSearch fullTextSearch;
 	@Resource
 	IOrganizationService organizationService;
-
+	@Autowired
+	ICourseTagService courseTagService;
 	@Resource
 	IStudyCourseService IStudyCourseService;
 
@@ -310,7 +308,18 @@ public class CourseFullTextApi  extends ApiBaseController{
 		}
 
 		paras.setDevice(dto.getDevice());
-
+		String tagIds = dto.getTags();
+		if (tagIds != null && tagIds != ""){
+			paras.setTags(tagIds);
+		}else {
+			String tagName = paras.getKeywords();
+			if (tagName != null && tagName != ""){
+				CourseTag courseTag = courseTagService.getTagByName(tagName);
+				if (courseTag != null){
+					paras.setTags(courseTag.getId().toString()+",");
+				}
+			}
+		}
 		try {
 			//后续会根据当前用户的资源归属查询
 			PageList<CourseFullText> coursePageList = fullTextSearch.search(ICourseFullTextSearch.DEFAULT_INDEX_NAME,pager.getStartRow(), pager.getPageSize(),paras);
@@ -403,8 +412,24 @@ public class CourseFullTextApi  extends ApiBaseController{
 					}
 				}
 			}
-
-
+			// 获取课程对应的标签
+			for (CourseFullText c : coursePageList.getList()){
+				String tags = c.getTags();
+				String[] split = tags.split(",",0);
+				List<String> courseTagIds = new ArrayList<>();
+				for (String tagId : split) {
+					courseTagIds.add(tagId);
+				}
+				List<CourseTag> courseTags = courseTagService.getTagsByTagIds(courseTagIds);
+				List<Map<String,Object>> tagList = new ArrayList<>();
+				for (CourseTag courseTag : courseTags) {
+					Map<String,Object> tag = new HashMap<>();
+					tag.put("tagName", courseTag.getTagName());
+					tag.put("id", courseTag.getId());
+					tagList.add(tag);
+				}
+				c.setTagList(tagList);
+			}
 			return success(coursePageList);
 		}catch(Exception e) {
 			log.error("课程全文检索错误",e);

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

@@ -2,19 +2,17 @@
 
 import java.io.OutputStream;
 import java.util.*;
-import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.boe.feign.api.infrastructure.entity.CommonSearchVo;
-import com.boe.feign.api.infrastructure.entity.Dict;
 import com.xboe.api.ThirdApi;
 import com.xboe.module.course.dto.*;
+import 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.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -32,19 +30,6 @@ 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;
@@ -95,10 +80,10 @@ public class CourseManageApi extends ApiBaseController{
 	
 	@Resource
 	private ICourseHRBPAuditService hrbpAuditService;
-	
+	@Resource
+	private ICourseTagService tagService;
 	@Resource
 	IOutSideDataService outSideDataService;
-	
 	@Autowired
     IDataUserSyncService userSyncService;
 	@Resource
@@ -173,48 +158,23 @@ public class CourseManageApi extends ApiBaseController{
 		List<CourseSection> sectionlist=sectionService.getByCourseId(id);
 		List<CourseTeacher> teachers=courseService.findTeachersByCourseId(id);
 		List<CourseCrowd> crowds=courseService.findCrowdByCourseId(id);
-
-        CommonSearchVo searcher = new CommonSearchVo();
-        searcher.setPid(637L);
-        searcher.setType(1);
-		List<Dict> dictList = thirdApi.getDictItems(searcher);
-		boolean isPermission = false;
-        if(dictList != null && dictList.size() > 0){
-			List<String> dicts =  dictList.stream().map(Dict::getValue).collect(Collectors.toList());
-			isPermission = dicts.contains(course.getOrgId());
-			rs.put("dicts",dicts);
+		if (StringUtils.isNotBlank(course.getTags())){
+			List<CourseTag> tagList = tagService.getTagsByIds(course.getTags());
+			rs.put("tagList", tagList);
 		}
-		log.error("-------是否仅内网查看 = " + isPermission);
+
+
 		rs.put("course",course);
 		rs.put("contents",cclist);
 		rs.put("sections",sectionlist);
 		rs.put("teachers",teachers);
 		rs.put("crowds",crowds);
-		rs.put("isPermission",isPermission);
-
 
 		
 		return success(rs);
 		
 	}
-	@GetMapping("/getDictIds")
-	public JsonResponse<Map<String,Object>> getDictIds(Long pid,Integer type){
-		CommonSearchVo searcher = new CommonSearchVo();
-		if(pid==null || type ==null){
-			return badRequest("参数错误");
-		}
-		Map<String,Object> rs=new HashMap<String,Object>();
-		searcher.setPid(pid);
-		searcher.setType(type);
-		List<Dict> dictList = thirdApi.getDictItems(searcher);
-		rs.put("dicts",null);
-		if(dictList != null && dictList.size() > 0){
-			List<String> dicts =  dictList.stream().map(Dict::getValue).collect(Collectors.toList());
-			rs.put("dicts",dicts);
-		}
-		return success(rs);
-	}
-
+	
 	/**
 	 * 管理员审核列表，教师的审核不在这里，此审核也应该移动CourseAuditApi中去
 	 * @param pager
@@ -301,7 +261,6 @@ public class CourseManageApi extends ApiBaseController{
 	 * @return
 	 */
 	@PostMapping("/save")
-    @Transactional(rollbackFor = Exception.class)
 	@AutoLog(module = "课程",action = "保存课程基本信息",info = "")
 	public JsonResponse<CourseFullDto> saveCourseFull(@RequestBody CourseFullDto dto, HttpServletRequest request){
 		if(dto.getCourse()==null){
@@ -323,25 +282,30 @@ public class CourseManageApi extends ApiBaseController{
 		}
 		
 		//填充必要的信息
-        if(StringUtils.isBlank(dto.getCourse().getId())) {
-            //只有在第一次添加保存时才会这样
-            fillCourseData(dto.getCourse());
-            courseService.save(dto);
-        }else {
-            //修改后重置，重新提交审核，重新发布
-            dto.getCourse().setPublished(false);
-            dto.getCourse().setStatus(Course.STATUS_NONE);
-            courseService.update(dto);
-        }
-        String token = request.getHeader("Xboe-Access-Token");
-        log.info("---------------在线课开始同步到讲师管理 ------- token = " + token);
-        CourseParam param = new CourseParam();
-        param.setId(dto.getCourse().getId());
-        param.setOrgId(dto.getCourse().getOrgId());
-        param.setOrgName(dto.getCourse().getOrgName());
-        thirdApi.updateOrSaveCourse(param,token);
-        log.info("---------------在线课同步到讲师管理完毕 -------");
-        return success(dto);
+		try {
+			if(StringUtils.isBlank(dto.getCourse().getId())) {
+				//只有在第一次添加保存时才会这样
+				fillCourseData(dto.getCourse());
+				courseService.save(dto);
+			}else {
+				//修改后重置，重新提交审核，重新发布
+				dto.getCourse().setPublished(false);
+				dto.getCourse().setStatus(Course.STATUS_NONE);
+				courseService.update(dto);
+			}
+			String token = request.getHeader("Xboe-Access-Token");
+			log.info("---------------在线课开始同步到讲师管理 ------- token = " + token);
+			CourseParam param = new CourseParam();
+			param.setId(dto.getCourse().getId());
+			param.setOrgId(dto.getCourse().getOrgId());
+			param.setOrgName(dto.getCourse().getOrgName());
+			thirdApi.updateOrSaveCourse(param,token);
+			log.info("---------------在线课同步到讲师管理完毕 -------");
+			return success(dto);
+		} catch (Exception e) {
+			log.error("整体保存课程信息错误",e);
+			return error("保存失败",e.getMessage());
+		}
 	}
 	
 	/***
@@ -440,7 +404,6 @@ public class CourseManageApi extends ApiBaseController{
 	
 
 	@PostMapping("/submit")
-    @Transactional(rollbackFor = Exception.class)
 	@AutoLog(module = "课程",action = "提交课程",info = "")
 	public JsonResponse<CourseFullDto> submitCourseFull(@RequestBody CourseFullDto dto){
 		if(dto.getCourse()==null){
@@ -518,63 +481,68 @@ public class CourseManageApi extends ApiBaseController{
 		//检查课程内容的完整性	
 		//填充必要的信息
 		//fillCourseData(dto.getCourse());
-        CourseHRBPAudit hrbpAudit = hrbpAuditService.hasAuditing(dto.getCourse().getId());
-        if(hrbpAudit!=null) {
-            return badRequest("此课程中已有审核，不能再提交审核，如修改请先撤回");
-        }
-        if(!isLocalDevelopment()) {
-            if(StringUtils.isBlank(dto.getAuditUser().getAid())) {
+		try {
+			CourseHRBPAudit hrbpAudit = hrbpAuditService.hasAuditing(dto.getCourse().getId());
+			if(hrbpAudit!=null) {
+				return badRequest("此课程中已有审核，不能再提交审核，如修改请先撤回");
+			}
+			if(!isLocalDevelopment()) {
+				if(StringUtils.isBlank(dto.getAuditUser().getAid())) {
 //					if(StringUtils.isBlank(dto.getAuditUser().getKid())) {
 //						return badRequest("HRBP审核信息人员错误");
 //					}
-                //转化用户id
-                User u = userService.getByUserNo(dto.getAuditUser().getCode());
-                if(u==null) { //本地没有，需要同步、
-                    //20230815 直接返回错误，这个时候传的用户，在新系统中没有，需要用户登录一下，或着用户中心推送
-                    return badRequest("无关联HRBP审核人员，请先同步用户");
-                    //Organization org = orgService.getBySysId(dto.getAuditUser().getOrgkid());
+					//转化用户id
+					User u = userService.getByUserNo(dto.getAuditUser().getCode());
+					if(u==null) { //本地没有，需要同步、
+						//20230815 直接返回错误，这个时候传的用户，在新系统中没有，需要用户登录一下，或着用户中心推送
+						return badRequest("无关联HRBP审核人员，请先同步用户");
+						//Organization org = orgService.getBySysId(dto.getAuditUser().getOrgkid());
 //						UserVo fwUser = fwUserService.getById(dto.getAuditUser().getKid());
 //						Account a =userService.syncAccountUser(fwUser);
 //						dto.getAuditUser().setAid(a.getId());
-                }else {
-                    dto.getAuditUser().setAid(u.getId());
-                }
-            }else {
-                log.info("已获取过hrbp审核人id【"+dto.getAuditUser().getAid()+"】,不需要再转化");
-            }
-
-        }else {
-            //弄成固定值，用于测试
-            dto.getAuditUser().setAid(getCurrent().getAccountId());
-        }
-        if(StringUtils.isBlank(dto.getAuditUser().getAid())) {
-            return badRequest("查询组织HRBP审核人员失败");
-        }
-
-        //设置为提交状态
-        dto.getCourse().setStatus(Course.STATUS_SUBMIT);
-        dto.getCourse().setEnabled(true);//设置启用状态问题
-        dto.getCourse().setPublished(false);//重新提交审核设置为未发布状态
-        courseService.submit(dto);
-        //提交成功发邮件提醒
-        try {
-            String htmlEmail=createEmailHtml(dto.getAuditUser().getName(),dto.getCourse().getOrgId(),
-                    dto.getCourse().getOrgName(),
-                    dto.getCourse().getSysCreateBy(),dto.getCourse().getName());
-            //邮件发送
-            String email=dto.getAuditUser().getEmail();
-            if(!isLocalDevelopment()) {
-                //只是非开发模式下才可以发送
-                service.sendMail(email,"《"+dto.getCourse().getName()+"》课程审核提醒", htmlEmail,"数字化学习平台");
-            }else {
-                //service.sendMail("daihaixing@bjxask.com","课程审核提醒", htmlEmail,"数字化学习平台");
-            }
-
-        } catch (Exception ex) {
-            log.error("邮件发送失败",ex);
-            return error("课程已提交，但邮件发送失败",ex.getMessage());
-        }
-        return success(dto);
+					}else {
+						dto.getAuditUser().setAid(u.getId());
+					}
+				}else {
+					log.info("已获取过hrbp审核人id【"+dto.getAuditUser().getAid()+"】,不需要再转化");
+				}
+				
+			}else {
+				//弄成固定值，用于测试
+				dto.getAuditUser().setAid(getCurrent().getAccountId());
+			}
+			if(StringUtils.isBlank(dto.getAuditUser().getAid())) {
+				return badRequest("查询组织HRBP审核人员失败");
+			}
+			
+			//设置为提交状态
+			dto.getCourse().setStatus(Course.STATUS_SUBMIT);
+			dto.getCourse().setEnabled(true);//设置启用状态问题
+			dto.getCourse().setPublished(false);//重新提交审核设置为未发布状态
+			courseService.submit(dto);
+			//提交成功发邮件提醒
+			try {
+				String htmlEmail=createEmailHtml(dto.getAuditUser().getName(),dto.getCourse().getOrgId(),
+						dto.getCourse().getOrgName(),
+						dto.getCourse().getSysCreateBy(),dto.getCourse().getName());
+				//邮件发送
+				String email=dto.getAuditUser().getEmail();
+				if(!isLocalDevelopment()) {
+					//只是非开发模式下才可以发送
+					service.sendMail(email,"《"+dto.getCourse().getName()+"》课程审核提醒", htmlEmail,"数字化学习平台");
+				}else {
+					//service.sendMail("daihaixing@bjxask.com","课程审核提醒", htmlEmail,"数字化学习平台");
+				}
+	            
+	        } catch (Exception ex) {
+	        	log.error("邮件发送失败",ex);
+	            return error("课程已提交，但邮件发送失败",ex.getMessage());
+	        }
+			return success(dto);
+		} catch (Exception e) {
+			log.error("提交保存课程信息错误",e);
+			return error("提交课程处理失败",e.getMessage());
+		}
 	}
 	
 	private String createEmailHtml(String name,String orgId, String orgName,String createBy,String courseName) throws Exception {
@@ -608,7 +576,6 @@ public class CourseManageApi extends ApiBaseController{
 	}
 
 	@PostMapping("/sumbits")
-    @Transactional(rollbackFor = Exception.class)
 	public JsonResponse<Boolean> sumbitId(HttpServletRequest request,CourseHRBPAudit audit,String ucode,String ukid,String email,String orgName){
 		if(StringUtils.isBlank(audit.getCourseId())){
 			return badRequest("参数错误");
@@ -631,23 +598,24 @@ public class CourseManageApi extends ApiBaseController{
 			return badRequest(error);
 		}
 
-        CourseHRBPAudit hrbpAudit = hrbpAuditService.hasAuditing(audit.getCourseId());
-        if(hrbpAudit!=null) {
-            return badRequest("此课程中已有审核，不能再提交审核，如修改请先撤回");
-        }
-
-        if(!isLocalDevelopment()) {
-            if(StringUtils.isBlank(audit.getAid())) {
-
+		try {
+			CourseHRBPAudit hrbpAudit = hrbpAuditService.hasAuditing(audit.getCourseId());
+			if(hrbpAudit!=null) {
+				return badRequest("此课程中已有审核，不能再提交审核，如修改请先撤回");
+			}
+			
+			if(!isLocalDevelopment()) {
+				if(StringUtils.isBlank(audit.getAid())) {
+					
 //					if(StringUtils.isBlank(ukid)){
 //						return badRequest("未关联HRBP审核人员");
 //					}
-                //转化用户id
-                User u = userService.getByUserNo(ucode);
-                if(u==null) { //本地没有，需要同步
-                    return badRequest("无关联HRBP审核人员，请先同步用户");
-                    //Organization org = orgService.getBySysId(dto.getAuditUser().getOrgkid());
-                    //20230815 已经不再使用直接查老系统，采用接口同步的方式
+					//转化用户id
+					User u = userService.getByUserNo(ucode);
+					if(u==null) { //本地没有，需要同步
+						return badRequest("无关联HRBP审核人员，请先同步用户");
+						//Organization org = orgService.getBySysId(dto.getAuditUser().getOrgkid());
+						//20230815 已经不再使用直接查老系统，采用接口同步的方式
 //						UserVo fwUser = fwUserService.getById(ukid);
 //						Account a =userService.syncAccountUser(fwUser);
 //						audit.setAid(a.getId());
@@ -663,39 +631,43 @@ public class CourseManageApi extends ApiBaseController{
 //			            }catch(Exception exp) {
 //			            	log.error("登录同步用户错误",exp);
 //			            }
-                }else {
-                    audit.setAid(u.getId());
-                }
-            }else {
-                log.info("已获取过hrbp审核人id【"+audit.getAid()+"】,不需要再转化");
-            }
-
-        }else {
-            //弄成固定值，用于测试
-            audit.setAid(getCurrent().getAccountId());
-        }
-
-        if(StringUtils.isBlank(audit.getAid())) {
-            return badRequest("查询组织HRBP审核人员失败");
-        }
-
-        courseService.submit(audit);
-
-        //提交成功发邮件提醒
-        try {
-            String htmlEmail=createEmailHtml(audit.getAuditUser(),course.getOrgId(), orgName,audit.getCourseUser(),audit.getCourseName());
-            //邮件发送
-            if(!isLocalDevelopment()) {
-                //只是非高度环境上才会发送
-                service.sendMail(email,"《"+course.getName()+"》课程审核提醒",htmlEmail,"数字化学习平台");
-            }
-
-        } catch (Exception ex) {
-            log.error("邮件发送失败",ex);
-            return error("课程已提交，但邮件发送失败",ex.getMessage());
-        }
-
-        return success(true);
+					}else {
+						audit.setAid(u.getId());
+					}
+				}else {
+					log.info("已获取过hrbp审核人id【"+audit.getAid()+"】,不需要再转化");
+				}
+				
+			}else {
+				//弄成固定值，用于测试
+				audit.setAid(getCurrent().getAccountId());
+			}
+			
+			if(StringUtils.isBlank(audit.getAid())) {
+				return badRequest("查询组织HRBP审核人员失败");
+			}
+			
+			courseService.submit(audit);
+			
+			//提交成功发邮件提醒
+			try {
+				String htmlEmail=createEmailHtml(audit.getAuditUser(),course.getOrgId(), orgName,audit.getCourseUser(),audit.getCourseName());
+				//邮件发送
+				if(!isLocalDevelopment()) {
+					//只是非高度环境上才会发送
+					service.sendMail(email,"《"+course.getName()+"》课程审核提醒",htmlEmail,"数字化学习平台");
+				}
+	            
+	        } catch (Exception ex) {
+	        	log.error("邮件发送失败",ex);
+	            return error("课程已提交，但邮件发送失败",ex.getMessage());
+	        }
+			
+			return success(true);
+		}catch(Exception e) {
+			log.error("提交保存课程信息错误",e);
+			return error("提交课程处理失败",e.getMessage());
+		}
 	}
 
 	@PostMapping("/revoke")

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

@@ -0,0 +1,173 @@
+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 java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @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){
+        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); // 链式追加排序条件
+                }
+            }
+        }
+        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<Boolean> changeHotStatus(Long id,Boolean isHot){
+        return courseTagService.changeHotStatus(id,isHot);
+    }
+
+    /**
+     * 分页查询：指定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){
+        if (StringUtils.isNotBlank(tagName)){
+            List<CourseTag> courseTagList = courseTagService.searchTags(tagName);
+            return success(courseTagList);
+        }
+        return error("服务器端异常！");
+    }
+
+    /**
+     * 创建新标签,并与当前课程绑定
+     * @param courseTagRelationDto
+     * @return
+     */
+    @RequestMapping(value="/createTag",method= RequestMethod.POST)
+    public JsonResponse<CourseTag> createTag(CourseTagRelationDto courseTagRelationDto){
+        if (courseTagRelationDto!=null){
+            CourseTag courseTag = courseTagService.createTag(courseTagRelationDto);
+            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/dao/CourseTagDao.java

@@ -0,0 +1,107 @@
+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 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.List;
+
+/**
+ * @ClassName:CourseTagDao
+ * @author:zhengge@oracle.com
+ * @since:2025/7/2516:50
+ */
+@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\n" +
+                    "where t.is_hot = true\n" +
+                    "GROUP BY t.id\n" +
+                    "order by t.last_set_hot_time desc,relation_count 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.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)));
+        return courseTag;
+    }
+}

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

@@ -0,0 +1,124 @@
+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 boolean countHotTags() {
+        String sql = "SELECT COUNT(*) FROM boe_course_tag WHERE is_hot = 1";
+        Query query = entityManager.createNativeQuery(sql);
+        Object result = query.getSingleResult();
+        long count = Long.parseLong(result.toString());
+        return   count >= 10;
+    }
+}

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

@@ -0,0 +1,17 @@
+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/dto/CourseQueryDto.java

@@ -140,4 +140,5 @@ public class CourseQueryDto {
      */
     private String userId;
 
+    private String tags;
 }

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

@@ -0,0 +1,40 @@
+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

@@ -0,0 +1,49 @@
+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

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

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

@@ -0,0 +1,92 @@
+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;
+
+    /**
+     * 最近设置为公共标签的时间
+     */
+    @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

@@ -0,0 +1,37 @@
+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/CourseTypeTagRelation.java

@@ -0,0 +1,39 @@
+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/service/CourseToCourseFullText.java

@@ -52,6 +52,7 @@ 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/ICourseService.java

@@ -161,14 +161,14 @@ public interface ICourseService {
      * 课程信息的整体更新,用于对课程的编辑处理
      * @param full
      */
-    void update(CourseFullDto full);
+    void update(CourseFullDto full)throws Exception;
     
     /**
      * 提交课程，提交进入课程审核，独立的方法处理
      * @param full
      * @throws Exception
      */
-    void submit(CourseFullDto full);
+    void submit(CourseFullDto full)throws Exception;
     
     /**
      * 用于默认管理员，直接提交发布，不走审核流程
@@ -177,14 +177,14 @@ public interface ICourseService {
      * @param aname 姓名
      * @throws Exception
      */
-    void submitAndPublish(CourseFullDto full,String aid,String aname);
+    void submitAndPublish(CourseFullDto full,String aid,String aname)throws Exception;
     
     /**
      * 提交一个课程
      * @param audit
      * @throws Exception
      */
-    void submit(CourseHRBPAudit audit);
+    void submit(CourseHRBPAudit audit) throws Exception;
 
     /**
      * update 传一个id直接改值

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

@@ -0,0 +1,91 @@
+package com.xboe.module.course.service;
+
+import com.xboe.common.OrderCondition;
+import com.xboe.common.PageList;
+import com.xboe.core.JsonResponse;
+import com.xboe.core.orm.IFieldFilter;
+import com.xboe.module.course.dto.CourseTagRelationDto;
+import com.xboe.module.course.entity.CourseTag;
+
+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
+     */
+    JsonResponse<Boolean> changeHotStatus(Long id, Boolean isHot);
+
+    /**
+     * 解除指定id的课程和某个标签之间的关联关系
+     * @return
+     */
+    void unbind(String id);
+
+    /**
+     * 根据标签名称进行检索(模糊查询)
+     * @param tagName
+     * @return 符合检索条件的所有公共标签
+     */
+    List<CourseTag> searchTags(String tagName);
+
+    /**
+     * 创建新标签,并与当前课程绑定
+     * @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 bindTag(String id, String tags);
+
+    List<CourseTag> getTagsByTagIds(List<String> courseTagIds);
+}

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

@@ -18,6 +18,7 @@ import javax.management.Query;
 import cn.hutool.core.collection.CollectionUtil;
 import com.xboe.api.ThirdApi;
 import com.xboe.core.orm.*;
+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;
@@ -98,7 +99,8 @@ public class CourseServiceImpl implements ICourseService {
 
     @Resource
     private CourseHRBPAuditDao courseHRBPAuditDao;
-
+    @Resource
+    private ICourseTagService courseTagService;
 
     @Resource
     private SysLogAuditDao logAuditDao;//审核日志记录
@@ -183,8 +185,6 @@ public class CourseServiceImpl implements ICourseService {
                 filters.add(FieldFilters.in("device", Course.DEVICE_MOBILE, Course.DEVICE_ALL));
             } else if (dto.getDevice() == Course.DEVICE_ALL) {
                 filters.add(FieldFilters.eq("device", Course.DEVICE_ALL));
-            }else if (dto.getDevice() == Course.DEVICE_INTERNAL) {
-                filters.add(FieldFilters.eq("device", Course.DEVICE_INTERNAL));
             }
 
         }
@@ -493,7 +493,7 @@ public class CourseServiceImpl implements ICourseService {
         String sql = "SELECT DISTINCT\n" +
                 "rt.course_id\n" +
                 "FROM\n" +
-                "boe_new.student s INNER JOIN boe_new.router_task rt on s.pid=rt.router_id inner join boe_course c on c.id=rt.course_id\n" +
+                "boe.student s INNER JOIN boe.router_task rt on s.pid=rt.router_id inner join boe_course c on c.id=rt.course_id\n" +
                 "\n" +
                 "WHERE\n" +
                 "\n" +
@@ -516,7 +516,7 @@ public class CourseServiceImpl implements ICourseService {
         String sql = "SELECT DISTINCT\n" +
                 "pt.course_id\n" +
                 "FROM\n" +
-                "boe_new.student s INNER JOIN boe_new.project_task pt on s.pid=pt.project_id inner join boe_course c on c.id=pt.course_id\n" +
+                "boe.student s INNER JOIN boe.project_task pt on s.pid=pt.project_id inner join boe_course c on c.id=pt.course_id\n" +
                 "\n" +
                 "WHERE\n" +
                 "\n" +
@@ -573,8 +573,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" +
@@ -976,7 +976,7 @@ public class CourseServiceImpl implements ICourseService {
     }
 
     @Override
-    public void update(CourseFullDto full) {
+    public void update(CourseFullDto full) throws Exception {
 
         Course c = full.getCourse();//当前的课程信息
         Course nowCourse = courseDao.get(c.getId());//修改之前的课程信息
@@ -1024,11 +1024,13 @@ public class CourseServiceImpl implements ICourseService {
             publishUtil.removeByDocId(c.getFullTextId());
 
         }
-
+        // 添加课程对应的标签
+        String tags = full.getCourse().getTags();
+        courseTagService.bindTag(c.getId(), tags);
     }
 
     @Override
-    public void submit(CourseFullDto full) {
+    public void submit(CourseFullDto full) throws Exception {
 
         Course c = full.getCourse();//当前的课程信息
         if (c.getVisible() == null) {
@@ -1084,7 +1086,7 @@ public class CourseServiceImpl implements ICourseService {
     }
 
     @Override
-    public void submitAndPublish(CourseFullDto full, String aid, String aname) {
+    public void submitAndPublish(CourseFullDto full, String aid, String aname) throws Exception {
 
         Course c = full.getCourse();//当前的课程信息
         c.setPublished(true);
@@ -1131,7 +1133,7 @@ public class CourseServiceImpl implements ICourseService {
     }
 
     @Override
-    public void submit(CourseHRBPAudit hrbpAudit) {
+    public void submit(CourseHRBPAudit hrbpAudit) throws Exception {
 
         courseDao.updateMultiFieldById(hrbpAudit.getCourseId(), UpdateBuilder.create("status", Course.STATUS_SUBMIT),
                 UpdateBuilder.create("published", false), UpdateBuilder.create("publishTime", LocalDateTime.now()));

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

@@ -0,0 +1,399 @@
+package com.xboe.module.course.service.impl;
+
+import com.xboe.common.OrderCondition;
+import com.xboe.common.PageList;
+import com.xboe.core.JsonResponse;
+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.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.*;
+
+/**
+ * @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) {
+        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"));
+        }
+        return courseTagDao.findPage(query.builder());
+    }
+
+    /**
+     * 分页查询指定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 JsonResponse<Boolean> changeHotStatus(Long id, Boolean isHot) {
+        // 当标签切换为热点标签时才会判断，超过十个热点标签则禁止设置
+        JsonResponse<Boolean> objectJsonResponse = new JsonResponse<>();
+        if (isHot){
+            if (courseTagRelationDao.countHotTags()){
+                objectJsonResponse.setStatus(400);
+                objectJsonResponse.setMessage("超过十个热点标签，无法进行设置");
+                objectJsonResponse.setResult(false);
+                return objectJsonResponse;
+            }
+        }
+        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);
+        }
+        objectJsonResponse.setStatus(200);
+        objectJsonResponse.setMessage("修改成功");
+        return objectJsonResponse;
+    }
+
+    /**
+     * 解除指定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 符合检索条件的所有公共标签
+     */
+    @Override
+    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;
+    }
+
+    /**
+     * 创建新标签,并与指定课程绑定
+     * @param courseTagRelationDto
+     * @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(0);
+            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 List<CourseTag> getTagsByTagIds(List<String> courseTagIds) {
+        List<CourseTag> courseTagList = courseTagDao.findList(FieldFilters.in("id", courseTagIds));
+        return courseTagList;
+    }
+
+    @Override
+    public void bindTag(String id, String tags) {
+        // 将tags转换为数组
+        String[] tagIds = tags.split(",");
+        List<Long> tagIdList = new ArrayList<>();
+        for (String tagId : tagIds){
+            tagIdList.add(Long.valueOf(tagId));
+        }
+        for (Long tagId : tagIdList){
+            QueryBuilder courseTagQuery=QueryBuilder.from(CourseTag.class);
+            List<IFieldFilter> courseTagFilters = new ArrayList<>();
+            courseTagFilters.add(FieldFilters.eq("id",tagId.toString()));//精确匹配
+            courseTagQuery.addFilters(courseTagFilters);
+            //修改该标签关联课程数
+            CourseTag courseTag = courseTagDao.findOne(FieldFilters.eq("id", String.valueOf(tagId)));
+            if (courseTag!=null){
+                //更新该标签的关联课程数量
+                courseTag.setUseCount(courseTag.getUseCount()+1);
+                courseTagDao.saveOrUpdate(courseTag);
+            }
+            // 查询课程是否绑定了标签
+            QueryBuilder query=QueryBuilder.from(CourseTagRelation.class);
+            List<IFieldFilter> filters = new ArrayList<>();
+            filters.add(FieldFilters.eq("courseId",Long.valueOf(id)));
+            filters.add(FieldFilters.eq("tagId",Long.valueOf(tagId)));
+            query.addFilters(filters);
+            List<CourseTagRelation> courseTagRelationList = courseTagRelationDao.findList(query.builder());
+            // 如果没有绑定标签，那么就进行绑定
+            if (courseTagRelationList==null || courseTagRelationList.size()==0){
+                CourseTagRelation courseTagRelation = new CourseTagRelation();
+                courseTagRelation.setTagId(Long.valueOf(tagId));
+                courseTagRelation.setCourseId(Long.valueOf(id));
+                courseTagRelationDao.save(courseTagRelation);
+            }
+        }
+    }
+
+    @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;
+    }
+}

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

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

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

@@ -10,8 +10,6 @@ import java.util.stream.Collectors;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.nacos.shaded.com.google.common.util.concurrent.RateLimiter;
-import com.boe.feign.api.infrastructure.entity.CommonSearchVo;
-import com.boe.feign.api.infrastructure.entity.Dict;
 import com.xboe.api.ThirdApi;
 import com.xboe.constants.CacheName;
 import com.xboe.module.course.vo.TeacherVo;
@@ -235,30 +233,7 @@ public class StudyCourseApi extends ApiBaseController{
 		rs.put("contents",cclist);
 		rs.put("sections",sectionlist);
 		rs.put("teachers",teachers);
-		// 未选择仅内网时isPermission = false，不用区分内外网
-		boolean isPermission = false;
-		if(course.getDevice() ==4){
-			CommonSearchVo searcher = new CommonSearchVo();
-			searcher.setPid(637L);
-			searcher.setType(1);
-			List<Dict> dictList = thirdApi.getDictItems(searcher);
-			if(dictList != null && dictList.size() > 0){
-				List<String> dicts =  dictList.stream().map(Dict::getValue).collect(Collectors.toList());
-				// 选择仅内网 并且字典中配置了此课程资源归属，那么只能内网观看 返回 truw
-				isPermission = dicts.contains(course.getOrgId());
-			}
-		}
-		rs.put("isPermission",isPermission);
-
-		CommonSearchVo warn = new CommonSearchVo();
-		warn.setCode("course_warn");
-		warn.setType(1);
-		List<Dict> warns = thirdApi.getDictItems(warn);
-		if(warns != null && warns.size() > 0){
-			rs.put("warn",warns.get(0).getValue());
-			rs.put("warnTitle",warns.get(0).getName());
-		}
-
+		
 		//检查是否已报名
 		StudyCourse sc=service.findByCourseIdAndAid(cid, aid);
 		if(pass==true && sc==null) {
@@ -592,8 +567,8 @@ public class StudyCourseApi extends ApiBaseController{
 		}
 		try {
 			studyService.finishVideoStudyItem(itemId, studyId,courseId,cnum,token);
-//			List<StudyCourse> allUserList = thirdApi.getStudyCourseList(studyId ,courseId, token);
-//			log.info("在线课学习记录"+allUserList);
+			List<StudyCourse> allUserList = thirdApi.getStudyCourseList(studyId ,courseId, token);
+			log.info("在线课学习记录"+allUserList);
 			return success(true);
 		}catch(Exception e) {
 			log.error("记录内容学习完成错误",e);

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

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

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

@@ -282,12 +282,11 @@ public class StudyServiceImpl implements IStudyService{
 				return pageList;
 			}
 		}
-
 		String sql = "select a.id, a.course_id, a.course_name, a.aname, " +
-				"IFNULL(b.finish_time, '0') as finish_time, IFNULL(b.progress, 0) as progress, IFNULL(b.status, 1) as status,b.score " +
+				"IFNULL(b.finish_time, '0') as finish_time, IFNULL(b.progress, 0) as progress, IFNULL(b.status, 1) as status " +
 				"from (select id, course_id, course_name, aname, 0, 1 from boe_study_course where course_id = '" + courseId + "' and aname like '%"+name+"%') a " +
 				"left join " +
-				"(select bsc.id, bsc.course_id, bsc.course_name, bsc.aname, item.finish_time, item.progress, item.status,MAX(item.score) score " +
+				"(select bsc.id, bsc.course_id, bsc.course_name, bsc.aname, item.finish_time, item.progress, item.status " +
 				"from boe_study_course bsc left join boe_study_course_item item on item.course_id = bsc.course_id and item.study_id = bsc.id " +
 				"where bsc.course_id = '" + courseId + "' and item.content_id = '" + contentId + "' and item.aname like '%"+name+"%' group by bsc.id) b " +
 				"on a.course_id = b.course_id and a.id = b.id " +
@@ -316,9 +315,6 @@ public class StudyServiceImpl implements IStudyService{
 			sc.setProgress(Integer.valueOf(objs[5].toString()));
 			sc.setStatus(Integer.valueOf(objs[6].toString()));
 			sc.setAname(objs[3].toString());
-			if(objs[7] != null){
-				sc.setScore(Float.valueOf(objs[7].toString()));
-			}
 			item.add(sc);
 		}
 		log.info("资源完成情况人员"+item);