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

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

Browse Source
This commit is contained in:
xupei
2023-09-18 10:09:53 +08:00
parent 01cdbf99f9 9ba7049438
commit 146101eec4
4 changed files with 55 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,10 +6,7 @@ import com.ai.da.common.config.exception.BusinessException;
import com.ai.da.common.context.UserContext;
import com.ai.da.common.enums.CollectionLevel1TypeEnum;
import com.ai.da.common.enums.SysFileLevel2TypeEnum;
import com.ai.da.common.utils.CopyUtil;
import com.ai.da.common.utils.DateUtil;
import com.ai.da.common.utils.FileUtil;
import com.ai.da.common.utils.LocalCacheUtils;
import com.ai.da.common.utils.*;
import com.ai.da.mapper.DesignMapper;
import com.ai.da.mapper.entity.*;
import com.ai.da.mapper.entity.Collection;
@@ -178,7 +175,7 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
//保存collection
Long collectionId = (null == collectionIdParam) ?
collectionService.saveCollection(userInfo.getId(),designDTO.getTimeZone(),designDTO.getMoodTemplateId()) : collectionIdParam;
List<Long> elementIds =getElementId(elementVO);
List<Long> elementIds = getElementId(elementVO);
//批量关联element 到 collection
collectionElementService.relationCollection(elementIds,collectionId);
//library转化为collection(生成)
@@ -233,7 +230,7 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
//计算library
calculateLibraryAndSysFile(designDTO,elementVO,userInfo);
//组装design入参
DesignPythonObjects pythonObjects =pythonService.covertDesignParam(designDTO.getSystemScale(),
DesignPythonObjects pythonObjects = pythonService.covertDesignParam(designDTO.getSystemScale(),
designDTO.getSingleOverall(),designDTO.getSwitchCategory(),elementVO);
//缓存保存的文件 方便后面处理进度问题
setDesignProcess(userInfo.getId(),pythonObjects);
@@ -344,6 +341,9 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
return object.getBasic().getSave_name();}).collect(Collectors.toList());
LocalCacheUtils.setDesignProcessCache(userId,saveNames);
}
@Resource
private MinioUtil minIoUtil;
private DesignCollectionVO savePythonDesignItemAndDetail(DesignPythonObjects pythonObjects
,Long designId,Long collectionId,AuthPrincipalVo userInfo,String timeZone, JSONObject responseJSONObject){
DesignCollectionVO response = new DesignCollectionVO();
@@ -352,6 +352,9 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
List<DesignCollectionItemVO> designCollectionItems = Lists.newArrayList();
response.setDesignCollectionItems(designCollectionItems);
JSONObject data = responseJSONObject.getJSONObject("data");
if (data == null) {
throw new BusinessException("python response data is null");
}
for (int i = 0; i < pythonObjects.getObjects().size(); i++) {
DesignPythonObject item = pythonObjects.getObjects().get(i);
DesignItem designItem = new DesignItem();
@@ -385,7 +388,7 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
designPythonOutfitDetail.setDesignPythonOutfitId(designPythonOutfit.getId());
JSONArray position = jsonObject.getJSONArray("position");
if (position != null && !CollectionUtils.isEmpty(position)) {
StringBuilder builder = null;
StringBuilder builder = new StringBuilder();
for (int i2 = 0; i2 < position.size(); i2++) {
if (i2 != position.size() - 1) {
builder.append(position.getInteger(i2)).append(",");
@@ -397,7 +400,7 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
}
JSONArray imageSize = jsonObject.getJSONArray("image_size");
if (imageSize != null && !CollectionUtils.isEmpty(position)) {
StringBuilder builder = null;
StringBuilder builder = new StringBuilder();
for (int i2 = 0; i2 < imageSize.size(); i2++) {
if (i2 != imageSize.size() - 1) {
builder.append(imageSize.getInteger(i2)).append(",");
@@ -418,7 +421,7 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
designCollectionItemVO.setDesignItemId(designItemId);
designCollectionItemVO.setDesignItemUrl(designItem.getDesignUrl());
designCollectionItemVO.setDesignOutfitId(designPythonOutfit.getId());
designCollectionItemVO.setDesignOutfitUrl(endpoint + "/" + bucketName + "/" + designPythonOutfit.getDesignUrl());
designCollectionItemVO.setDesignOutfitUrl(minIoUtil.getPresignedUrl(bucketName, designPythonOutfit.getDesignUrl(), 5));
//response
designCollectionItems.add(designCollectionItemVO);