diff --git a/src/main/java/com/ai/da/python/PythonService.java b/src/main/java/com/ai/da/python/PythonService.java index feb02dfe..0de18f81 100644 --- a/src/main/java/com/ai/da/python/PythonService.java +++ b/src/main/java/com/ai/da/python/PythonService.java @@ -2851,13 +2851,21 @@ public class PythonService { gradientString = JSONObject.toJSONString(designSingleItem.getGradient()); } - PrintToPython printToPython = resolveDesignSinglePrint(designSingleItem.getPrintObject().getPrints(), - designSingleItem.getPartialDesign().getPartialDesignMinioPath()); - resolveDesignElement(designSingleItem.getTrims(), printToPython); + PrintToPython printToPython; + if (designSingleIncludeLayersDTO.getDesignType().equals("default")){ + 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()); - String mergeImagePath = !StringUtil.isNullOrEmpty(printToPython.getPartial()) - ? printToPython.getPartial() : designSingleItem.getPath(); + String partialDesign = designSingleItem.getPartialDesign().getPartialDesignMinioPath(); + String mergeImagePath = !StringUtil.isNullOrEmpty(partialDesign) + ? partialDesign : designSingleItem.getPath(); response.add(new DesignPythonItem( designSingleItem.getType(), designSingleItem.getPath(), @@ -2896,9 +2904,9 @@ public class PythonService { private PrintToPython resolveDesignSinglePrint(List printObject, String partialDesign) { PrintToPython printToPython = new PrintToPython(); - DesignPythonItemPrint printSingle = new DesignPythonItemPrint(); +// DesignPythonItemPrint printSingle = new DesignPythonItemPrint(); DesignPythonItemPrint printOverall = new DesignPythonItemPrint(); - printToPython.setSingle(printSingle); +// printToPython.setSingle(printSingle); printToPython.setOverall(printOverall); printToPython.setPartial(StringUtil.isNullOrEmpty(partialDesign) ? null : partialDesign); if (Objects.isNull(printObject) || printObject.isEmpty()){ @@ -2945,14 +2953,14 @@ public class PythonService { } // 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)); angleS.removeAll(Collections.singleton(null)); pathsS.removeAll(Collections.singleton(null)); printSingle.setLocation(locationS); printSingle.setPrint_scale_list(scaleS); printSingle.setPrint_angle_list(angleS); - printSingle.setPrint_path_list(pathsS); + printSingle.setPrint_path_list(pathsS);*/ locationO.removeAll(Collections.singleton(null)); scaleO.removeAll(Collections.singleton(null)); diff --git a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java index c7543b1c..246f3e94 100644 --- a/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/AccountServiceImpl.java @@ -244,12 +244,13 @@ public class AccountServiceImpl extends ServiceImpl impl AccountLoginVO response = CopyUtil.copyObject(account, AccountLoginVO.class); response.setEmail(account.getUserEmail()); String token = LocalCacheUtils.getTokenCache(String.valueOf(account.getId())); - if (StringUtils.isNotBlank(token)) { + /*if (StringUtils.isNotBlank(token)) { //用户已登入 response.setToken(token); } else { response.setToken(createAccountToken(account)); - } + }*/ + response.setToken(createAccountToken(account)); response.setUserId(account.getId()); response.setSystemUser(account.getSystemUser()); // 设置头像 diff --git a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java index a3235f5c..8c25c7fc 100644 --- a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java @@ -4295,7 +4295,7 @@ public class GenerateServiceImpl extends ServiceImpl i MotionModeEnum motionModeEnum = MotionModeEnum.of(poseTransformDTO.getMode()); switch (motionModeEnum) { case POSE_TO_VIDEO: - params.put("pose_id", poseTransformDTO.getPoseId()); + params.put("pose_id", poseTransformDTO.getPoseId().toString()); params.put("image_url", poseTransformDTO.getProductImage()); break; case PROMPT_TO_VIDEO: