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-06 10:28:17 +08:00
parent b6e33668ec e8cbe6f244
commit 3abb07cb3b
2 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/com/ai/da/python/PythonService.java
View File

@@ -1397,22 +1397,13 @@ public class PythonService {
// 设置印花的位置、大小、旋转角度
List<DesignSinglePrint> prints = printObject.getPrints();
prints.forEach(p -> {
if (printObject.getIfSingle().equals(Boolean.FALSE)){
p.getLocation().set(0,p.getLocation().get(0));
p.getLocation().set(1,p.getLocation().get(1));
scale.add(p.getScale());
paths.add(p.getMinIOPath());
location.add(p.getLocation());
angle.add(p.getAngle());
}else {
p.getLocation().set(0,p.getLocation().get(0));
p.getLocation().set(1,p.getLocation().get(1));
Integer priority = p.getPriority();
location.add(priority - 1, p.getLocation());
scale.add(priority - 1,p.getScale());
angle.add(priority - 1,p.getAngle());
paths.add(priority - 1,p.getMinIOPath());
}
p.getLocation().set(0,p.getLocation().get(0));
p.getLocation().set(1,p.getLocation().get(1));
Integer priority = p.getPriority();
location.add(priority - 1, p.getLocation());
scale.add(priority - 1,p.getScale());
angle.add(priority - 1,p.getAngle());
paths.add(priority - 1,p.getMinIOPath());
// log.info("本次print打点locations###{}###fileVO{}", p.getLocation(), JSON.toJSONString(fileVO));
});
print.setLocation(location);

12
src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java
View File

@@ -569,16 +569,14 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
}
DesignItemDetailPrint designItemDetailPrint = new DesignItemDetailPrint();
designItemDetailPrint.setDesignItemDetailId(designItemDetailTypeIdMap.get(designSingleItem.getType()));
designItemDetailPrint.setPath(print.getPath());
designItemDetailPrint.setPath(print.getMinIOPath());
designItemDetailPrint.setScale(print.getScale());
designItemDetailPrint.setSingleOrOverall(printObject.getIfSingle() ? "single" : "overall");
designItemDetailPrint.setCreateDate(LocalDateTime.now(ZoneId.of(timeZone)));
// single模式下才有position、angle和priority
if (designItemDetailPrint.getSingleOrOverall().equals("single")){
designItemDetailPrint.setPosition(print.getLocation().toString());
designItemDetailPrint.setAngle(print.getAngle());
designItemDetailPrint.setPriority(print.getPriority());
}
// single、overall模式下都有position、angle和priority
designItemDetailPrint.setPosition(print.getLocation().toString());
designItemDetailPrint.setAngle(print.getAngle());
designItemDetailPrint.setPriority(print.getPriority());
designItemDetailPrints.add(designItemDetailPrint);
});
}