bugfix

src/main/java/cn/breeze/elleai/application/dto/response/QaAssistantDto.java

@@ -35,7 +35,11 @@ public class QaAssistantDto implements Serializable {
 
     @Schema(description = "知识库分类ID列表")
     @JsonProperty("category_ids")
-    private List<String> categoryIdList;
+    private List<Integer> categoryIdList;
+
+    @Schema(description = "知识库分类名称列表")
+    @JsonProperty("category_name_list")
+    private List<String> categoryNameList;
 
     @Schema(description = "可见角色列表")
     @JsonProperty("visible_role_ids")

src/main/java/cn/breeze/elleai/application/service/AppChatCompletionService.java

@@ -9,11 +9,10 @@ import cn.breeze.elleai.domain.sparring.model.request.QaAssistantRequestModel;
 import cn.breeze.elleai.domain.sparring.model.request.QaAssistantSaveModel;
 import cn.breeze.elleai.domain.sparring.model.request.UserChatCompletionSaveModel;
 import cn.breeze.elleai.domain.sparring.model.request.UserQaRequestModel;
-import cn.breeze.elleai.domain.sparring.model.response.QaAssistantResponseModel;
-import cn.breeze.elleai.domain.sparring.model.response.UserChatCompletionHistoryResponseModel;
-import cn.breeze.elleai.domain.sparring.model.response.UserChatCompletionResponseModel;
+import cn.breeze.elleai.domain.sparring.model.response.*;
 import cn.breeze.elleai.domain.sparring.service.ChatCompletionService;
 import cn.breeze.elleai.domain.sparring.service.KbService;
+import cn.breeze.elleai.domain.sparring.service.KbTagService;
 import cn.breeze.elleai.util.UserPrincipal;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
@@ -55,6 +54,8 @@ public class AppChatCompletionService {
 
     private final KbService kbService;
 
+    private final KbTagService kbTagService;
+
 
     /************************************************** AI助手 **************************************************/
 
@@ -82,7 +83,21 @@ public class AppChatCompletionService {
      */
     public QaAssistantDto qaAssistantDetail(Integer id) {
         QaAssistantResponseModel model = chatCompletionService.qaAssistantDetail(id);
-        return BeanUtil.copyProperties(model, QaAssistantDto.class);
+
+        QaAssistantDto result = BeanUtil.copyProperties(model, QaAssistantDto.class);
+        if(StrUtil.isNotEmpty(model.getVisibleRoleIds())) {
+            result.setVisibleRoleList(JSONObject.parseArray(model.getVisibleRoleIds(), String.class));
+        }
+        if(StrUtil.isNotEmpty(model.getCategoryIds())) {
+            result.setCategoryIdList(JSONObject.parseArray(model.getCategoryIds(), Integer.class));
+            if(CollectionUtil.isNotEmpty(result.getCategoryIdList())) {
+                List<KbTagResponseModel> tagList = kbTagService.kbTagList(result.getCategoryIdList());
+                List<String> tagNameList = tagList.stream().map(KbTagResponseModel::getName).collect(Collectors.toList());
+                result.setCategoryNameList(tagNameList);
+            }
+        }
+
+        return result;
     }
 
 
@@ -112,12 +127,19 @@ public class AppChatCompletionService {
 
         PageResult<QaAssistantDto> pageResult = PageResult.of(request.getPageNo(), request.getPageSize(), (int) page.getTotalRow(), null);
 
+        Set<String> kbIdSet = new HashSet<>();
+
         if(CollectionUtil.isNotEmpty(page.getRecords())) {
             List<QaAssistantDto> dtoList = page.getRecords().stream().map(v -> {
                 QaAssistantDto dto = BeanUtil.copyProperties(v, QaAssistantDto.class);
 
                 if(StrUtil.isNotEmpty(v.getCategoryIds())) {
-                    dto.setCategoryIdList(JSONObject.parseArray(v.getCategoryIds(), String.class));
+                    dto.setCategoryIdList(JSONObject.parseArray(v.getCategoryIds(), Integer.class));
+                    if(CollectionUtil.isNotEmpty(dto.getCategoryIdList())) {
+                        List<KbTagResponseModel> tagList = kbTagService.kbTagList(dto.getCategoryIdList());
+                        List<String> tagNameList = tagList.stream().map(KbTagResponseModel::getName).collect(Collectors.toList());
+                        dto.setCategoryNameList(tagNameList);
+                    }
                 }
                 if(StrUtil.isNotEmpty(v.getVisibleRoleIds())) {
                     dto.setVisibleRoleList(JSONObject.parseArray(v.getVisibleRoleIds(), String.class));
@@ -149,7 +171,7 @@ public class AppChatCompletionService {
                 QaAssistantDto dto = BeanUtil.copyProperties(v, QaAssistantDto.class);
 
                 if(StrUtil.isNotEmpty(v.getCategoryIds())) {
-                    dto.setCategoryIdList(JSONObject.parseArray(v.getCategoryIds(), String.class));
+                    dto.setCategoryIdList(JSONObject.parseArray(v.getCategoryIds(), Integer.class));
                 }
                 if(StrUtil.isNotEmpty(v.getVisibleRoleIds())) {
                     dto.setVisibleRoleList(JSONObject.parseArray(v.getVisibleRoleIds(), String.class));

src/main/java/cn/breeze/elleai/application/service/AppExamineService.java

@@ -83,7 +83,14 @@ public class AppExamineService {
      */
     public ExamineSceneCategoryDto sceneCategoryDetail(Integer id) {
         ExamineSceneCategoryResponseModel model = examineService.sceneCategoryDetail(id);
-        return BeanUtil.copyProperties(model, ExamineSceneCategoryDto.class);
+
+        ExamineSceneCategoryDto result = BeanUtil.copyProperties(model, ExamineSceneCategoryDto.class);
+
+        if(StrUtil.isNotEmpty(model.getVisibleRoleIds())) {
+            result.setVisibleRoleList(JSONObject.parseArray(model.getVisibleRoleIds(), String.class));
+        }
+
+        return result;
     }
 
 

src/main/java/cn/breeze/elleai/domain/sparring/service/KbService.java

@@ -24,6 +24,8 @@ public interface KbService extends IService<KbEntity> {
 
     List<KbResponseModel> kbList(KbRequestModel request);
 
+    List<KbResponseModel> kbList(List<Integer> kbIds);
+
     KbResponseModel kbDetail(Integer id);
 
     void updateKbStatus(Integer id, Integer status);

src/main/java/cn/breeze/elleai/domain/sparring/service/KbServiceImpl.java

@@ -82,6 +82,14 @@ public class KbServiceImpl extends ServiceImpl<KbMapper, KbEntity> implements Kb
         return kbMapper.selectListByQueryAs(queryWrapper, KbResponseModel.class);
     }
 
+    @Override
+    public List<KbResponseModel> kbList(List<Integer> kbIds) {
+        QueryWrapper queryWrapper = QueryWrapper.create()
+                .where(KB_ENTITY.ID.in(kbIds).and(KB_ENTITY.DELETED.eq(0)));
+        return kbMapper.selectListByQueryAs(queryWrapper, KbResponseModel.class);
+    }
+
+
     @Override
     public KbResponseModel kbDetail(Integer id) {
         QueryWrapper queryWrapper = QueryWrapper.create()

src/main/java/cn/breeze/elleai/domain/sparring/service/KbTagService.java

@@ -25,6 +25,8 @@ public interface KbTagService extends IService<KbTagEntity> {
 
     List<KbTagResponseModel> kbTagList(KbTagRequestModel request);
 
+    List<KbTagResponseModel> kbTagList(List<Integer> tagIdList);
+
     KbTagResponseModel kbTagDetail(Integer id);
 
     void updateKbTagStatus(Integer id, Integer status);

src/main/java/cn/breeze/elleai/domain/sparring/service/KbTagServiceImpl.java

@@ -66,6 +66,13 @@ public class KbTagServiceImpl extends ServiceImpl<KbTagMapper, KbTagEntity> impl
         return kbTagMapper.selectListByQueryAs(queryWrapper, KbTagResponseModel.class);
     }
 
+    @Override
+    public List<KbTagResponseModel> kbTagList(List<Integer> tagIdList) {
+        QueryWrapper queryWrapper = QueryWrapper.create()
+                .where(KB_TAG_ENTITY.ID.in(tagIdList).and(KB_TAG_ENTITY.DELETED.eq(0)));
+        return kbTagMapper.selectListByQueryAs(queryWrapper, KbTagResponseModel.class);
+    }
+
     @Override
     public KbTagResponseModel kbTagDetail(Integer id) {
         QueryWrapper queryWrapper = QueryWrapper.create()