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
This commit is contained in:
shahaibo
2023-10-12 10:28:22 +08:00
parent 95174707d8 6bbc8e3f1c
commit 6f01397d18
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1048,15 +1048,10 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
if (designItemDetailPrints.size() == 1){ if (designItemDetailPrints.size() == 1){
DesignItemDetailPrint detailPrint = designItemDetailPrints.get(0); DesignItemDetailPrint detailPrint = designItemDetailPrints.get(0);
DesignSinglePrint designSinglePrint = new DesignSinglePrint(); DesignSinglePrint designSinglePrint = new DesignSinglePrint();
// overall 模式下只需要返回印花url和scale designSinglePrintDTO.setIfSingle(detailPrint.getSingleOrOverall().equals("single") ? Boolean.TRUE : Boolean.FALSE);
if (detailPrint.getSingleOrOverall().equals("overall")){ designSinglePrint.setLocation(JSONArray.parseArray(detailPrint.getPosition(),Double.class));
designSinglePrintDTO.setIfSingle(Boolean.FALSE); designSinglePrint.setAngle(detailPrint.getAngle());
}else { designSinglePrint.setPriority(detailPrint.getPriority());
designSinglePrintDTO.setIfSingle(Boolean.TRUE);
designSinglePrint.setLocation(JSONArray.parseArray(detailPrint.getPosition(),Double.class));
designSinglePrint.setAngle(detailPrint.getAngle());
designSinglePrint.setPriority(detailPrint.getPriority());
}
designSinglePrint.setPath(minIoUtil.getPresignedUrl(detailPrint.getPath(),24 * 60)); designSinglePrint.setPath(minIoUtil.getPresignedUrl(detailPrint.getPath(),24 * 60));
designSinglePrint.setMinIOPath(detailPrint.getPath()); designSinglePrint.setMinIOPath(detailPrint.getPath());
designSinglePrint.setScale(detailPrint.getScale()); designSinglePrint.setScale(detailPrint.getScale());