mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git
synced 2025-12-10 19:36:50 +08:00
提审加日志
This commit is contained in:
@@ -9,6 +9,7 @@ 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;
|
||||
@@ -28,10 +29,6 @@ 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;
|
||||
|
||||
@@ -60,7 +57,8 @@ public class CourseAuditApi extends ApiBaseController{
|
||||
private ICourseContentService ccontentService;
|
||||
@Resource
|
||||
private ThirdApi thirdApi;
|
||||
|
||||
@Resource
|
||||
private ICourseTagService tagService;
|
||||
|
||||
/**
|
||||
* 教师需要审核的课程
|
||||
@@ -424,6 +422,10 @@ 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());
|
||||
// tagService.updateTags(oldCourse,dto.getCourse(),cuser);
|
||||
// log.info("-------- 标签相关结束 -------");
|
||||
|
||||
courseService.submitAndPublish(dto,cuser.getAccountId(),cuser.getName());
|
||||
log.info("---------------在线课开始同步到讲师管理 ------- token = " + token);
|
||||
|
||||
@@ -74,6 +74,8 @@ public class CourseFullTextApi extends ApiBaseController{
|
||||
@Autowired
|
||||
StringRedisTemplate redisTemplate;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 课程的初始化
|
||||
* @return
|
||||
@@ -411,6 +413,12 @@ public class CourseFullTextApi extends ApiBaseController{
|
||||
c.setKeywordsList(keywordsList);
|
||||
}
|
||||
}
|
||||
if (StringUtils.isNotBlank(c.getTags()) ){
|
||||
List<CourseTag> tagList = courseTagService.getTagsByIds(c.getTags());
|
||||
List<String> tags = tagList.stream().map(CourseTag::getTagName).collect(Collectors.toList());
|
||||
c.setTagsList(tags);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -43,7 +43,7 @@ public class CourseTagDao extends BaseDao<CourseTag> {
|
||||
"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" +
|
||||
"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,relation_count desc"; // 数据库字段为last_set_hot_time
|
||||
|
||||
@@ -69,7 +69,7 @@ public class CourseTagDao extends BaseDao<CourseTag> {
|
||||
// 原生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 " +
|
||||
"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";
|
||||
|
||||
@@ -1100,12 +1100,13 @@ 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()) {
|
||||
@@ -1171,7 +1172,7 @@ public class CourseServiceImpl implements ICourseService {
|
||||
|
||||
/***
|
||||
* 发布全文索引
|
||||
* @param c
|
||||
* @param
|
||||
*/
|
||||
// private void fullTextPublish(Course c) {
|
||||
// if(fullTextSearch==null) {
|
||||
|
||||
Reference in New Issue
Block a user