aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev/dev' into dev/dev_xp

Browse Source 
# Conflicts:
#	src/main/java/com/ai/da/service/GenerateService.java
This commit is contained in:
xupei
2024-06-25 16:59:41 +08:00
parent be001477ce 8c65592394
commit e614e3a07a
13 changed files with 339 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/com/ai/da/controller/SavedCollectionController.java
View File

@@ -196,9 +196,9 @@ public class SavedCollectionController {
@ApiOperation(value = "获取生成结果")
@PostMapping("/toProductImageResult")
public Response<List<GenerateResultVO>> getToProductImageResult(@Valid @RequestBody List<String> taskIdList) {
List<GenerateResultVO> generateResult = userLikeGroupService.getToProductImageResultList(taskIdList);
return Response.success(generateResult);
public Response<List<MagicToolResultVO>> getToProductImageResult(@Valid @RequestBody List<String> taskIdList) {
List<MagicToolResultVO> magicToolResultVOList = userLikeGroupService.getToProductImageResultList(taskIdList);
return Response.success(magicToolResultVOList);
}
@ApiOperation(value = "画布用户上传元素")
@@ -212,4 +212,17 @@ public class SavedCollectionController {
public Response<List<ToProductImageResult>> productImageLikeList(@Valid @RequestBody ToProductImageDTO toProductImageDTO) {
return Response.success(userLikeGroupService.productImageLikeList(toProductImageDTO));
}
@ApiOperation(value = "relight")
@PostMapping("/relight")
public Response<List<ToProductImageResult>> relight(@Valid @RequestBody ToProductImageDTO toProductImageDTO) {
return Response.success(userLikeGroupService.relight(toProductImageDTO));
}
@ApiOperation(value = "获取relight结果")
@PostMapping("/relightResult")
public Response<List<MagicToolResultVO>> getRelightResult(@Valid @RequestBody List<String> taskIdList) {
List<MagicToolResultVO> magicToolResultVOList = userLikeGroupService.getRelightResult(taskIdList);
return Response.success(magicToolResultVOList);
}
}