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

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

Browse Source
This commit is contained in:
shahaibo
2024-06-20 10:31:13 +08:00
parent ad1fa0e4c2 c317942447
commit 6c0f65b801
6 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -252,7 +252,7 @@ public class ChatRobotServiceImpl implements ChatRobotService {
throw new BusinessException("chat-bot.interface.exception");
}
}
log.error("ChatRobot exception!");
log.error("ChatRobot exception! 请求异常：{}", response);
throw new BusinessException("chat-bot.interface.exception");
}

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

@@ -629,6 +629,7 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
if (!SysFileLevel2TypeEnum.BODY.getRealName().equals(detail.getType()) && designItemDetail.getPrintPath() != null) {
DesignItemDetailPrint print = new DesignItemDetailPrint();
print.setDesignItemDetailId(designItemDetail.getId());
print.setPrintType("print");
print.setPath(designItemDetail.getPrintPath());
print.setSingleOrOverall("overall");
print.setPosition("[0.0,0.0]");

7
src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
View File

@@ -529,7 +529,12 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> i
if (generateThroughImageTextDTO.getLevel2Type().equals(CollectionLevel2TypeEnum.SLOGAN.getRealName())){
if (StringUtil.isNullOrEmpty(generateThroughImageTextDTO.getSloganBase64())){
log.error("Printboard-Slogan模式下，slogan image为空");
throw new BusinessException("Slogan can not be empty!");
throw new BusinessException("slogan.image.cannot.be.empty");
}
if (StringUtil.isNullOrEmpty(generateThroughImageTextDTO.getText())){
log.error("Printboard-Slogan模式下，slogan text为空");
throw new BusinessException("slogan.style.cannot.be.empty");
}
times = 1;