交易市场平台（供应商）

baqing-admin/src/main/java/com/ruoyi/web/modules/technology/mapper/BizOnlineTrainingCourseMapper.java

@@ -1,6 +1,7 @@
 package com.ruoyi.web.modules.technology.mapper;
 
 import java.util.List;
+import com.ruoyi.web.modules.category.domain.vo.InformationCategoryItemVo;
 import com.ruoyi.web.modules.technology.domain.OnlineTrainingCourseQuery;
 import com.ruoyi.web.modules.technology.domain.OnlineTrainingCourseRow;
 
@@ -13,5 +14,6 @@ public interface BizOnlineTrainingCourseMapper
 
     OnlineTrainingCourseRow selectOnlineTrainingCourseById(Long id);
 
-    List<String> selectDistinctCourseTopics();
+    /** 课程主题选项：资讯类别 parentCode=005、categoryType=8 的下级编码与名称 */
+    List<InformationCategoryItemVo> selectDistinctCourseTopics();
 }

baqing-admin/src/main/java/com/ruoyi/web/modules/technology/service/IBizOnlineTrainingCourseService.java

@@ -1,6 +1,7 @@
 package com.ruoyi.web.modules.technology.service;
 
 import java.util.List;
+import com.ruoyi.web.modules.category.domain.vo.InformationCategoryItemVo;
 import com.ruoyi.web.modules.technology.domain.OnlineTrainingCourseDetailVo;
 import com.ruoyi.web.modules.technology.domain.OnlineTrainingCourseListVo;
 import com.ruoyi.web.modules.technology.domain.OnlineTrainingCourseQuery;
@@ -14,5 +15,5 @@ public interface IBizOnlineTrainingCourseService
 
     OnlineTrainingCourseDetailVo selectOnlineTrainingCourseById(Long id);
 
-    List<String> selectCourseTopics();
+    List<InformationCategoryItemVo> selectCourseTopics();
 }

baqing-admin/src/main/java/com/ruoyi/web/modules/technology/service/impl/BizOnlineTrainingCourseServiceImpl.java

@@ -2,9 +2,7 @@ package com.ruoyi.web.modules.technology.service.impl;
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.LinkedHashSet;
 import java.util.List;
-import java.util.Set;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.common.exception.ServiceException;
@@ -14,8 +12,6 @@ import com.ruoyi.web.modules.technology.domain.OnlineTrainingCourseListVo;
 import com.ruoyi.web.modules.technology.domain.OnlineTrainingCourseQuery;
 import com.ruoyi.web.modules.technology.domain.OnlineTrainingCourseRow;
 import com.ruoyi.web.modules.category.domain.vo.InformationCategoryItemVo;
-import com.ruoyi.web.modules.category.service.IBizInformationCategoryService;
-import com.ruoyi.web.modules.farming.support.TechResourceCourseTopicValidator;
 import com.ruoyi.web.modules.technology.mapper.BizOnlineTrainingCourseMapper;
 import com.ruoyi.web.modules.technology.service.IBizOnlineTrainingCourseService;
 import com.ruoyi.web.modules.technology.support.OnlineTrainingCourseRules;
@@ -26,9 +22,6 @@ public class BizOnlineTrainingCourseServiceImpl implements IBizOnlineTrainingCou
     @Autowired
     private BizOnlineTrainingCourseMapper onlineTrainingCourseMapper;
 
-    @Autowired
-    private IBizInformationCategoryService bizInformationCategoryService;
-
     @Override
     public List<OnlineTrainingCourseListVo> selectOnlineTrainingCourseList(OnlineTrainingCourseQuery query)
     {
@@ -62,32 +55,22 @@ public class BizOnlineTrainingCourseServiceImpl implements IBizOnlineTrainingCou
     }
 
     @Override
