From 001106043c709e4500f4acee521c9481ba288bd1 Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Fri, 7 Nov 2025 11:25:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=9F=A5=E8=AF=A2=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xboe/module/course/api/CourseTagApi.java | 3 --- .../xboe/module/course/dao/CourseTagDao.java | 18 +++++++++--------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseTagApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseTagApi.java index 0d80134a..9e1155db 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseTagApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseTagApi.java @@ -154,9 +154,6 @@ public class CourseTagApi extends ApiBaseController { CurrentUser cuser = getCurrent(); String aid = cuser.getAccountId(); - log.info(" searchTags cuser name = " + cuser.getName() + " , NickName = " + cuser.getNickName() + " , LoginName = " + cuser.getLoginName()); - log.info(" 参数 tagName = " + tagName + " , typeId = " + typeId + " , aid = " + aid); - log.info(" searchTags aid = " + aid); List courseTagList = courseTagService.searchTags(tagName,aid,typeId); return success(courseTagList); } diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/dao/CourseTagDao.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/dao/CourseTagDao.java index 3fc47277..c5449bac 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/dao/CourseTagDao.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/dao/CourseTagDao.java @@ -42,10 +42,10 @@ public class CourseTagDao extends BaseDao { 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" + + "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,relation_count desc"; // 数据库字段为last_set_hot_time + "order by relation_count desc,t.last_set_hot_time desc"; // 数据库字段为last_set_hot_time // 创建原生查询并指定结果映射到CourseTag实体 javax.persistence.Query query = entityManager.createNativeQuery(sql, CourseTag.class); @@ -72,11 +72,11 @@ public class CourseTagDao extends BaseDao { "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"; + sql += "AND r.sys_type1 = ?1 ORDER BY c.use_count,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"; + sql += "AND r.sys_type2 = ?1 ORDER BY c.use_count,c.last_set_hot_time DESC"; }else { - sql += "AND r.sys_type3 = ?1 ORDER BY c.last_set_hot_time DESC"; + sql += "AND r.sys_type3 = ?1 ORDER BY c.use_count,c.last_set_hot_time DESC"; } // 创建原生查询并指定结果映射到CourseTag实体 javax.persistence.Query query = entityManager.createNativeQuery(sql, CourseTag.class); @@ -129,7 +129,7 @@ public class CourseTagDao extends BaseDao { // 只查询实际存在的字段 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 id, tag_name, is_public, is_hot, use_count, last_set_public_time, last_set_hot_time, deleted, sys_create_time "); + 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 "); @@ -139,7 +139,7 @@ public class CourseTagDao extends BaseDao { } sql.append(" UNION ALL "); - 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 "); + 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 "); @@ -154,7 +154,7 @@ public class CourseTagDao extends BaseDao { 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 "); + 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(") AS all_tags "); sql.append("ORDER BY "); @@ -173,7 +173,7 @@ public class CourseTagDao extends BaseDao { parameters.add(Long.valueOf(typeId)); } - sql.append(" sys_create_time DESC"); + sql.append(" sys_update_time DESC"); log.info("查询标签 searchTags sql = {} ", sql); // 不使用实体类映射，手动处理结果集 Query query = entityManager.createNativeQuery(sql.toString());