update the code until 25 May 2023
This commit is contained in:
LiaoFJ
2023-05-25 14:58:38 +08:00
parent efb2a67b4c
commit 57009998a0
58 changed files with 273 additions and 17 deletions

View File

@@ -134,7 +134,7 @@ public class PythonService {
PythonToJavaApiOperationTypeEnum operationType = PythonToJavaApiOperationTypeEnum.uploadOf(operateType);
Assert.notNull(operationType, "unknown operateType " + operateType + "!");
String path = calculateFileUrl(operationType);
File generateFile = FileUtil.upload(file, path);
File generateFile = FileUtil.upload2(file, path);
String linuxDomain = fileProperties.getLinuxDomain();
if (!StringUtils.isEmpty(linuxDomain)) {
@@ -1274,6 +1274,9 @@ public class PythonService {
return null;
}
DesignPythonItemPrint print = CopyUtil.copyObject(printObject, DesignPythonItemPrint.class);
if(StringUtils.isEmpty(printObject.getPath())){
print.setPath("none");
}
if (StringUtils.isEmpty(clothesPath)
|| "none".equals(clothesPath)
|| CollectionUtils.isEmpty(printObject.getLocation())) {
@@ -1286,6 +1289,7 @@ public class PythonService {
location.set(0, location.get(0) * fileVO.getWidth());
location.set(1, location.get(1) * fileVO.getHigh());
});
log.info("本次print打点locations###{}###fileVO{}", locations, JSON.toJSONString(fileVO));
return print;
}