Merge branch 'dev/dev_xp' into dev/dev

This commit is contained in:
2025-02-12 10:14:17 +08:00

View File

@@ -1601,7 +1601,13 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
designSinglePrint.setPriority(detailPrint.getPriority());
designSinglePrint.setPath(minioUtil.getPreSignedUrl(detailPrint.getPath(), 24 * 60));
designSinglePrint.setMinIOPath(detailPrint.getPath());
designSinglePrint.setScale(JSONArray.parseArray(detailPrint.getScale(), Float.class));
List<Float> scales;
try{
scales = JSONArray.parseArray(detailPrint.getScale(), Float.class);
}catch (JSONException e){
scales = Arrays.asList(Float.valueOf(detailPrint.getScale()), Float.valueOf(detailPrint.getScale()));
}
designSinglePrint.setScale(scales);
designSinglePrint.setIfSingle(detailPrint.getSingleOrOverall().equals("single") ? Boolean.TRUE : Boolean.FALSE);
prints.add(designSinglePrint);
} else {