hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-07-25 08:25:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master-jdk21-ai' into master-jdk21-ai

Browse Source
This commit is contained in:
cherishsince
2024-05-31 14:06:49 +08:00
parent 27f052de0a b20129f7e4
commit bd9474994f
14 changed files with 133 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/client/MidjourneyProxyClient.java
View File

@ -9,6 +9,7 @@ import org.springframework.stereotype.Component;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.client.RestTemplate;
// TODO @fan：这个写到 starter-ai 里哈。搞个 MidjourneyApi，参考 https://github.com/spring-projects/spring-ai/blob/main/models/spring-ai-openai/src/main/java/org/springframework/ai/openai/api/OpenAiApi.java 的风格写哈
/**
* Midjourney Proxy 客户端
*

1
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/client/vo/MidjourneyImagineReqVO.java
View File

@ -6,6 +6,7 @@ import lombok.Data;
import java.util.List;
// TODO @fan：待定
/**
* Midjourney：Imagine 请求
*

1
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/client/vo/MidjourneySubmitCodeEnum.java
View File

@ -6,6 +6,7 @@ import lombok.Getter;
import java.util.List;
// TODO @fan：待定
/**
* Midjourney 提交任务 code 枚举
*

1
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/client/vo/MidjourneySubmitRespVO.java
View File

@ -5,6 +5,7 @@ import lombok.Data;
import java.util.Map;
// TODO @fan：待定
/**
* Midjourney：Imagine 请求
*

1
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/AiImageController.java
View File

@ -54,6 +54,7 @@ public class AiImageController {
// TODO @fan：建议把 dallDrawing、midjourney 融合成一个 draw 接口，异步绘制；然后返回一个 id 给前端；前端通过 get 接口轮询，直到获取到生成成功
// TODO @芋艿: 参数差异较大
// TODO @fan：直接参数平铺？写好注释，要么？
@Operation(summary = "dall2/dall3绘画", description = "openAi dall3是付费的!")
@PostMapping("/dall")
public CommonResult<Long> dall(@Validated @RequestBody AiImageDallReqVO req) {

1
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/AiImageMidjourneyImagineReqVO.java
View File

@ -7,6 +7,7 @@ import lombok.experimental.Accessors;
import java.util.List;
// TODO @fan：待定
/**
* midjourney req
*

23
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/music/vo/MusicDataVO.java
View File

@ -1,13 +1,17 @@
package cn.iocoder.yudao.module.ai.controller.admin.music.vo;
import cn.iocoder.yudao.framework.ai.core.model.suno.api.SunoApi;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.util.List;
import java.util.stream.Collectors;
/**
* 表示单个音乐数据的类
*/
@Data
public class MusicDataVO {
public class MusicDataVO {
/**
* 音乐数据的 ID
*/
@ -61,4 +65,21 @@ public class MusicDataVO {
* 音乐音频的风格
*/
private String style;
public static List<MusicDataVO> convertFrom(List<SunoApi.SunoResp.MusicData> musicDataList) {
return musicDataList.stream().map(musicData -> {
MusicDataVO musicDataVO = new MusicDataVO();
musicDataVO.setId(musicData.id());
musicDataVO.setTitle(musicData.title());
musicDataVO.setImageUrl(musicData.imageUrl());
musicDataVO.setLyric(musicData.lyric());
musicDataVO.setAudioUrl(musicData.audioUrl());
musicDataVO.setVideoUrl(musicData.videoUrl());
musicDataVO.setCreatedAt(musicData.createdAt());
musicDataVO.setModel(musicData.model());
musicDataVO.setPrompt(musicData.prompt());
musicDataVO.setStyle(musicData.style());
return musicDataVO;
}).collect(Collectors.toList());
}
}

11
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/music/vo/SunoRespVO.java
View File

@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.ai.controller.admin.music.vo;
import cn.iocoder.yudao.framework.ai.core.model.suno.api.SunoApi;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
@ -26,4 +27,14 @@ public class SunoRespVO {
*/
private List<MusicDataVO> data;
//把 SunoResp转为本vo类
public static SunoRespVO convertFrom(SunoApi.SunoResp sunoResp) {
SunoRespVO sunoRespVO = new SunoRespVO();
sunoRespVO.setSuccess(sunoResp.success());
sunoRespVO.setTaskId(sunoResp.taskId());
sunoRespVO.setData(MusicDataVO.convertFrom(sunoResp.data()));
return sunoRespVO;
}
}

12
yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/music/MusicServiceImpl.java
View File

@ -1,7 +1,6 @@
package cn.iocoder.yudao.module.ai.service.music;
import cn.iocoder.yudao.framework.ai.core.model.suno.api.SunoApi;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.ai.controller.admin.music.vo.SunoReqVO;
import cn.iocoder.yudao.module.ai.controller.admin.music.vo.SunoRespVO;
import lombok.RequiredArgsConstructor;
@ -19,7 +18,14 @@ public class MusicServiceImpl implements MusicService {
@Override
public SunoRespVO musicGen(SunoReqVO sunoReqVO) {
SunoApi.SunoRequest req = BeanUtils.toBean(sunoReqVO, SunoApi.SunoRequest.class);
return BeanUtils.toBean(sunoApi.musicGen(req), SunoRespVO.class);
SunoApi.SunoResp sunoResp = sunoApi.musicGen(new SunoApi.SunoReq(
sunoReqVO.getPrompt(),
sunoReqVO.getLyric(),
sunoReqVO.isCustom(),
sunoReqVO.getTitle(),
sunoReqVO.getStyle(),
sunoReqVO.getCallbackUrl()
));
return SunoRespVO.convertFrom(sunoResp);
}
}