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

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

Browse Source 
# Conflicts:
#	src/main/resources/messages_en.properties
This commit is contained in:
shahaibo
2023-11-07 11:42:37 +08:00
parent 008d0d626e 331490c447
commit c8fe8c27f8
21 changed files with 150 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/resources/mapper/GenerateDetailMapper.xml Normal file
View File

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ai.da.mapper.GenerateDetailMapper">
<select id="getLibraryIdThroughMD5" resultType="java.util.Map">
select a.library_id
from t_generate_detail a
left join t_generate b
on a.generate_id = b.id
where a.md5 = #{md5}
and a.is_like = 1
and b.level1_type = #{level1Type}
</select>
</mapper>

14
src/main/resources/messages_en.properties
View File

@@ -75,6 +75,11 @@ save.designItemDetail.failed=Save designItemDetail failed!
save.classification.failed=Save classification failed!
update.classification.failed=Update classification failed!
please.input.the.caption=Please input the caption!
please.choose.an.image=Please choose an image!
please.input.the.caption.and.choose.an.image=Please input the caption and choose an image!
duplicate.likes.are.not.allowed=Duplicate likes are not allowed!
layer.information.not.found=Layer information not found!
# 前端传参校验
singleOverall.cannot.be.empty=singleOverall cannot be empty!
colorBoards.cannot.be.empty=colorBoards cannot be empty!
@@ -139,4 +144,11 @@ path.cannot.be.empty=path cannot be empty!
classificationName.cannot.be.empty=classificationName cannot be empty!
classificationName.already.exists=ClassificationName already exists, please change it!
the.classification.you.deleted.has.associated.library=The classification you deleted has associated data, are you sure you want to delete it!
the.model.has.been.referenced.by.the.workspace=The model has been referenced by the workspace, are you sure you want to delete it!
the.model.has.been.referenced.by.the.workspace=The model has been referenced by the workspace, are you sure you want to delete it!
level2Type.cannot.be.empty=level2Type cannot be empty!
generateItem.does.not.exist=generateItem does not exist!
level1Type.does.not.match=level1Type does not match!
the.image.does.not.exist.please.reselect=the image does not exist, please reselect!
design.item.does.not.exist=design item does not exist!
layers.does.not.exists=layers does not exists!
unknown.generate.type=unknown generate type!