From 4fd28c58da36ed29909a5e267b4e0b0c2e7e11f5 Mon Sep 17 00:00:00 2001 From: lym <1994302445@qq.com> Date: Thu, 10 Oct 2024 09:19:40 +0800 Subject: [PATCH] =?UTF-8?q?xml=E6=95=B0=E6=8D=AE=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/order/OrderServiceImpl.java | 1 + .../deviseData/structure/PlateDetail.java | 6 +- .../admin/api/webcad/ApiTypeRealize.java | 7 ++- .../admin/files/xml/VO/HoleXmlVO.java | 10 +-- .../admin/files/xml/XmlTypeRealize.java | 62 ++++++++++++------- 5 files changed, 52 insertions(+), 34 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java index ec90f355f..2c02e1bbb 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java @@ -574,6 +574,7 @@ public class OrderServiceImpl implements OrderService { List orderModelDOs = BeanUtils.toBean(plateDetail, OrderModelDO.class); if (orderModelDOs.size() > 0) { orderModelDOs.forEach(orderModelDO -> orderModelDO.setOrderId(orderDO.getId())); + System.out.println("----" + orderModelDOs); orderInputProcessor.batchSaveModel(orderModelDOs); } } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/structure/PlateDetail.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/structure/PlateDetail.java index 153fbac83..7b4e6c76f 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/structure/PlateDetail.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/structure/PlateDetail.java @@ -112,9 +112,9 @@ public class PlateDetail{ private List sideHoleDetail;//侧面孔明细 // 备注 - private Map plateRemark;// 板件备注 (生产数据接口中） - private Map sideRemark;// 封边备注 - private JSONObject plateExtraRemark;// 板材扩展备注 + private Map plateRemark;// 板件备注 (生产数据接口中）（不用） + private Map sideRemark;// 板边备注 + private JSONObject plateExtraRemark;// 板材扩展备注 (不含板件的备注) private String extraRemark; // 扩展备注(包含铰链备注、订单板件流水号)（板材明细中） private String specialRemarkDei; // 特殊备注(Json字符串) 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 188c24c3a..b38c8e4c1 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 @@ -795,9 +795,12 @@ public class ApiTypeRealize { .setThroughModelCount(Double.valueOf(block.getJSONObject("ExtraRemark").getJSONObject("extra").getString("throughModelCount"))) .setHas2DModel(Boolean.valueOf(block.getJSONObject("ExtraRemark").getJSONObject("extra").getString("has2DModel"))) .setHas3DModel(Boolean.valueOf(block.getJSONObject("ExtraRemark").getJSONObject("extra").getString("has3DModel"))) - .setPlateRemark(remarkToMap(block)) +// .setPlateRemark(remarkToMap(block)) +// .setPlateExtraRemark(block.getJSONObject("ExtraRemark")) +// .setSideRemark(edgeRemarkToMap(block.getJSONObject("ExtraRemark").getJSONObject("extra"))); +// .setPlateRemark(remarkToMap(block)) .setPlateExtraRemark(block.getJSONObject("ExtraRemark")) - .setSideRemark(edgeRemarkToMap(block.getJSONObject("ExtraRemark").getJSONObject("extra"))); + .setSideRemark(remarkToMap(block)); } plateDetails.put(block.getLong("BlockNo"), plateDetail); } 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/VO/HoleXmlVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/xml/VO/HoleXmlVO.java index b7a0a3187..61e29dbdd 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/xml/VO/HoleXmlVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/xml/VO/HoleXmlVO.java @@ -123,9 +123,9 @@ public class HoleXmlVO implements Serializable { // 是否不要 - @XmlElement(name = "Begin") - private PointBeginXmlVO pointBeginXmlVO; - - @XmlElement(name = "End") - private PointEndXmlVO pointEndXmlVO; +// @XmlElement(name = "Begin") +// private PointBeginXmlVO pointBeginXmlVO; +// +// @XmlElement(name = "End") +// private PointEndXmlVO pointEndXmlVO; } 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 4738426b5..56abe1de6 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 @@ -80,6 +80,7 @@ public class XmlTypeRealize { if (roomXmlVOS != null && roomXmlVOS.getRoomXmlVOList() != null && roomXmlVOS.getRoomXmlVOList().size() > 0) { for (RoomXmlVO roomXmlVO : roomXmlVOS.getRoomXmlVOList()) { basePositions.put(roomXmlVO.getCode(), BasePosition.builder() + .basePointX(Double.valueOf(roomXmlVO.getBasePointX())) .basePointY(Double.valueOf(roomXmlVO.getBasePointY())) .basePointZ(Double.valueOf(roomXmlVO.getBasePointZ())) @@ -186,7 +187,7 @@ public class XmlTypeRealize { List goodsDOs = new ArrayList<>(); List plateDOs = new ArrayList<>(); - List plateDetail = null; + List plateDetail = new ArrayList<>(); // 房间柜体 Map> roomInfos = bodyInfoChange(orderXmlVO.getRoomXmlVOS(), orderId, organId); // roomInfos 这个在跟着一起变 @@ -404,8 +405,8 @@ public class XmlTypeRealize { // 小板信息 // plateDetail = plateInfoChange(plateXmlVO.getBlockXmlVOS(), orderId, goodsDO.getId(), organId, roomInfos, groupInfos, partsInfos, itemInfos, plateDOs, boxBasePositions, roomBasePositions); - plateDetail = plateInfoChange(organId, orderId, goodsId, plateXmlVO.getBlockXmlVOS(), plateDOs, itemInfos, partsDOInfos, roomInfos, groupInfos, boxBasePositions, roomBasePositions); - + plateInfoChange(plateDetail, organId, orderId, goodsId, plateXmlVO.getBlockXmlVOS(), plateDOs, itemInfos, partsDOInfos, roomInfos, groupInfos, boxBasePositions, roomBasePositions); +// plateDetail.add(plateInfoChange(organId, orderId, goodsId, plateXmlVO.getBlockXmlVOS(), plateDOs, itemInfos, partsDOInfos, roomInfos, groupInfos, boxBasePositions, roomBasePositions)); } } @@ -432,8 +433,8 @@ public class XmlTypeRealize { map.put("orderItemDOS", itemDOList); map.put("plateDetail", plateDetail); map.put("orderPartsRemarks", partRemarks); - System.out.println(" orderBodyDOS " + orderBodyDOList); - System.out.println(" orderPartsDOS " + partDOList); +// System.out.println(" orderBodyDOS " + orderBodyDOList); +// System.out.println(" orderPartsDOS " + partDOList); return map; } @@ -736,11 +737,11 @@ public class XmlTypeRealize { } - public List plateInfoChange(Long organId, Long orderId, Long goodsId, BlockXmlVOS blockXmlVOS, + public List plateInfoChange(List plateDetails, Long organId, Long orderId, Long goodsId, BlockXmlVOS blockXmlVOS, List plateDOs, Map orderItemMap, Map partsDO, Map> roomInfos, Map groupInfos, Map> boxBasePositionMap, Map roomBasePositions) { - List plateDetails = new ArrayList<>(); +// List plateDetails = new ArrayList<>(); if (blockXmlVOS != null && blockXmlVOS.getBlockXmlVOList() != null && blockXmlVOS.getBlockXmlVOList().size() > 0) { for (BlockXmlVO blockXmlVO : blockXmlVOS.getBlockXmlVOList()) { @@ -793,7 +794,7 @@ public class XmlTypeRealize { // 房间基点坐标 BasePosition roomBasePoint = null; if (roomBasePositions.get(blockXmlVO.getRoomCode()) != null){ - roomBasePoint = roomBasePositions.get(blockXmlVO.getRoomCode()); + roomBasePoint = roomBasePositions.get(blockXmlVO.getRoomCode()).setBasePoint(String.valueOf(idMap.get("roomId"))); } // 板类型 int plateType = Integer.parseInt(dictDataApi.parseDictData(DictTypeConstants.PLATE_TYPE, blockXmlVO.getType()).getData().getValue()); @@ -833,7 +834,8 @@ public class XmlTypeRealize { // 基点坐标获取 BasePosition plateBasePosition = BasePosition.builder() - .basePoint(blockXmlVO.getProductionCode()) +// .basePoint(blockXmlVO.getProductionCode()) + .basePoint(String.valueOf(plateId)) .basePointX(Double.valueOf(blockXmlVO.getBasePointX())) .basePointY(Double.valueOf(blockXmlVO.getBasePointY())) .basePointZ(Double.valueOf(blockXmlVO.getBasePointZ())) @@ -854,6 +856,8 @@ public class XmlTypeRealize { .bodyName(blockXmlVO.getBoxName()) .groupNo(blockXmlVO.getGroupCode()) .groupName(blockXmlVO.getGroupName()) + .has2DModel(false) + .has3DModel(false) .texture(plateDO.getTexture()) .typographicFace(plateDO.getHoleFace()) .openDoorType(plateDO.getOpenDoorType()) @@ -875,7 +879,7 @@ public class XmlTypeRealize { .holeDetail(new ArrayList<>()) .contourDetail(new ArrayList<>()) .sideHoleDetail(new ArrayList<>()) - .plateRemark(new HashMap<>()) + .sideRemark(new HashMap<>()) .plateExtraRemark(new JSONObject()) .isUnRegular(plateDO.getIsSpecialShaped()) .build(); @@ -937,9 +941,9 @@ public class XmlTypeRealize { // 板件上面添加配件信息 partsInfos.add(PartsInfo.builder() .id(orderPartsDO.getId()) - .name(correlationXmlVO.getName()) + .name(orderPartsDO.getName()) .partNum(Double.valueOf(correlationXmlVO.getCount())) - .unit(correlationXmlVO.getUnit()) + .unit(orderPartsDO.getUnit()) .build()); } @@ -1063,9 +1067,13 @@ public class XmlTypeRealize { .sealColor(pointXmlVO.getEdgingColor()) .sealSize(pointXmlVO.getEdgingThickness()) .build()); + indexId++; } } + String jsonString = JSONObject.toJSONString(extraVO); + JSONObject jsonObject = JSONObject.parseObject(jsonString); + plateDetail.setPlateExtraRemark(jsonObject); } plateDetail.setSealUp(sealUp).setSealDown(sealDown).setSealLeft(sealLeft).setSealRight(sealRight); plateDO.setSealUp(sealUp).setSealDown(sealDown).setSealLeft(sealLeft).setSealRight(sealRight); @@ -1158,17 +1166,23 @@ public class XmlTypeRealize { .holeType(holeType != null ? Integer.valueOf(holeType.getValue()) : null) .radius(radius) .depth(depth) + .startX(holeXmlVO.getStartX() != null ? Double.parseDouble(holeXmlVO.getStartX()) : 0) + .startY(holeXmlVO.getStartY() != null ? Double.parseDouble(holeXmlVO.getStartY()) : 0) + .startZ(holeXmlVO.getStartZ() != null ? Double.parseDouble(holeXmlVO.getStartZ()) : 0) + .endX(holeXmlVO.getEndX() != null ? Double.parseDouble(holeXmlVO.getEndX()) : 0) + .endY(holeXmlVO.getEndY() != null ? Double.parseDouble(holeXmlVO.getEndY()) : 0) + .endZ(holeXmlVO.getEndZ() != null ? Double.parseDouble(holeXmlVO.getEndZ()) : 0) .build(); - if (holeXmlVO.getPointBeginXmlVO() != null) { - holeDetail.setStartX(Double.parseDouble(holeXmlVO.getPointBeginXmlVO().getX())). - setStartY(Double.parseDouble(holeXmlVO.getPointBeginXmlVO().getY())). - setStartZ(Double.parseDouble(holeXmlVO.getPointBeginXmlVO().getZ())); - } - if (holeXmlVO.getPointEndXmlVO() != null) { - holeDetail.setEndX(Double.parseDouble(holeXmlVO.getPointEndXmlVO().getX())). - setEndY(Double.parseDouble(holeXmlVO.getPointEndXmlVO().getY())). - setEndZ(Double.parseDouble(holeXmlVO.getPointEndXmlVO().getZ())); - } +// if (holeXmlVO.getPointBeginXmlVO() != null) { +// holeDetail.setStartX(Double.parseDouble(holeXmlVO.getPointBeginXmlVO().getX())). +// setStartY(Double.parseDouble(holeXmlVO.getPointBeginXmlVO().getY())). +// setStartZ(Double.parseDouble(holeXmlVO.getPointBeginXmlVO().getZ())); +// } +// if (holeXmlVO.getPointEndXmlVO() != null) { +// holeDetail.setEndX(Double.parseDouble(holeXmlVO.getPointEndXmlVO().getX())). +// setEndY(Double.parseDouble(holeXmlVO.getPointEndXmlVO().getY())). +// setEndZ(Double.parseDouble(holeXmlVO.getPointEndXmlVO().getZ())); +// } plateDetail.getHoleDetail().add(holeDetail); } } @@ -1278,9 +1292,9 @@ public class XmlTypeRealize { private void addRemark(PlateDO plateDO, PlateDetail plateDetail, BlockXmlVO blockXmlVO) { if (blockXmlVO.getRemarkXmlVOS() != null && blockXmlVO.getRemarkXmlVOS().getRemarkXmlVOList() != null && blockXmlVO.getRemarkXmlVOS().getRemarkXmlVOList().size() > 0) { for (RemarkXmlVO remarkXmlVO : blockXmlVO.getRemarkXmlVOS().getRemarkXmlVOList()) { - plateDetail.getPlateRemark().put(remarkXmlVO.getName(), remarkXmlVO.getInfo()); + plateDetail.getSideRemark().put(remarkXmlVO.getName(), remarkXmlVO.getInfo()); } - plateDO.setRemark(JSONObject.toJSONString(plateDetail.getPlateRemark())); + plateDO.setRemark(JSONObject.toJSONString(plateDetail.getSideRemark())); } }