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

Merge remote-tracking branch 'origin/dev/dev' into dev/dev

Browse Source
This commit is contained in:
shahaibo
2025-06-26 11:53:53 +08:00
parent 6ad5d373d5 e048b75ed7
commit a7347c9dc0
6 changed files with 99 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/ai/da/service/impl/CollectionServiceImpl.java
View File

@@ -280,11 +280,7 @@ public class CollectionServiceImpl extends ServiceImpl<CollectionMapper, Collect
}
d.setRgbValue(o.getColorRgb());
// 渐变色
Gradient gradient = JSONObject.parseObject(o.getGradientString(), Gradient.class);
if (!Objects.isNull(gradient) && !StringUtil.isNullOrEmpty(gradient.getColorImg())){
gradient.setColorImg(null);
}
d.setGradient(gradient);
d.setGradient(JSONObject.parseObject(o.getGradientString(), Gradient.class));
});
}
}

1
src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
View File

@@ -2790,6 +2790,7 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
vo.setDesignOutfitId(tDesignPythonOutfit.getId());
vo.setDesignOutfitUrl(minioUtil.getPreSignedUrl(tDesignPythonOutfit.getDesignUrl(), 24 * 60));
vo.setDesignItemId(tDesignPythonOutfit.getDesignItemId());
vo.setResultType(CollectionType.DESIGN.getValue());
voList.add(vo);
}
result.setDesign(voList);

22
src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
View File

@@ -65,6 +65,7 @@ import java.util.regex.Pattern;
import static com.ai.da.common.enums.CollectionLevel1TypeEnum.*;
import static com.ai.da.common.enums.CreditsEventsEnum.TO_PRODUCT_IMAGE;
import static com.ai.da.common.enums.CreditsEventsEnum.TO_PRODUCT_IMAGE_FLUX;
@Slf4j
@Service
@@ -1366,7 +1367,7 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
*/
@Transactional(rollbackFor = Exception.class)
public GenerateResultVO sketchReconstructionGenerate(SketchReconstructionDTO sketchReconstructionDTO){
log.info("sketchReconstructionGenerate params: {}", sketchReconstructionDTO);
// log.info("sketchReconstructionGenerate params: {}", sketchReconstructionDTO);
Long accountId = UserContext.getUserHolder().getId();
// 1、线稿生成
@@ -2124,7 +2125,13 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
if (!StringUtil.isNullOrEmpty(imagePath)){
try {
String imageAsBase64 = minioUtil.getImageAsBase64(imagePath);
String imageAsBase64 = null;
if (func.equals(TO_PRODUCT_IMAGE_FLUX)){
imageAsBase64 = addWhiteBackground(imagePath);
}
if (StringUtil.isNullOrEmpty(imageAsBase64)){
imageAsBase64 = minioUtil.getImageAsBase64(imagePath);
}
requestBody.set("input_image", imageAsBase64);
} catch (IOException e) {
log.error("获取图片的base64格式失败，{}", String.valueOf(e));
@@ -2225,5 +2232,16 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
}
}
private String addWhiteBackground(String minioPath){
// 1、先通过后缀判断输入图片类型有没有透明通道
String extension = minioPath.substring(minioPath.lastIndexOf(".") + 1);
// 2、如果有，为其添加白色背景
if (extension.equals("png")){
return minioUtil.changeToWhiteBackground(minioPath);
}else {
log.info("图片 {} 没有透明通道, 不用添加白底", minioPath);
return null;
}
}
}

10
src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
View File

@@ -497,7 +497,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
ToProductImageResult toProductImageResult = new ToProductImageResult();
if (fluxTask){
taskId = generateService.flux(CreditsEventsEnum.TO_PRODUCT_IMAGE, sb.toString(), toProductElement.getUrl());
taskId = generateService.flux(creditsEventsEnum, sb.toString(), toProductElement.getUrl());
toProductImageResult.setModelName("flux");
toProductImageResult.setResultType("ToProductImage");
} else {
@@ -1045,7 +1045,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
ToProductImageResult toProductImageResult = new ToProductImageResult();
if (fluxTask){
taskId = generateService.flux(CreditsEventsEnum.RELIGHT_FLUX, s, toProductImageResult1.getUrl());
taskId = generateService.flux(creditsEventsEnum, s, toProductImageResult1.getUrl());
toProductImageResult.setModelName("flux");
toProductImageResult.setResultType("Relight");
} else {
@@ -1074,7 +1074,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
ToProductElement toProductElement = toProductElementMapper.selectById(toProductImageVO.getElementId());
ToProductImageResult toProductImageResult = new ToProductImageResult();
if (fluxTask){
taskId = generateService.flux(CreditsEventsEnum.RELIGHT, s, toProductElement.getUrl());
taskId = generateService.flux(CreditsEventsEnum.RELIGHT_FLUX, s, toProductElement.getUrl());
toProductImageResult.setModelName("flux");
toProductImageResult.setResultType("Relight");
} else {
@@ -2128,6 +2128,10 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
collectionElement.setHasPin((byte) 0);
collectionElement.setColorRgb(board.getRgbValue());
collectionElement.setMd5("0");
// 渐变色
if (!Objects.isNull(board.getGradient()) && !StringUtil.isNullOrEmpty(board.getGradient().getColorImg())){
board.getGradient().setColorImg(null);
}
collectionElement.setGradientString(JSON.toJSONString(board.getGradient()));
collectionElement.setCreateDate(new Date());
collectionElementMapper.insert(collectionElement);