From ee9f308d2ee204a87a474e69c7b8728ad34ade79 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Thu, 22 May 2025 11:58:41 +0800 Subject: [PATCH] =?UTF-8?q?webcad=E6=8B=86=E5=8D=95=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=8E=A5=E6=94=B6=E4=BE=A7=E9=9D=A2=E4=BA=8C=E7=BB=B4=E5=88=80?= =?UTF-8?q?=E8=B7=AF=E3=80=81es=20model=E6=9E=84=E5=BB=BA=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E5=88=97=E8=A1=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webcad/vo/WebCadDataBlockReqVO.java | 2 + .../WebCadOrderImportAsyncFactory.java | 65 ++++++++++++------- .../factory/WebCadOrderImportFactory.java | 65 ++++++++++++------- 3 files changed, 82 insertions(+), 50 deletions(-) diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/webcad/vo/WebCadDataBlockReqVO.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/webcad/vo/WebCadDataBlockReqVO.java index b29adf8f1..5094655d8 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/webcad/vo/WebCadDataBlockReqVO.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/controller/admin/orderImport/webcad/vo/WebCadDataBlockReqVO.java @@ -171,6 +171,8 @@ public class WebCadDataBlockReqVO { private List modelDetail; @JsonProperty("SideModelDetail") private List sideModelDetail; + @JsonProperty("Side2DModelDetail") + private List side2DModelDetail; @NoArgsConstructor @Data diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java index f24ab31b4..db70ec32a 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java @@ -893,7 +893,7 @@ public class WebCadOrderImportAsyncFactory { .holeDetail(getHoleDetail(pointInfo.getHoleDetail())) .sideHoleDetail(getSideHoleDetail(pointInfo.getSideHoleDetail())) .contourDetail(getContourDetail(pointInfo.getModelDetail())) - .sideDetail(getSideDetail(pointInfo.getSideModelDetail())) + .sideDetail(getSideDetail(pointInfo.getSideModelDetail(), pointInfo.getSide2DModelDetail())) .sideRemark(getSideRemark(plateRemark.getRemarks())) .boardType(block.getBoardTypeName()) .has2DModel(block.isHas2DModel()) @@ -946,8 +946,8 @@ public class WebCadOrderImportAsyncFactory { * @return */ private List getPointDetail(List cadPointDetailList) { - List pointDetails = new ArrayList<>(); if (CollUtil.isNotEmpty(cadPointDetailList)) { + List pointDetails = new ArrayList<>(); for (WebCadDataBlockReqVO.PointInfoDTO.PointDetailDTO cadPointDetail : cadPointDetailList) { PointDetail pointDetail = new PointDetail(); pointDetail.setId(String.valueOf(cadPointDetail.getPointID())); @@ -956,8 +956,9 @@ public class WebCadOrderImportAsyncFactory { pointDetail.setCurve(cadPointDetail.getCurve()); pointDetails.add(pointDetail); } + return pointDetails; } - return pointDetails; + return null; } /** @@ -967,8 +968,8 @@ public class WebCadOrderImportAsyncFactory { * @return */ private List getRawPointDetail(List orgPointDetail) { - List pointDetails = new ArrayList<>(); if (CollUtil.isNotEmpty(orgPointDetail)) { + List pointDetails = new ArrayList<>(); for (WebCadDataBlockReqVO.PointInfoDTO.OrgPointDetailDTO cadPointDetail : orgPointDetail) { PointDetail pointDetail = new PointDetail(); pointDetail.setId(String.valueOf(cadPointDetail.getPointID())); @@ -978,8 +979,9 @@ public class WebCadOrderImportAsyncFactory { pointDetail.setSealSize(BigDecimal.valueOf(cadPointDetail.getSealSize())); pointDetails.add(pointDetail); } + return pointDetails; } - return pointDetails; + return null; } @@ -990,8 +992,8 @@ public class WebCadOrderImportAsyncFactory { * @return */ private List getHoleDetail(List cadHoleDetailList) { - List holeDetails = new ArrayList<>(); if (CollUtil.isNotEmpty(cadHoleDetailList)) { + List holeDetails = new ArrayList<>(); for (WebCadDataBlockReqVO.PointInfoDTO.HoleDetailDTO cadHoleDetail : cadHoleDetailList) { HoleDetail holeDetail = new HoleDetail(); holeDetail.setId(String.valueOf(cadHoleDetail.getHoleID())); @@ -1003,8 +1005,9 @@ public class WebCadOrderImportAsyncFactory { holeDetail.setDepth(cadHoleDetail.getDepth()); holeDetails.add(holeDetail); } + return holeDetails; } - return holeDetails; + return null; } /** @@ -1014,8 +1017,8 @@ public class WebCadOrderImportAsyncFactory { * @return */ private List getSideHoleDetail(List cadSideHoleDetailList) { - List holeDetails = new ArrayList<>(); if (CollUtil.isNotEmpty(cadSideHoleDetailList)) { + List holeDetails = new ArrayList<>(); for (WebCadDataBlockReqVO.PointInfoDTO.SideHoleDetailDTO cadHoleDetail : cadSideHoleDetailList) { HoleDetail holeDetail = new HoleDetail(); holeDetail.setId(String.valueOf(cadHoleDetail.getHoleID())); @@ -1030,8 +1033,9 @@ public class WebCadOrderImportAsyncFactory { holeDetail.setDepth(cadHoleDetail.getDepth()); holeDetails.add(holeDetail); } + return holeDetails; } - return holeDetails; + return null; } /** @@ -1041,8 +1045,8 @@ public class WebCadOrderImportAsyncFactory { * @return */ private List getContourDetail(List cadModelDetailList) { - List modelDetails = new ArrayList<>(); if (CollUtil.isNotEmpty(cadModelDetailList)) { + List modelDetails = new ArrayList<>(); for (WebCadDataBlockReqVO.PointInfoDTO.ModelDetailDTO cadModelDetail : cadModelDetailList) { ModelDetail modelDetail = new ModelDetail(); modelDetail.setModelID(cadModelDetail.getModelID()); @@ -1072,8 +1076,9 @@ public class WebCadOrderImportAsyncFactory { modelDetails.add(modelDetail); } + return modelDetails; } - return modelDetails; + return null; } /** @@ -1083,8 +1088,8 @@ public class WebCadOrderImportAsyncFactory { * @return */ private List getModelDetailOffsetList(List cadOffSetList) { - List offSetLists = new ArrayList<>(); if (CollUtil.isNotEmpty(cadOffSetList)) { + List offSetLists = new ArrayList<>(); for (WebCadDataBlockReqVO.PointInfoDTO.ModelDetailDTO.OffSetListDTO cadOffset : cadOffSetList) { OffSetList offSet = new OffSetList(); offSet.setValue(cadOffset.getValue()); @@ -1095,8 +1100,9 @@ public class WebCadOrderImportAsyncFactory { offSetLists.add(offSet); } + return offSetLists; } - return offSetLists; + return null; } /** @@ -1106,10 +1112,12 @@ public class WebCadOrderImportAsyncFactory { * @return */ private List getModelDetailPointList(List cadPointList) { - List pointList = new ArrayList<>(); if (CollUtil.isNotEmpty(cadPointList)) { + List pointList = new ArrayList<>(); for (WebCadDataBlockReqVO.PointInfoDTO.ModelDetailDTO.PointListDTO cadPoint : cadPointList) { PointList point = new PointList(); + point.setLineId(cadPoint.getLineID()); + point.setPointId(cadPoint.getPointID()); point.setPointX(cadPoint.getPointX()); point.setPointY(cadPoint.getPointY()); point.setCurve(cadPoint.getCurve()); @@ -1118,8 +1126,9 @@ public class WebCadOrderImportAsyncFactory { pointList.add(point); } + return pointList; } - return pointList; + return null; } /** @@ -1129,14 +1138,13 @@ public class WebCadOrderImportAsyncFactory { * @return */ private List getOriginModelingOutlineList(WebCadDataBlockReqVO.PointInfoDTO.ModelDetailDTO.OriginModelingDTO.OutlineDTO cadOutline) { - List outlineList = new ArrayList<>(); if (ObjectUtil.isNull(cadOutline)) { - return outlineList; + return null; } - List buls = cadOutline.getBuls(); List pts = cadOutline.getPts(); if (CollUtil.isNotEmpty(pts) && CollUtil.isNotEmpty(buls)) { + List outlineList = new ArrayList<>(); for (int i = 0; i < pts.size(); i++) { IContourData iContourData = new IContourData(); Point point = new Point(); @@ -1146,8 +1154,9 @@ public class WebCadOrderImportAsyncFactory { iContourData.setBuls(buls.get(i)); outlineList.add(iContourData); } + return outlineList; } - return outlineList; + return null; } /** @@ -1156,12 +1165,16 @@ public class WebCadOrderImportAsyncFactory { * @param cadSideModelDetailList * @return */ - private List getSideDetail(List cadSideModelDetailList) { - List modelDetails = new ArrayList<>(); + private List getSideDetail(List cadSideModelDetailList, List cadSide2DModelDetail) { + // 合并侧面2v刀路列表 + cadSideModelDetailList.addAll(cadSide2DModelDetail); if (CollUtil.isNotEmpty(cadSideModelDetailList)) { + List modelDetails = new ArrayList<>(); + // 侧面造型和侧面2v刀路合并，序号从头计算不使用cad的 + int modelId = 1; for (WebCadDataBlockReqVO.PointInfoDTO.SideModelDetailDTO cadSideModelDetail : cadSideModelDetailList) { ModelDetail modelDetail = new ModelDetail(); - modelDetail.setModelID(cadSideModelDetail.getModelID()); + modelDetail.setModelID(modelId++); modelDetail.setLineID(cadSideModelDetail.getLineID()); modelDetail.setFaceType(cadSideModelDetail.getFace()); modelDetail.setDepth(cadSideModelDetail.getDepth()); @@ -1190,8 +1203,9 @@ public class WebCadOrderImportAsyncFactory { modelDetails.add(modelDetail); } + return modelDetails; } - return modelDetails; + return null; } /** @@ -1201,8 +1215,8 @@ public class WebCadOrderImportAsyncFactory { * @return */ private List> getSideModelingHoles(List cadSideHoles) { - List> icontourDataList = new ArrayList<>(); if (CollUtil.isNotEmpty(cadSideHoles)) { + List> icontourDataList = new ArrayList<>(); for (WebCadDataBlockReqVO.PointInfoDTO.ModelDetailDTO.OriginModelingDTO.HolesDTO sideHole : cadSideHoles) { List contourDatas = new ArrayList<>(); List pts = sideHole.getPts(); @@ -1217,8 +1231,9 @@ public class WebCadOrderImportAsyncFactory { } icontourDataList.add(contourDatas); } + return icontourDataList; } - return icontourDataList; + return null; } /** diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java index 2e8855d36..446402b51 100644 --- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java +++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java @@ -703,7 +703,7 @@ public class WebCadOrderImportFactory { .holeDetail(getHoleDetail(pointInfo.getHoleDetail())) .sideHoleDetail(getSideHoleDetail(pointInfo.getSideHoleDetail())) .contourDetail(getContourDetail(pointInfo.getModelDetail())) - .sideDetail(getSideDetail(pointInfo.getSideModelDetail())) + .sideDetail(getSideDetail(pointInfo.getSideModelDetail(), pointInfo.getSide2DModelDetail())) .sideRemark(getSideRemark(plateRemark.getRemarks())) .boardType(block.getBoardTypeName()) .has2DModel(block.isHas2DModel()) @@ -756,8 +756,8 @@ public class WebCadOrderImportFactory { * @return */ private List getPointDetail(List cadPointDetailList) { - List pointDetails = new ArrayList<>(); if (CollUtil.isNotEmpty(cadPointDetailList)) { + List pointDetails = new ArrayList<>(); for (WebCadDataBlockReqVO.PointInfoDTO.PointDetailDTO cadPointDetail : cadPointDetailList) { PointDetail pointDetail = new PointDetail(); pointDetail.setId(String.valueOf(cadPointDetail.getPointID())); @@ -766,8 +766,9 @@ public class WebCadOrderImportFactory { pointDetail.setCurve(cadPointDetail.getCurve()); pointDetails.add(pointDetail); } + return pointDetails; } - return pointDetails; + return null; } /** @@ -777,8 +778,8 @@ public class WebCadOrderImportFactory { * @return */ private List getRawPointDetail(List orgPointDetail) { - List pointDetails = new ArrayList<>(); if (CollUtil.isNotEmpty(orgPointDetail)) { + List pointDetails = new ArrayList<>(); for (WebCadDataBlockReqVO.PointInfoDTO.OrgPointDetailDTO cadPointDetail : orgPointDetail) { PointDetail pointDetail = new PointDetail(); pointDetail.setId(String.valueOf(cadPointDetail.getPointID())); @@ -788,8 +789,9 @@ public class WebCadOrderImportFactory { pointDetail.setSealSize(BigDecimal.valueOf(cadPointDetail.getSealSize())); pointDetails.add(pointDetail); } + return pointDetails; } - return pointDetails; + return null; } @@ -800,8 +802,8 @@ public class WebCadOrderImportFactory { * @return */ private List getHoleDetail(List cadHoleDetailList) { - List holeDetails = new ArrayList<>(); if (CollUtil.isNotEmpty(cadHoleDetailList)) { + List holeDetails = new ArrayList<>(); for (WebCadDataBlockReqVO.PointInfoDTO.HoleDetailDTO cadHoleDetail : cadHoleDetailList) { HoleDetail holeDetail = new HoleDetail(); holeDetail.setId(String.valueOf(cadHoleDetail.getHoleID())); @@ -813,8 +815,9 @@ public class WebCadOrderImportFactory { holeDetail.setDepth(cadHoleDetail.getDepth()); holeDetails.add(holeDetail); } + return holeDetails; } - return holeDetails; + return null; } /** @@ -824,8 +827,8 @@ public class WebCadOrderImportFactory { * @return */ private List getSideHoleDetail(List cadSideHoleDetailList) { - List holeDetails = new ArrayList<>(); if (CollUtil.isNotEmpty(cadSideHoleDetailList)) { + List holeDetails = new ArrayList<>(); for (WebCadDataBlockReqVO.PointInfoDTO.SideHoleDetailDTO cadHoleDetail : cadSideHoleDetailList) { HoleDetail holeDetail = new HoleDetail(); holeDetail.setId(String.valueOf(cadHoleDetail.getHoleID())); @@ -840,8 +843,9 @@ public class WebCadOrderImportFactory { holeDetail.setDepth(cadHoleDetail.getDepth()); holeDetails.add(holeDetail); } + return holeDetails; } - return holeDetails; + return null; } /** @@ -851,8 +855,8 @@ public class WebCadOrderImportFactory { * @return */ private List getContourDetail(List cadModelDetailList) { - List modelDetails = new ArrayList<>(); if (CollUtil.isNotEmpty(cadModelDetailList)) { + List modelDetails = new ArrayList<>(); for (WebCadDataBlockReqVO.PointInfoDTO.ModelDetailDTO cadModelDetail : cadModelDetailList) { ModelDetail modelDetail = new ModelDetail(); modelDetail.setModelID(cadModelDetail.getModelID()); @@ -882,8 +886,9 @@ public class WebCadOrderImportFactory { modelDetails.add(modelDetail); } + return modelDetails; } - return modelDetails; + return null; } /** @@ -893,8 +898,8 @@ public class WebCadOrderImportFactory { * @return */ private List getModelDetailOffsetList(List cadOffSetList) { - List offSetLists = new ArrayList<>(); if (CollUtil.isNotEmpty(cadOffSetList)) { + List offSetLists = new ArrayList<>(); for (WebCadDataBlockReqVO.PointInfoDTO.ModelDetailDTO.OffSetListDTO cadOffset : cadOffSetList) { OffSetList offSet = new OffSetList(); offSet.setValue(cadOffset.getValue()); @@ -905,8 +910,9 @@ public class WebCadOrderImportFactory { offSetLists.add(offSet); } + return offSetLists; } - return offSetLists; + return null; } /** @@ -916,10 +922,12 @@ public class WebCadOrderImportFactory { * @return */ private List getModelDetailPointList(List cadPointList) { - List pointList = new ArrayList<>(); if (CollUtil.isNotEmpty(cadPointList)) { + List pointList = new ArrayList<>(); for (WebCadDataBlockReqVO.PointInfoDTO.ModelDetailDTO.PointListDTO cadPoint : cadPointList) { PointList point = new PointList(); + point.setLineId(cadPoint.getLineID()); + point.setPointId(cadPoint.getPointID()); point.setPointX(cadPoint.getPointX()); point.setPointY(cadPoint.getPointY()); point.setCurve(cadPoint.getCurve()); @@ -928,8 +936,9 @@ public class WebCadOrderImportFactory { pointList.add(point); } + return pointList; } - return pointList; + return null; } /** @@ -939,14 +948,13 @@ public class WebCadOrderImportFactory { * @return */ private List getOriginModelingOutlineList(WebCadDataBlockReqVO.PointInfoDTO.ModelDetailDTO.OriginModelingDTO.OutlineDTO cadOutline) { - List outlineList = new ArrayList<>(); if (ObjectUtil.isNull(cadOutline)) { - return outlineList; + return null; } - List buls = cadOutline.getBuls(); List pts = cadOutline.getPts(); if (CollUtil.isNotEmpty(pts) && CollUtil.isNotEmpty(buls)) { + List outlineList = new ArrayList<>(); for (int i = 0; i < pts.size(); i++) { IContourData iContourData = new IContourData(); Point point = new Point(); @@ -956,8 +964,9 @@ public class WebCadOrderImportFactory { iContourData.setBuls(buls.get(i)); outlineList.add(iContourData); } + return outlineList; } - return outlineList; + return null; } /** @@ -966,12 +975,16 @@ public class WebCadOrderImportFactory { * @param cadSideModelDetailList * @return */ - private List getSideDetail(List cadSideModelDetailList) { - List modelDetails = new ArrayList<>(); + private List getSideDetail(List cadSideModelDetailList, List cadSide2DModelDetail) { + // 合并侧面2v刀路列表 + cadSideModelDetailList.addAll(cadSide2DModelDetail); if (CollUtil.isNotEmpty(cadSideModelDetailList)) { + List modelDetails = new ArrayList<>(); + // 侧面造型和侧面2v刀路合并，序号从头计算不使用cad的 + int modelId = 1; for (WebCadDataBlockReqVO.PointInfoDTO.SideModelDetailDTO cadSideModelDetail : cadSideModelDetailList) { ModelDetail modelDetail = new ModelDetail(); - modelDetail.setModelID(cadSideModelDetail.getModelID()); + modelDetail.setModelID(modelId++); modelDetail.setLineID(cadSideModelDetail.getLineID()); modelDetail.setFaceType(cadSideModelDetail.getFace()); modelDetail.setDepth(cadSideModelDetail.getDepth()); @@ -1000,8 +1013,9 @@ public class WebCadOrderImportFactory { modelDetails.add(modelDetail); } + return modelDetails; } - return modelDetails; + return null; } /** @@ -1011,8 +1025,8 @@ public class WebCadOrderImportFactory { * @return */ private List> getSideModelingHoles(List cadSideHoles) { - List> icontourDataList = new ArrayList<>(); if (CollUtil.isNotEmpty(cadSideHoles)) { + List> icontourDataList = new ArrayList<>(); for (WebCadDataBlockReqVO.PointInfoDTO.ModelDetailDTO.OriginModelingDTO.HolesDTO sideHole : cadSideHoles) { List contourDatas = new ArrayList<>(); List pts = sideHole.getPts(); @@ -1027,8 +1041,9 @@ public class WebCadOrderImportFactory { } icontourDataList.add(contourDatas); } + return icontourDataList; } - return icontourDataList; + return null; } /**