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

BUGFIX:aida;

Browse Source
This commit is contained in:
shahaibo
2024-06-28 15:45:39 +08:00
parent bc240cd2ee
commit 4211bce256
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/ai/da/model/dto/DesignCollectionPrintElementDTO.java
View File

@@ -14,6 +14,8 @@ public class DesignCollectionPrintElementDTO {
@ApiModelProperty("design类型 用户design生成时候区别library和collection") @ApiModelProperty("design类型 用户design生成时候区别library和collection")
private String designType; private String designType;
private String level2Type;
@ApiModelProperty("是否pin 1 pin 0 不pin") @ApiModelProperty("是否pin 1 pin 0 不pin")
private Byte isPin; private Byte isPin;

3
src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java
View File

@@ -668,6 +668,9 @@ public class CollectionElementServiceImpl extends ServiceImpl<CollectionElementM
Generate byId = generateService.getById(o.getGenerateId()); Generate byId = generateService.getById(o.getGenerateId());
d.setAccountId(byId.getAccountId()); d.setAccountId(byId.getAccountId());
d.setLevel1Type(byId.getLevel1Type()); d.setLevel1Type(byId.getLevel1Type());
if (!StringUtils.isEmpty(byId.getLevel2Type())) {
d.setLevel2Type(byId.getLevel2Type());
}
d.setCreateDate(Date.from(o.getCreateDate().atZone(ZoneId.systemDefault()).toInstant())); d.setCreateDate(Date.from(o.getCreateDate().atZone(ZoneId.systemDefault()).toInstant()));
if (null != idToMap) { if (null != idToMap) {
DesignCollectionPrintElementDTO printDTO = idToMap.get(o.getId()); DesignCollectionPrintElementDTO printDTO = idToMap.get(o.getId());

3
src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java
View File

@@ -398,6 +398,8 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
vo.setCanvasUrl(minioUtil.getPresignedUrl(canvas.getUrl(), 24 * 60)); vo.setCanvasUrl(minioUtil.getPresignedUrl(canvas.getUrl(), 24 * 60));
vo.setLikeNum(redisUtil.getLikeCount(vo.getId())); vo.setLikeNum(redisUtil.getLikeCount(vo.getId()));
vo.setViewNums(redisUtil.getViewCount(vo.getId())); vo.setViewNums(redisUtil.getViewCount(vo.getId()));
Long accountId = vo.getAccountId();
vo.setUserName(accountMapper.selectById(accountId).getUserName());
return vo; return vo;
} }
return null; return null;
@@ -492,6 +494,7 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
designMapper.insert(design); designMapper.insert(design);
userLikeGroupNew.setCollectionId(collectionIdNew); userLikeGroupNew.setCollectionId(collectionIdNew);
userLikeGroupNew.setCreateDate(new Date());
userLikeGroupMapper.insert(userLikeGroupNew); userLikeGroupMapper.insert(userLikeGroupNew);
// List<TCollectionElementRelation> collectionElementRelationListNew = new ArrayList<>(); // List<TCollectionElementRelation> collectionElementRelationListNew = new ArrayList<>();
for (CollectionElement element : collectionElementListOld) { for (CollectionElement element : collectionElementListOld) {