From 85a815dddcdfa3438255ef127b797e18b5f30acf Mon Sep 17 00:00:00 2001 From: shahaibo <1023316923@qq.com> Date: Thu, 2 Nov 2023 14:00:02 +0800 Subject: [PATCH] =?UTF-8?q?BUGFIX:=20design=20generate=E5=A4=84=E7=90=86;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/{entity => }/ChatRobotMapper.java | 3 +- .../{Directory.java => Classification.java} | 35 +++++++------------ .../da/service/impl/ChatRobotServiceImpl.java | 12 +------ .../impl/CollectionElementServiceImpl.java | 9 ++++- .../ai/da/service/impl/DesignServiceImpl.java | 3 ++ src/main/resources/mapper/ChatRobotMapper.xml | 2 +- 6 files changed, 27 insertions(+), 37 deletions(-) rename src/main/java/com/ai/da/mapper/{entity => }/ChatRobotMapper.java (76%) rename src/main/java/com/ai/da/mapper/entity/{Directory.java => Classification.java} (60%) diff --git a/src/main/java/com/ai/da/mapper/entity/ChatRobotMapper.java b/src/main/java/com/ai/da/mapper/ChatRobotMapper.java similarity index 76% rename from src/main/java/com/ai/da/mapper/entity/ChatRobotMapper.java rename to src/main/java/com/ai/da/mapper/ChatRobotMapper.java index e8462d88..c404a90e 100644 --- a/src/main/java/com/ai/da/mapper/entity/ChatRobotMapper.java +++ b/src/main/java/com/ai/da/mapper/ChatRobotMapper.java @@ -1,6 +1,7 @@ -package com.ai.da.mapper.entity; +package com.ai.da.mapper; import com.ai.da.common.config.mybatis.plus.CommonMapper; +import com.ai.da.mapper.entity.ChatRobot; import java.util.List; diff --git a/src/main/java/com/ai/da/mapper/entity/Directory.java b/src/main/java/com/ai/da/mapper/entity/Classification.java similarity index 60% rename from src/main/java/com/ai/da/mapper/entity/Directory.java rename to src/main/java/com/ai/da/mapper/entity/Classification.java index 6db9e7cf..753c16f7 100644 --- a/src/main/java/com/ai/da/mapper/entity/Directory.java +++ b/src/main/java/com/ai/da/mapper/entity/Classification.java @@ -9,43 +9,32 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import java.io.Serializable; -import java.math.BigDecimal; +import java.time.LocalDateTime; import java.util.Date; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -@TableName("directory") -public class Directory implements Serializable { +@TableName("classification") +public class Classification implements Serializable { private static final long serialVersionUID = 1L; - /** - * ID - */ + @ApiModelProperty(value = "ID") @TableId(value = "id", type = IdType.AUTO) private Long id; - @ApiModelProperty(value = "分类名称") - private String directoryName; + private String classificationName; @ApiModelProperty(value = "分类类型") private String type; - @ApiModelProperty(value = "父菜单id") + @ApiModelProperty(value = "父菜单ID") private Long parentId; - /** - * 用户ID - */ + @ApiModelProperty(value = "用户ID") private Long userId; - - /** - * 创建时间 - */ - private Date createDate; - - /** - * 更新时间 - */ - private Date updateDate; - + @ApiModelProperty(value = "创建时间") + private LocalDateTime createTime; + @ApiModelProperty(value = "更新时间") + private LocalDateTime updateTime; + @ApiModelProperty(value = "是否删除1:是0:否") private Integer isDeleted; } diff --git a/src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java b/src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java index 32a38db6..593847e3 100644 --- a/src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/ChatRobotServiceImpl.java @@ -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; diff --git a/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java b/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java index 67651574..67417408 100644 --- a/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java @@ -67,7 +67,8 @@ public class CollectionElementServiceImpl extends ServiceImpl covertGeneratesToCollections(List generateDetailList, Map 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 covertGeneratesToPrintCollections(List generateDetailList, Map 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()); diff --git a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java index b81f1f04..b8fc092e 100644 --- a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java @@ -224,6 +224,9 @@ public class DesignServiceImpl extends ServiceImpl 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); } } diff --git a/src/main/resources/mapper/ChatRobotMapper.xml b/src/main/resources/mapper/ChatRobotMapper.xml index 0b2b9520..5a379683 100644 --- a/src/main/resources/mapper/ChatRobotMapper.xml +++ b/src/main/resources/mapper/ChatRobotMapper.xml @@ -1,6 +1,6 @@ - +