From 05fb9cb0e3d2678e82048a171acbcffbdd702b59 Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 04 Feb 2026 10:58:02 +0800
Subject: [PATCH] fix(ai): 修复产品提示查询中公司ID为空的条件处理
---
src/main/java/cc/mrbird/febs/ai/service/impl/AiProductQuestionServiceImpl.java | 199 +++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 197 insertions(+), 2 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/ai/service/impl/AiProductQuestionServiceImpl.java b/src/main/java/cc/mrbird/febs/ai/service/impl/AiProductQuestionServiceImpl.java
index e640397..7c7d764 100644
--- a/src/main/java/cc/mrbird/febs/ai/service/impl/AiProductQuestionServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/ai/service/impl/AiProductQuestionServiceImpl.java
@@ -4,6 +4,7 @@
import cc.mrbird.febs.ai.mapper.AiProductQuestionJobMapper;
import cc.mrbird.febs.ai.mapper.AiProductQuestionMapper;
import cc.mrbird.febs.ai.req.AiProductQuestionAiDto;
+import cc.mrbird.febs.ai.service.AiProductCategoryService;
import cc.mrbird.febs.ai.service.AiProductQuestionItemService;
import cc.mrbird.febs.ai.service.AiProductQuestionService;
import cc.mrbird.febs.ai.service.AiService;
@@ -11,9 +12,17 @@
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.entity.QueryRequest;
import cc.mrbird.febs.common.exception.FebsException;
+import cc.mrbird.febs.common.utils.excl.ExcelSheetPO;
+import cc.mrbird.febs.common.utils.excl.ExcelUtil;
+import cc.mrbird.febs.common.utils.excl.ExcelVersion;
+import cc.mrbird.febs.common.utils.excl.ResponseHeadUtil;
+import cc.mrbird.febs.mall.dto.DeliverGoodsDto;
import cc.mrbird.febs.mall.entity.MallMember;
+import cc.mrbird.febs.mall.entity.MallOrderInfo;
+import cc.mrbird.febs.mall.entity.MallOrderItem;
import cc.mrbird.febs.rabbit.producter.AgentProducer;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.SecureUtil;
@@ -33,9 +42,15 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
-import java.util.Date;
-import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.URLEncoder;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* AI产品题目 Service实现类
@@ -51,6 +66,7 @@
private final AiProductQuestionMapper aiProductQuestionMapper;
private final AiProductQuestionJobMapper aiProductQuestionJobMapper;
private final AiProductQuestionItemService aiProductQuestionItemService;
+ private final AiProductCategoryService aiProductCategoryService;
private final AiService aiService;
private final AgentProducer agentProducer;
@@ -73,6 +89,20 @@
query.ne(AiProductQuestion::getState, 2);
query.orderByDesc(AiProductQuestion::getCreatedTime);
Page<AiProductQuestion> pages = aiProductQuestionMapper.selectPage(page, query);
+ List<AiProductQuestion> records = pages.getRecords();
+ if (CollUtil.isNotEmpty( records)){
+ //stream流操作records，获取全部的productCategoryId的set集合
+ Set<String> productCategoryIds = records.stream().map(AiProductQuestion::getProductCategoryId).collect(Collectors.toSet());
+ if(CollUtil.isNotEmpty( productCategoryIds)){
+ Map<String,AiProductCategory> map = aiProductCategoryService.selectMapByIds(productCategoryIds);
+ for (AiProductQuestion record : records){
+ AiProductCategory orDefault = map.getOrDefault(record.getProductCategoryId(), null);
+ if(ObjectUtil.isNotNull(orDefault)){
+ record.setProductCategoryName(orDefault.getName());
+ }
+ }
+ }
+ }
return pages;
}
@@ -215,6 +245,7 @@
Wrappers.lambdaUpdate(AiProductQuestion.class)
.set(AiProductQuestion::getState, 2)
.set(AiProductQuestion::getUpdatedTime, new Date())
+ .eq(AiProductQuestion::getState, 0)
.in(AiProductQuestion::getId, idList));
return new FebsResponse().success().message("操作成功");
}
@@ -400,6 +431,170 @@
}
}
+ @Override
+ public void exportProductQuestion(AiProductQuestion dto, HttpServletResponse response) {
+ try {
+ List<ExcelSheetPO> res = new ArrayList<>();
+ ExcelSheetPO orderSheet = new ExcelSheetPO();
+ String title = "单选题目列表";
+ orderSheet.setSheetName(title);
+ orderSheet.setTitle(title);
+ String[] header = {"答案ID", "题目ID", "题目", "答案", "正确答案", "解析"};
+ orderSheet.setHeaders(header);
+
+ QueryRequest request = new QueryRequest();
+ request.setPageNum(1);
+ request.setPageSize(9999);
+ String questionIds = dto.getIds();
+ List<String> ids = StrUtil.splitTrim(questionIds, ",");
+ List<AiProductQuestionItem> aiProductQuestionItems = aiProductQuestionItemService.getListByQuery(
+ Wrappers.lambdaQuery(AiProductQuestionItem.class)
+ .in(AiProductQuestionItem::getProductQuestionId, ids)
+ .orderByAsc(AiProductQuestionItem::getProductQuestionId)
+ );
+
+ List<List<Object>> list = new ArrayList<>();
+ if (CollUtil.isNotEmpty(aiProductQuestionItems)) {
+ for (AiProductQuestionItem item : aiProductQuestionItems) {
+ List<Object> temp = new ArrayList<>();
+ temp.add(item.getId());
+ temp.add(item.getProductQuestionId());
+ temp.add(item.getTitle());
+ temp.add(item.getAnswer());
+ temp.add(item.getCorrectAnswer() == 1 ? "是" : "否");
+ temp.add(item.getAnswerAnalysis());
+ list.add(temp);
+ }
+ }
+ orderSheet.setDataList(list);
+ res.add(orderSheet);
+
+ // 设置响应头
+ response = ResponseHeadUtil.setExcelHead(response);
+ String fileName = title + DateUtil.format(new Date(), "yyyyMMddHHmmss") + ".xlsx";
+ response.setHeader("Content-Disposition",
+ "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8"));
+
+ // 写入 Excel 文件
+ try (OutputStream os = response.getOutputStream()) {
+ ExcelUtil.createWorkbookAtOutStream(ExcelVersion.V2007, res, os, true);
+ }
+ } catch (Exception e) {
+ log.error("导出产品题目失败", e);
+ throw new RuntimeException("导出失败，请稍后重试");
+ }
+ }
+
+ @Override
+ @Transactional
+ public FebsResponse importDeliver(MultipartFile file) {
+ try {
+ if (file.isEmpty()) {
+ return new FebsResponse().fail();
+ }
+
+ String fileName = file.getOriginalFilename();
+ String dirPath = "/home/javaweb/webresource/ai/import/";
+
+ File saveFile = new File(new File(dirPath).getAbsolutePath() + File.separator + fileName);
+ if (!saveFile.exists()) {
+ if (!saveFile.getParentFile().exists()) {
+ saveFile.getParentFile().mkdirs();
+ }
+ }
+ file.transferTo(saveFile);
+
+ List<ExcelSheetPO> data = ExcelUtil.readExcel(saveFile, null, null);
+ if (CollUtil.isEmpty(data)) {
+ return new FebsResponse().fail();
+ }
+
+ List<List<Object>> dataList = data.get(0).getDataList();
+ // String[] header = {"答案ID", "题目ID", "题目", "答案", "正确答案", "解析"};
+ int questionItemIdIndex = -1;
+ int questionIdIndex = -1;
+ int titleIndex = -1;
+ int answerIndex = -1;
+ int correctAnswerIndex = -1;
+ int answerAnalysisIndex = -1;
+ for (int i = 1; i < dataList.size(); i++) {
+ List<Object> objects = dataList.get(i);
+
+ String questionItemId = "";
+ String questionId = "";
+ String title = "";
+ String answer = "";
+ Integer correctAnswer = 0;
+ String answerAnalysis = "";
+ for (int j = 0; j < objects.size(); j++) {
+ Object obj = objects.get(j);
+ if ("答案ID".equals(obj)) {
+ questionItemIdIndex = j;
+ }
+ if ("题目ID".equals(obj)) {
+ questionIdIndex = j;
+ }
+ if ("题目".equals(obj)) {
+ titleIndex = j;
+ }
+ if ("答案".equals(obj)) {
+ answerIndex = j;
+ }
+ if ("正确答案".equals(obj)) {
+ correctAnswerIndex = j;
+ }
+ if ("解析".equals(obj)) {
+ answerAnalysisIndex = j;
+ }
+ if (j == questionItemIdIndex) {
+ questionItemId = (String) objects.get(j);
+ }
+ if (j == questionIdIndex) {
+ questionId = (String) objects.get(j);
+ }
+ if (j == titleIndex) {
+ title = (String) objects.get(j);
+ }
+ if (j == answerIndex) {
+ answer = (String) objects.get(j);
+ }
+ if (j == correctAnswerIndex) {
+ correctAnswer = "是".equals((String) objects.get(j)) ? 1 : 0;
+ }
+ if (j == answerAnalysisIndex) {
+ answerAnalysis = (String) objects.get(j);
+ }
+ }
+
+ if (
+ StrUtil.isNotBlank(questionItemId)
+ && StrUtil.isNotBlank(questionId)
+ && StrUtil.isNotBlank(title)
+ && StrUtil.isNotBlank(answer)
+ ){
+ aiProductQuestionItemService.getBaseMapper().update(null,
+ Wrappers.lambdaUpdate(AiProductQuestionItem.class)
+ .set(AiProductQuestionItem::getTitle, title)
+ .set(AiProductQuestionItem::getAnswer, answer)
+ .set(AiProductQuestionItem::getCorrectAnswer, correctAnswer)
+ .set(AiProductQuestionItem::getAnswerAnalysis, answerAnalysis)
+ .set(AiProductQuestionItem::getUpdatedTime, new Date())
+ .eq(AiProductQuestionItem::getId, questionItemId)
+ .eq(AiProductQuestionItem::getProductQuestionId, questionId));
+ this.update(null,
+ Wrappers.lambdaUpdate(AiProductQuestion.class)
+ .set(AiProductQuestion::getTitle, title)
+ .eq(AiProductQuestion::getId, questionId));
+ }
+ }
+ return new FebsResponse().success();
+ } catch (IOException e) {
+ e.printStackTrace();
+ throw new RuntimeException("导入失败，请稍后重试");
+ }
+ }
+
+
/**
* 解析AI返回的包含问题和答案的JSON字符串
* @param aiResponse AI返回的原始响应字符串
--
Gitblit v1.9.1