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

TASK:merge 模式返回mask

Browse Source
This commit is contained in:
xupei
2026-01-15 14:07:18 +08:00
parent 08b26872ff
commit 0787025151
2 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2507,7 +2507,7 @@ public class AccountServiceImpl extends ServiceImpl<AccountMapper, Account> impl
} }
// 判断当前账号的有效期是否与管理员同步 // 判断当前账号的有效期是否与管理员同步
if (subAccount.getValidEndTime() < adminAcc.getValidEndTime()){ if (Objects.isNull(subAccount.getValidEndTime()) || subAccount.getValidEndTime() < adminAcc.getValidEndTime()){
subAccount.setValidEndTime(adminAcc.getValidEndTime()); subAccount.setValidEndTime(adminAcc.getValidEndTime());
} }

13
src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java
View File

@@ -485,14 +485,6 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
.collect(Collectors.toMap(DesignSingleItemDTO::getPriority, DesignSingleItemDTO::getOffset)); .collect(Collectors.toMap(DesignSingleItemDTO::getPriority, DesignSingleItemDTO::getOffset));
} }
// 图层与mask对应关系，衣服前后片的mask是相同的
Map<Integer, String> priorityMask = null;
// 如果是merge模式 则使用入参中的mask
if (designType.equals("merge")) {
priorityMask = designSingleItemDTOList.stream()
.collect(Collectors.toMap(DesignSingleItemDTO::getPriority, DesignSingleItemDTO::getMaskMinioUrl));
}
List<TDesignPythonOutfitDetail> list = new ArrayList<>(); List<TDesignPythonOutfitDetail> list = new ArrayList<>();
for (int i = 0; i < layers.size(); i++) { for (int i = 0; i < layers.size(); i++) {
JSONObject jsonObject = layers.getJSONObject(i); JSONObject jsonObject = layers.getJSONObject(i);
@@ -514,12 +506,7 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
designPythonOutfitDetail.setImageUrl(jsonObject.getString("image_url")); designPythonOutfitDetail.setImageUrl(jsonObject.getString("image_url"));
designPythonOutfitDetail.setImageSize(jsonObject.getString("image_size")); designPythonOutfitDetail.setImageSize(jsonObject.getString("image_size"));
designPythonOutfitDetail.setImageCategory(jsonObject.getString("image_category")); designPythonOutfitDetail.setImageCategory(jsonObject.getString("image_category"));
if (designType.equals("merge")) {
designPythonOutfitDetail.setMaskUrl(priorityMask.get(Math.abs(priority)));
} else {
designPythonOutfitDetail.setMaskUrl(jsonObject.getString("mask_url")); designPythonOutfitDetail.setMaskUrl(jsonObject.getString("mask_url"));
}
designPythonOutfitDetail.setScale(Objects.isNull(jsonObject.getString("resize_scale")) ? "1.0" : jsonObject.getString("resize_scale")); designPythonOutfitDetail.setScale(Objects.isNull(jsonObject.getString("resize_scale")) ? "1.0" : jsonObject.getString("resize_scale"));
designPythonOutfitDetail.setUserId(userId); designPythonOutfitDetail.setUserId(userId);
if (priorityOffset != null && !priorityOffset.isEmpty()){ if (priorityOffset != null && !priorityOffset.isEmpty()){