-    public List<String> selectCourseTopics()
+    public List<InformationCategoryItemVo> selectCourseTopics()
     {
-        Set<String> merged = new LinkedHashSet<>();
-        for (InformationCategoryItemVo item : bizInformationCategoryService.selectChildren(
-                TechResourceCourseTopicValidator.CATEGORY_PARENT_CODE,
-                TechResourceCourseTopicValidator.CATEGORY_TYPE))
+        List<InformationCategoryItemVo> categories = onlineTrainingCourseMapper.selectDistinctCourseTopics();
+        if (categories == null || categories.isEmpty())
         {
-            if (item != null && StringUtils.isNotEmpty(item.getCode()))
-            {
-                merged.add(item.getCode().trim());
-            }
+            return Collections.emptyList();
         }
-        List<String> fromDb = onlineTrainingCourseMapper.selectDistinctCourseTopics();
-        if (fromDb != null)
+        List<InformationCategoryItemVo> result = new ArrayList<>(categories.size());
+        for (InformationCategoryItemVo item : categories)
         {
-            for (String topic : fromDb)
+            if (item != null && StringUtils.isNotEmpty(item.getCode()))
             {
-                if (StringUtils.isNotEmpty(topic))
-                {
-                    merged.add(topic.trim());
-                }
+                result.add(item);
             }
         }
-        List<String> sorted = new ArrayList<>(merged);
-        Collections.sort(sorted);
-        return sorted;
+        return result;
     }
 
     private static OnlineTrainingCourseQuery normalizeQuery(OnlineTrainingCourseQuery query)

baqing-admin/src/main/resources/mapper/technology/BizOnlineTrainingCourseMapper.xml

@@ -47,12 +47,19 @@
           and <include refid="publishedVideoWhere"/>
     </select>
 
-    <select id="selectDistinctCourseTopics" resultType="string">
-        select distinct course_topic
-        from biz_tech_resource
-        where <include refid="publishedVideoWhere"/>
-          and course_topic is not null
-          and course_topic != ''
-        order by course_topic asc
+    <resultMap type="com.ruoyi.web.modules.category.domain.vo.InformationCategoryItemVo" id="CourseTopicCategoryResult">
+        <result property="code" column="category_code"/>
+        <result property="name" column="category_name"/>
+    </resultMap>
+
+    <select id="selectDistinctCourseTopics" resultMap="CourseTopicCategoryResult">
+        select category_code, category_name
+        from biz_information_category
+        where del_flag = '0'
+          and parent_code = '005'
+          and category_type = '8'
+          and category_code is not null
+          and category_code != ''
+        order by category_code asc
     </select>
 </mapper>

baqing-admin/src/test/java/com/ruoyi/web/modules/technology/controller/BizOnlineTrainingCourseControllerApiTest.java

@@ -31,6 +31,7 @@ import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.framework.web.exception.GlobalExceptionHandler;
+import com.ruoyi.web.modules.category.domain.vo.InformationCategoryItemVo;
 import com.ruoyi.web.modules.technology.OnlineTrainingCourseTestSamples;
 import com.ruoyi.web.modules.technology.domain.OnlineTrainingCourseDetailVo;
 import com.ruoyi.web.modules.technology.domain.OnlineTrainingCourseListVo;
@@ -103,11 +104,14 @@ class BizOnlineTrainingCourseControllerApiTest
     void courseTopics() throws Exception
     {
         when(onlineTrainingCourseService.selectCourseTopics())
-                .thenReturn(Arrays.asList("005001", "005002"));
+                .thenReturn(Arrays.asList(
+                        new InformationCategoryItemVo("005001", "基础养殖"),
+                        new InformationCategoryItemVo("005002", "疫病防治")));
         mockMvc.perform(get("/techService/onlineTrainingCourse/courseTopics"))
                 .andExpect(status().isOk())
                 .andExpect(jsonPath("$.code").value(200))
-                .andExpect(jsonPath("$.data[0]").value("005001"));
+                .andExpect(jsonPath("$.data[0].code").value("005001"))
+                .andExpect(jsonPath("$.data[0].name").value("基础养殖"));
     }
 
     @Test

baqing-admin/src/test/java/com/ruoyi/web/modules/technology/mapper/BizOnlineTrainingCourseMapperXmlTest.java

@@ -47,7 +47,11 @@ class BizOnlineTrainingCourseMapperXmlTest
     {
         String xml = readMapperXml();
         assertTrue(xml.contains("selectDistinctCourseTopics"));
-        assertTrue(xml.contains("distinct course_topic"));
+        assertTrue(xml.contains("biz_information_category"));
+        assertTrue(xml.contains("parent_code = '005'"));
+        assertTrue(xml.contains("category_type = '8'"));
+        assertTrue(xml.contains("category_code"));
+        assertTrue(xml.contains("category_name"));
     }
 
     private static String readMapperXml()

baqing-admin/src/test/java/com/ruoyi/web/modules/technology/service/impl/BizOnlineTrainingCourseServiceImplTest.java

@@ -7,6 +7,7 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.List;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -15,7 +16,6 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.web.modules.category.domain.vo.InformationCategoryItemVo;
-import com.ruoyi.web.modules.category.service.IBizInformationCategoryService;
 import com.ruoyi.web.modules.farming.support.TechResourceRules;
 import com.ruoyi.web.modules.technology.OnlineTrainingCourseTestSamples;
 import com.ruoyi.web.modules.technology.domain.OnlineTrainingCourseDetailVo;
@@ -31,9 +31,6 @@ class BizOnlineTrainingCourseServiceImplTest
     @Mock
     private BizOnlineTrainingCourseMapper onlineTrainingCourseMapper;
 
-    @Mock
-    private IBizInformationCategoryService bizInformationCategoryService;
-
     @InjectMocks
     private BizOnlineTrainingCourseServiceImpl service;
 
@@ -73,18 +70,19 @@ class BizOnlineTrainingCourseServiceImplTest
     }
 
     @Test
-    @DisplayName("课程主题合并去重")
+    @DisplayName("课程主题列表")
     void courseTopics()
     {
-        when(bizInformationCategoryService.selectChildren("005", "8"))
+        when(onlineTrainingCourseMapper.selectDistinctCourseTopics())
                 .thenReturn(Arrays.asList(
                         new InformationCategoryItemVo(TechResourceRules.COURSE_TOPIC_BASIC, "基础养殖"),
                         new InformationCategoryItemVo(TechResourceRules.COURSE_TOPIC_DISEASE, "疫病防治")));
-        when(onlineTrainingCourseMapper.selectDistinctCourseTopics())
-                .thenReturn(Arrays.asList(TechResourceRules.COURSE_TOPIC_BASIC, "004099"));
-        assertTrue(service.selectCourseTopics().contains(TechResourceRules.COURSE_TOPIC_BASIC));
-        assertTrue(service.selectCourseTopics().contains(TechResourceRules.COURSE_TOPIC_DISEASE));
-        assertTrue(service.selectCourseTopics().contains("004099"));
+        List<InformationCategoryItemVo> topics = service.selectCourseTopics();
+        assertEquals(2, topics.size());
+        assertEquals(TechResourceRules.COURSE_TOPIC_BASIC, topics.get(0).getCode());
+        assertEquals("基础养殖", topics.get(0).getName());
+        assertEquals(TechResourceRules.COURSE_TOPIC_DISEASE, topics.get(1).getCode());
+        assertEquals("疫病防治", topics.get(1).getName());
     }
 
     @Test

doc/科技平台与服务/网上培训课程/网上培训课程技术方案.md

@@ -132,9 +132,14 @@ AND del_flag = '0'
 
 ### 3.3 课程主题下拉
 
-**响应 `data`**：`string[]`，升序去重。
+**响应 `data`**：`InformationCategoryItemVo[]`，按 `category_code` 升序。
 
-**SQL 逻辑**：在 **§2.1** 条件下 `SELECT DISTINCT course_topic`，过滤空串；实现类可合并预设四主题 + 库内 DISTINCT，去重排序后返回（预设在前或全量排序，产品无严格要求时按字母序即可）。
+| 字段 | 说明 |
+| --- | --- |
+| `code` | 资讯类别编码（如 `005001`） |
+| `name` | 类别名称（如 `基础养殖`） |
+
+**SQL 逻辑**：`selectDistinctCourseTopics` 从 `biz_information_category` 查询 `parent_code='005'`、`category_type='8'` 的下级，返回 `category_code`、`category_name`。
 
 ### 3.4 Mapper 约定
 

