diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/structure/ModelDetail.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/structure/ModelDetail.java index e08f1ce93..c422de529 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/structure/ModelDetail.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/structure/ModelDetail.java @@ -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; diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeRealize.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeRealize.java index d5e4af1c3..a15244ecd 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeRealize.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeRealize.java @@ -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)) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/xml/XmlTypeRealize.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/xml/XmlTypeRealize.java index ff6d89694..326d21608 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/xml/XmlTypeRealize.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/xml/XmlTypeRealize.java @@ -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()) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/application-dev.yaml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/application-dev.yaml index a83d29162..370fac806 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/application-dev.yaml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/application-dev.yaml @@ -181,5 +181,5 @@ mybatis-plus: api: order: apiOrderService: - url: https://www.leye.site/ # 生产环境 + url: https://chenfeng.tech:7779/ # 生产环境 diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/application-local.yaml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/application-local.yaml index 24c16ec11..1991bc8a6 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/application-local.yaml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/application-local.yaml @@ -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/ 生产环境