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

Merge branch 'dev/dev' into release/3.0

Browse Source
This commit is contained in:
xupei
2025-02-12 10:34:02 +08:00
parent 455e17d4b1 c66b794daa
commit f1a2495431
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1615,12 +1615,18 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
// designSinglePrintDTO.setIfSingle(Boolean.TRUE);
designItemDetailPrints.forEach(print -> {
// if (print.getSingleOrOverall().equals("single")) {
List<Float> scales;
try{
scales = JSONArray.parseArray(print.getScale(), Float.class);
}catch (JSONException e){
scales = Arrays.asList(Float.valueOf(print.getScale()), Float.valueOf(print.getScale()));
}
prints.add(new DesignSinglePrint(
print.getLevel2Type(),
minioUtil.getPreSignedUrl(print.getPath(), 24 * 60),
print.getPath(),
JSONArray.parseArray(print.getPosition(), Float.class),
JSONArray.parseArray(print.getScale(), Float.class),
scales,
print.getAngle(),
print.getPriority(),
print.getSingleOrOverall().equals("single") ? Boolean.TRUE : Boolean.FALSE));