doc/科技平台与服务/网上培训课程/网上培训课程测试用例.md

@@ -31,7 +31,7 @@
 | ZCZX-WSYPX-UT-004 | Service | 详情 Vo 映射 | 单元测试 | JUnit5+Mockito | §3.2 | Mock 返回含封面、视频 URL | `selectById(KC1.id)` | 含 `videoFileUrl`、`coverFileUrl`、`createTime` |
 | ZCZX-WSYPX-UT-005 | Service | 详情不存在 | 单元测试 | JUnit5+Mockito | §3.2、§8 | Mapper 返回 null | `selectById(99999)` | `ServiceException`，msg 含「下线或不存在」 |
 | ZCZX-WSYPX-UT-006 | Service | 详情已下架 | 单元测试 | JUnit5+Mockito | §7 | Mock 对 KC-O 条件查询无行 | `selectById(KC-O.id)` | 同上异常 |
-| ZCZX-WSYPX-UT-007 | Service | 课程主题列表 | 单元测试 | JUnit5+Mockito | §3.3 | Mock 类别 children + DISTINCT | `selectCourseTopics` | 去重；含 `005001` 等编码及库内 DISTINCT |
+| ZCZX-WSYPX-UT-007 | Service | 课程主题列表 | 单元测试 | JUnit5+Mockito | §3.3 | Mock 类别 rows | `selectCourseTopics` | 返回 `{code,name}` 列表 |
 | ZCZX-WSYPX-UT-008 | Service | 列表不含未发布 | 单元测试 | JUnit5+Mockito | §2.2 | Mock 仅应带 published 条件 | 调用 `selectList` | Mapper 入参或 XML 固定 `publish_status=1` |
 | ZCZX-WSYPX-UT-009 | Mapper | 列表 WHERE 固定条件 | 单元测试 | JUnit5 | §3.4 | 读 XML | 检查 `selectList` | `resource_type='004008'`；`publish_status=1`；`del_flag='0'` |
 | ZCZX-WSYPX-UT-010 | Mapper | 标题模糊与主题精确 | 单元测试 | JUnit5 | §3.1 | 读 XML | 检查动态 SQL | `resource_name like`；`course_topic =` |
@@ -64,7 +64,7 @@
 | ZCZX-WSYPX-API-017 | 详情 | 已删除 id | 接口测试 | Postman | §5.2.3 | 有 KC-X | `GET /{KC-X.id}` | 同上 |
 | ZCZX-WSYPX-API-018 | 详情 | 不存在 id | 接口测试 | Postman | 异常 | 已登录 | `GET /999999999` | 失败；可读 `msg` |
 | ZCZX-WSYPX-API-019 | 详情 | 非视频已发布 id | 接口测试 | Postman | §7 | 有 Z2 | `GET /{Z2.id}` | 失败（无纳入行） |
-| ZCZX-WSYPX-API-020 | 主题下拉 | courseTopics | 接口测试 | Postman | §3.3 | 有 KC1/KC2 | `GET .../courseTopics` | `data` 为编码数组；含 `005001`、`005002`；无空串 |
+| ZCZX-WSYPX-API-020 | 主题下拉 | courseTopics | 接口测试 | Postman | §3.3 | 有类别数据 | `GET .../courseTopics` | `data` 为 `{code,name}` 数组；含 `005001`/`基础养殖` 等 |
 | ZCZX-WSYPX-API-021 | 交叉 | 源库发布后可见 | 接口测试 | Postman | §10 | KC-D 未发布 | `techResource` 发布 KC-D→本模块 `list` | 列表出现；`GET detail` 成功 |
 | ZCZX-WSYPX-API-022 | 交叉 | 源库下架后不可见 | 接口测试 | Postman | §10 | KC1 已发布 | `techResource` 下架 KC1→本模块 `list`+`detail` | 列表无 KC1；详情失败 |
 | ZCZX-WSYPX-API-023 | 写接口 | 无 POST 新增 | 接口测试 | Postman | §3、§3.2 | 已登录 | `POST .../onlineTrainingCourse` | 404 或 405；或权限拒绝 |