mirror of
https://gitcode.com/ageerle/ruoyi-ai.git
synced 2026-03-31 05:23:45 +08:00
人机交互节点逻辑修改
This commit is contained in:
zhang
@@ -8,16 +8,16 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import jakarta.servlet.http.HttpServletResponse;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import okhttp3.*;
|
||||
import org.ruoyi.common.core.constant.CacheNames;
|
||||
import org.ruoyi.common.core.exception.ServiceException;
|
||||
import org.ruoyi.common.core.service.ConfigService;
|
||||
import org.ruoyi.common.core.service.OssService;
|
||||
import org.ruoyi.common.core.utils.MapstructUtils;
|
||||
import org.ruoyi.common.core.utils.SpringUtils;
|
||||
import org.ruoyi.common.core.utils.StreamUtils;
|
||||
import org.ruoyi.common.core.utils.StringUtils;
|
||||
import org.ruoyi.common.core.utils.file.FileUtils;
|
||||
import org.ruoyi.common.oss.core.OssClient;
|
||||
import org.ruoyi.common.oss.entity.UploadResult;
|
||||
import org.ruoyi.common.oss.enumd.AccessPolicyType;
|
||||
import org.ruoyi.common.oss.factory.OssFactory;
|
||||
import org.ruoyi.core.page.PageQuery;
|
||||
@@ -27,12 +27,15 @@ import org.ruoyi.system.domain.bo.SysOssBo;
|
||||
import org.ruoyi.system.domain.vo.SysOssVo;
|
||||
import org.ruoyi.system.mapper.SysOssMapper;
|
||||
import org.ruoyi.system.service.ISysOssService;
|
||||
import org.ruoyi.system.utils.QwenFileUploadUtils;
|
||||
import org.springframework.beans.BeanUtils;
|
||||
import org.springframework.cache.annotation.Cacheable;
|
||||
import org.springframework.http.MediaType;
|
||||
import org.springframework.mock.web.MockMultipartFile;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.util.*;
|
||||
@@ -48,6 +51,29 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
|
||||
|
||||
private final SysOssMapper baseMapper;
|
||||
|
||||
private final ConfigService configService;
|
||||
|
||||
// 文档解析判断前缀
|
||||
private static final String FILE_ID_PREFIX = "fileid://";
|
||||
|
||||
// 服务名称
|
||||
private static final String DASH_SCOPE = "Qwen";
|
||||
|
||||
// 默认服务
|
||||
private static final String CATEGORY = "file";
|
||||
|
||||
// apiKey 配置名称
|
||||
private static final String CONFIG_NAME_KEY = "apiKey";
|
||||
|
||||
// apiHost 配置名称
|
||||
private static final String CONFIG_NAME_URL = "apiHost";
|
||||
|
||||
// 默认密钥
|
||||
private static String API_KEY = "Bearer sk-579b7e20e19147469945a537a614b38a";
|
||||
|
||||
// 默认api路径地址
|
||||
private static String API_HOST = "https://dashscope.aliyuncs.com/compatible-mode/v1/files";
|
||||
|
||||
@Override
|
||||
public TableDataInfo<SysOssVo> queryPageList(SysOssBo bo, PageQuery pageQuery) {
|
||||
LambdaQueryWrapper<SysOss> lqw = buildQueryWrapper(bo);
|
||||
@@ -161,26 +187,41 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
|
||||
|
||||
@Override
|
||||
public SysOssVo upload(MultipartFile file) {
|
||||
String originalfileName = file.getOriginalFilename();
|
||||
String suffix = StringUtils.substring(originalfileName, originalfileName.lastIndexOf("."),
|
||||
originalfileName.length());
|
||||
OssClient storage = OssFactory.instance();
|
||||
UploadResult uploadResult;
|
||||
String originalName = file.getOriginalFilename();
|
||||
int lastDotIndex = originalName != null ? originalName.lastIndexOf(".") : -1;
|
||||
String prefix = lastDotIndex > 0 ? "" : originalName.substring(0, lastDotIndex);
|
||||
String suffix = lastDotIndex > 0 ? "" : originalName.substring(lastDotIndex);
|
||||
File tempFile = null;
|
||||
try {
|
||||
uploadResult = storage.uploadSuffix(file.getBytes(), suffix, file.getContentType());
|
||||
// 创建临时文件来处理MultipartFile
|
||||
tempFile = File.createTempFile("upload_", suffix);
|
||||
file.transferTo(tempFile);
|
||||
// 获取配置
|
||||
initConfig();
|
||||
// 使用工具类上传文件到阿里云
|
||||
String fileId = QwenFileUploadUtils.uploadFile(tempFile, API_HOST, API_KEY);
|
||||
if (StringUtils.isEmpty(fileId)) {
|
||||
throw new ServiceException("文件上传失败，未获取到fileId");
|
||||
}
|
||||
// 保存文件信息到数据库
|
||||
SysOss oss = new SysOss();
|
||||
oss.setUrl(FILE_ID_PREFIX + fileId);
|
||||
oss.setFileSuffix(suffix);
|
||||
oss.setFileName(prefix);
|
||||
oss.setOriginalName(originalName);
|
||||
oss.setService(DASH_SCOPE);
|
||||
baseMapper.insert(oss);
|
||||
SysOssVo sysOssVo = new SysOssVo();
|
||||
BeanUtils.copyProperties(oss, sysOssVo);
|
||||
return sysOssVo;
|
||||
} catch (IOException e) {
|
||||
throw new ServiceException(e.getMessage());
|
||||
throw new ServiceException("文件上传失败: " + e.getMessage());
|
||||
} finally {
|
||||
// 删除临时文件
|
||||
if (tempFile != null) {
|
||||
tempFile.delete();
|
||||
}
|
||||
}
|
||||
// 保存文件信息
|
||||
SysOss oss = new SysOss();
|
||||
oss.setUrl(uploadResult.getUrl());
|
||||
oss.setFileSuffix(suffix);
|
||||
oss.setFileName(uploadResult.getFilename());
|
||||
oss.setOriginalName(originalfileName);
|
||||
oss.setService(storage.getConfigKey());
|
||||
baseMapper.insert(oss);
|
||||
SysOssVo sysOssVo = MapstructUtils.convert(oss, SysOssVo.class);
|
||||
return this.matchingUrl(sysOssVo);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -256,4 +297,20 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
|
||||
throw new ServiceException("删除文件失败: " + e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 初始化配置并返回API密钥和主机
|
||||
*/
|
||||
private void initConfig() {
|
||||
String apiKey = configService.getConfigValue(CATEGORY, CONFIG_NAME_KEY);
|
||||
if (StringUtils.isEmpty(apiKey)) {
|
||||
throw new ServiceException("请先配置Qwen上传文件相关API_KEY");
|
||||
}
|
||||
API_KEY = apiKey;
|
||||
String apiHost = configService.getConfigValue(CATEGORY, CONFIG_NAME_URL);
|
||||
if (StringUtils.isEmpty(apiHost)) {
|
||||
throw new ServiceException("请先配置Qwen上传文件相关API_HOST");
|
||||
}
|
||||
API_HOST = apiHost;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,53 @@
|
||||
package org.ruoyi.system.utils;
|
||||
import okhttp3.MediaType;
|
||||
import okhttp3.MultipartBody;
|
||||
import okhttp3.OkHttpClient;
|
||||
import okhttp3.Request;
|
||||
import okhttp3.RequestBody;
|
||||
import okhttp3.Response;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import org.ruoyi.common.core.utils.StringUtils;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.rmi.ServerException;
|
||||
|
||||
/***
|
||||
* 千问上传文件工具类
|
||||
*/
|
||||
public class QwenFileUploadUtils {
|
||||
|
||||
// 上传本地文件
|
||||
public static String uploadFile(File file, String apiHost, String apiKey) throws IOException {
|
||||
OkHttpClient client = new OkHttpClient();
|
||||
|
||||
// 构建 multipart/form-data 请求体（千问要求的格式）
|
||||
RequestBody requestBody = new MultipartBody.Builder()
|
||||
.setType(MultipartBody.FORM)
|
||||
.addFormDataPart("file", file.getName(), // 参数名必须为 file
|
||||
RequestBody.create(MediaType.parse("application/octet-stream"), file))
|
||||
.addFormDataPart("purpose", "file-extract") // 必须为 file-extract，文档解析专用
|
||||
.build();
|
||||
|
||||
// 构建请求（必须为 POST 方法）
|
||||
Request request = new Request.Builder()
|
||||
.url(apiHost)
|
||||
.post(requestBody)
|
||||
.addHeader("Authorization", apiKey) // 认证头格式正确
|
||||
.build();
|
||||
|
||||
// 发送请求并解析 fileId
|
||||
try (Response response = client.newCall(request).execute()) {
|
||||
if (!response.isSuccessful()) {
|
||||
throw new ServerException("上传失败：" + response.code() + " " + response.message());
|
||||
}
|
||||
// 解析响应体，获取 fileId
|
||||
String responseBody = response.body().string();
|
||||
if (StringUtils.isEmpty(responseBody)){
|
||||
throw new ServerException("上传失败：响应体为空");
|
||||
}
|
||||
JSONObject jsonObject = JSONObject.parseObject(responseBody);
|
||||
return jsonObject.getString("id"); // 千问返回的 fileId
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user