Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
gaoqr
2025-03-13 11:53:12 +08:00
parent 9d670df28f a9e0df265a
commit 6126a6e8ea
5 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/structure/ModelDetail.java
+1 -1
View File
@@ -19,7 +19,7 @@ import java.util.List;
public class ModelDetail {
@Schema(description = "造型ID")
private Integer id;
private Integer modelID;
@Schema(description = "刀路ID")
private Integer lineID;
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeRealize.java
+2
View File
@@ -1252,6 +1252,8 @@ public class ApiTypeRealize {
}
modelDetails.add(ModelDetail.builder()
.modelID(Integer.valueOf(model.getString(ProduceApiConstants.BPD_MODEL_ID)))
.lineID(Integer.valueOf(model.getString(ProduceApiConstants.BPD_MODEL_LINE_ID)))
.depth(Double.valueOf(model.getString(ProduceApiConstants.BPD_MODEL_DEPTH)))
.faceType(Integer.valueOf(model.getString(ProduceApiConstants.BPD_MODEL_FACE)))
.knifeName(model.getString(ProduceApiConstants.BPD_MODEL_TOOL_NO))
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/xml/XmlTypeRealize.java
+1 -1
View File
@@ -1327,7 +1327,7 @@ public class XmlTypeRealize {
subIDs = Arrays.stream(grooveXmlVO.getSubIDs().split(",")).map(String::valueOf).toArray(String[]::new);
}
return ModelDetail.builder()
.id(Integer.valueOf(grooveXmlVO.getId()))
.modelID(Integer.valueOf(grooveXmlVO.getId()))
.subIDs(subIDs)
.type(grooveXmlVO.getType())
.grooveFace(grooveXmlVO.getFace())
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/application-dev.yaml
+1 -1
View File
@@ -181,5 +181,5 @@ mybatis-plus:
api:
order:
apiOrderService:
url: https://www.leye.site/ # 生产环境
url: https://chenfeng.tech:7779/ # 生产环境
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/application-local.yaml
+1 -1
View File
@@ -160,5 +160,5 @@ mybatis-plus:
api:
order:
apiOrderService:
url: https://chenfeng.tech:7779/ # 开发环境 https://www.leye.site/ 生产环境
url: https://www.leye.site/ # 开发环境 https://www.leye.site/ 生产环境