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

Merge remote-tracking branch 'origin/dev/3.1_release_merge' into dev-ltx

Browse Source
This commit is contained in:
litianxiang
2026-02-04 13:21:19 +08:00
parent 22880d128d a252fdf7f9
commit 1286e84488
3 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/com/ai/da/python/PythonService.java
View File

@@ -2851,13 +2851,21 @@ public class PythonService {
gradientString = JSONObject.toJSONString(designSingleItem.getGradient()); gradientString = JSONObject.toJSONString(designSingleItem.getGradient());
} }
PrintToPython printToPython = resolveDesignSinglePrint(designSingleItem.getPrintObject().getPrints(), PrintToPython printToPython;
designSingleItem.getPartialDesign().getPartialDesignMinioPath()); if (designSingleIncludeLayersDTO.getDesignType().equals("default")){
resolveDesignElement(designSingleItem.getTrims(), printToPython); printToPython = resolveDesignSinglePrint(designSingleItem.getPrintObject().getPrints(),
designSingleItem.getPartialDesign().getPartialDesignMinioPath());
} else {
printToPython = null;
}
/*PrintToPython printToPython = resolveDesignSinglePrint(designSingleItem.getPrintObject().getPrints(),
designSingleItem.getPartialDesign().getPartialDesignMinioPath());*/
// resolveDesignElement(designSingleItem.getTrims(), printToPython);
log.info("组装参数【服装：{}的maskUrl: {}】",designSingleItem.getType(), designSingleItem.getMaskUrl()); log.info("组装参数【服装：{}的maskUrl: {}】",designSingleItem.getType(), designSingleItem.getMaskUrl());
String mergeImagePath = !StringUtil.isNullOrEmpty(printToPython.getPartial()) String partialDesign = designSingleItem.getPartialDesign().getPartialDesignMinioPath();
? printToPython.getPartial() : designSingleItem.getPath(); String mergeImagePath = !StringUtil.isNullOrEmpty(partialDesign)
? partialDesign : designSingleItem.getPath();
response.add(new DesignPythonItem( response.add(new DesignPythonItem(
designSingleItem.getType(), designSingleItem.getType(),
designSingleItem.getPath(), designSingleItem.getPath(),
@@ -2896,9 +2904,9 @@ public class PythonService {
private PrintToPython resolveDesignSinglePrint(List<DesignSinglePrint> printObject, String partialDesign) { private PrintToPython resolveDesignSinglePrint(List<DesignSinglePrint> printObject, String partialDesign) {
PrintToPython printToPython = new PrintToPython(); PrintToPython printToPython = new PrintToPython();
DesignPythonItemPrint printSingle = new DesignPythonItemPrint(); // DesignPythonItemPrint printSingle = new DesignPythonItemPrint();
DesignPythonItemPrint printOverall = new DesignPythonItemPrint(); DesignPythonItemPrint printOverall = new DesignPythonItemPrint();
printToPython.setSingle(printSingle); // printToPython.setSingle(printSingle);
printToPython.setOverall(printOverall); printToPython.setOverall(printOverall);
printToPython.setPartial(StringUtil.isNullOrEmpty(partialDesign) ? null : partialDesign); printToPython.setPartial(StringUtil.isNullOrEmpty(partialDesign) ? null : partialDesign);
if (Objects.isNull(printObject) || printObject.isEmpty()){ if (Objects.isNull(printObject) || printObject.isEmpty()){
@@ -2945,14 +2953,14 @@ public class PythonService {
} }
// log.info("本次print打点locations###{}###fileVO{}", p.getLocation(), JSON.toJSONString(fileVO)); // log.info("本次print打点locations###{}###fileVO{}", p.getLocation(), JSON.toJSONString(fileVO));
}); });
locationS.removeAll(Collections.singleton(null)); /*locationS.removeAll(Collections.singleton(null));
scaleS.removeAll(Collections.singleton(null)); scaleS.removeAll(Collections.singleton(null));
angleS.removeAll(Collections.singleton(null)); angleS.removeAll(Collections.singleton(null));
pathsS.removeAll(Collections.singleton(null)); pathsS.removeAll(Collections.singleton(null));
printSingle.setLocation(locationS); printSingle.setLocation(locationS);
printSingle.setPrint_scale_list(scaleS); printSingle.setPrint_scale_list(scaleS);
printSingle.setPrint_angle_list(angleS); printSingle.setPrint_angle_list(angleS);
printSingle.setPrint_path_list(pathsS); printSingle.setPrint_path_list(pathsS);*/
locationO.removeAll(Collections.singleton(null)); locationO.removeAll(Collections.singleton(null));
scaleO.removeAll(Collections.singleton(null)); scaleO.removeAll(Collections.singleton(null));

5
src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
View File

@@ -244,12 +244,13 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
AccountLoginVO response = CopyUtil.copyObject(account, AccountLoginVO.class); AccountLoginVO response = CopyUtil.copyObject(account, AccountLoginVO.class);
response.setEmail(account.getUserEmail()); response.setEmail(account.getUserEmail());
String token = LocalCacheUtils.getTokenCache(String.valueOf(account.getId())); String token = LocalCacheUtils.getTokenCache(String.valueOf(account.getId()));
if (StringUtils.isNotBlank(token)) { /*if (StringUtils.isNotBlank(token)) {
//用户已登入 //用户已登入
response.setToken(token); response.setToken(token);
} else { } else {
response.setToken(createAccountToken(account)); response.setToken(createAccountToken(account));
} }*/
response.setToken(createAccountToken(account));
response.setUserId(account.getId()); response.setUserId(account.getId());
response.setSystemUser(account.getSystemUser()); response.setSystemUser(account.getSystemUser());
// 设置头像 // 设置头像

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

@@ -4295,7 +4295,7 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
MotionModeEnum motionModeEnum = MotionModeEnum.of(poseTransformDTO.getMode()); MotionModeEnum motionModeEnum = MotionModeEnum.of(poseTransformDTO.getMode());
switch (motionModeEnum) { switch (motionModeEnum) {
case POSE_TO_VIDEO: case POSE_TO_VIDEO:
params.put("pose_id", poseTransformDTO.getPoseId()); params.put("pose_id", poseTransformDTO.getPoseId().toString());
params.put("image_url", poseTransformDTO.getProductImage()); params.put("image_url", poseTransformDTO.getProductImage());
break; break;
case PROMPT_TO_VIDEO: case PROMPT_TO_VIDEO: