BUGFIX: 多个印花 不等比缩放适配历史数据
This commit is contained in:
@@ -1615,12 +1615,18 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
|
|||||||
// designSinglePrintDTO.setIfSingle(Boolean.TRUE);
|
// designSinglePrintDTO.setIfSingle(Boolean.TRUE);
|
||||||
designItemDetailPrints.forEach(print -> {
|
designItemDetailPrints.forEach(print -> {
|
||||||
// if (print.getSingleOrOverall().equals("single")) {
|
// 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(
|
prints.add(new DesignSinglePrint(
|
||||||
print.getLevel2Type(),
|
print.getLevel2Type(),
|
||||||
minioUtil.getPreSignedUrl(print.getPath(), 24 * 60),
|
minioUtil.getPreSignedUrl(print.getPath(), 24 * 60),
|
||||||
print.getPath(),
|
print.getPath(),
|
||||||
JSONArray.parseArray(print.getPosition(), Float.class),
|
JSONArray.parseArray(print.getPosition(), Float.class),
|
||||||
JSONArray.parseArray(print.getScale(), Float.class),
|
scales,
|
||||||
print.getAngle(),
|
print.getAngle(),
|
||||||
print.getPriority(),
|
print.getPriority(),
|
||||||
print.getSingleOrOverall().equals("single") ? Boolean.TRUE : Boolean.FALSE));
|
print.getSingleOrOverall().equals("single") ? Boolean.TRUE : Boolean.FALSE));
|
||||||
|
|||||||
Reference in New Issue
Block a user