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

BUGFIX: design generate处理;

Browse Source
This commit is contained in:
shahaibo
2023-11-02 14:00:02 +08:00
parent 77be2c7472
commit 85a815dddc
6 changed files with 27 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java
View File

@@ -5,20 +5,17 @@ package com.ai.da.service.impl;
import cn.hutool.core.exceptions.ExceptionUtil;
import com.ai.da.common.config.exception.BusinessException;
import com.ai.da.common.context.UserContext;
import com.ai.da.common.enums.CollectionLevel2TypeEnum;
import com.ai.da.common.enums.LibraryLevel1TypeEnum;
import com.ai.da.common.utils.CopyUtil;
import com.ai.da.common.utils.MD5Utils;
import com.ai.da.common.utils.MinioUtil;
import com.ai.da.mapper.LibraryMapper;
import com.ai.da.mapper.entity.ChatRobot;
import com.ai.da.mapper.entity.ChatRobotMapper;
import com.ai.da.mapper.ChatRobotMapper;
import com.ai.da.mapper.entity.Library;
import com.ai.da.model.dto.ChatFlushDTO;
import com.ai.da.model.dto.ChatRobotLibraryDTO;
import com.ai.da.model.dto.ChatSendDTO;
import com.ai.da.model.vo.AuthPrincipalVo;
import com.ai.da.model.vo.ChatRobotLibraryVO;
import com.ai.da.model.vo.ChatRobotVO;
import com.ai.da.service.ChatRobotService;
@@ -35,19 +32,12 @@ import okhttp3.*;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
import javax.annotation.Resource;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.net.HttpURLConnection;
import java.net.URL;
import java.time.LocalDateTime;
import java.util.*;
import java.util.concurrent.ExecutorService;

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

@@ -67,7 +67,8 @@ public class CollectionElementServiceImpl extends ServiceImpl<CollectionElementM
private LibraryService libraryService;
@Resource
private SysFileService sysFileService;
@Resource
private GenerateService generateService;
@Resource
private GenerateDetailMapper generateDetailMapper;
@Resource
@@ -584,6 +585,9 @@ public class CollectionElementServiceImpl extends ServiceImpl<CollectionElementM
private List<CollectionElement> covertGeneratesToCollections(List<GenerateDetail> generateDetailList, Map<Long, CollectionSketchDTO> idToMap) {
return CopyUtil.copyList(generateDetailList, CollectionElement.class, (o, d) -> {
Generate byId = generateService.getById(o.getGenerateId());
d.setAccountId(byId.getAccountId());
d.setLevel1Type(byId.getLevel1Type());
if (null != idToMap) {
CollectionSketchDTO sketchDTO = idToMap.get(o.getId());
d.setLevel2Type(sketchDTO.getLevel2Type());
@@ -603,6 +607,9 @@ public class CollectionElementServiceImpl extends ServiceImpl<CollectionElementM
private List<CollectionElement> covertGeneratesToPrintCollections(List<GenerateDetail> generateDetailList, Map<Long, DesignCollectionPrintElementDTO> idToMap) {
return CopyUtil.copyList(generateDetailList, CollectionElement.class, (o, d) -> {
Generate byId = generateService.getById(o.getGenerateId());
d.setAccountId(byId.getAccountId());
d.setLevel1Type(byId.getLevel1Type());
if (null != idToMap) {
DesignCollectionPrintElementDTO printDTO = idToMap.get(o.getId());
d.setHasPin(printDTO.getIsPin());

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

@@ -224,6 +224,9 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
.filter(f -> f.getLevel1Type().equals(CollectionLevel1TypeEnum.MOOD_BOARD.getRealName()))
.collect(Collectors.toList());
if (!CollectionUtils.isEmpty(newMoodboard)) {
if (CollectionUtils.isEmpty(elementVO.getMoodBoardElements())) {
elementVO.setMoodBoardElements(new ArrayList<>());
}
elementVO.getMoodBoardElements().addAll(newMoodboard);
}
}