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

xml数据对应修改

Browse Source
This commit is contained in:
lym
2024-10-10 09:19:40 +08:00
parent 2e96dd8173
commit 4fd28c58da
5 changed files with 52 additions and 34 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/service/order/OrderServiceImpl.java
+1
View File
@@ -574,6 +574,7 @@ public class OrderServiceImpl implements OrderService {
List<OrderModelDO> orderModelDOs = BeanUtils.toBean(plateDetail, OrderModelDO.class); List<OrderModelDO> orderModelDOs = BeanUtils.toBean(plateDetail, OrderModelDO.class);
if (orderModelDOs.size() > 0) { if (orderModelDOs.size() > 0) {
orderModelDOs.forEach(orderModelDO -> orderModelDO.setOrderId(orderDO.getId())); orderModelDOs.forEach(orderModelDO -> orderModelDO.setOrderId(orderDO.getId()));
System.out.println("----" + orderModelDOs);
orderInputProcessor.batchSaveModel(orderModelDOs); orderInputProcessor.batchSaveModel(orderModelDOs);
} }
} }
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/structure/PlateDetail.java
+3 -3
View File
@@ -112,9 +112,9 @@ public class PlateDetail{
private List<HoleDetail> sideHoleDetail;//侧面孔明细 private List<HoleDetail> sideHoleDetail;//侧面孔明细
// 备注 // 备注
private Map<String,String> plateRemark;// 板件备注 (生产数据接口中） private Map<String,String> plateRemark;// 板件备注 (生产数据接口中）（不用）
private Map<String,String> sideRemark;// 封边备注 private Map<String,String> sideRemark;// 板边备注
private JSONObject plateExtraRemark;// 板材扩展备注 private JSONObject plateExtraRemark;// 板材扩展备注 (不含板件的备注)
private String extraRemark; // 扩展备注(包含铰链备注、订单板件流水号)（板材明细中） private String extraRemark; // 扩展备注(包含铰链备注、订单板件流水号)（板材明细中）
private String specialRemarkDei; // 特殊备注(Json字符串) private String specialRemarkDei; // 特殊备注(Json字符串)
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeRealize.java
+5 -2
View File
@@ -795,9 +795,12 @@ public class ApiTypeRealize {
.setThroughModelCount(Double.valueOf(block.getJSONObject("ExtraRemark").getJSONObject("extra").getString("throughModelCount"))) .setThroughModelCount(Double.valueOf(block.getJSONObject("ExtraRemark").getJSONObject("extra").getString("throughModelCount")))
.setHas2DModel(Boolean.valueOf(block.getJSONObject("ExtraRemark").getJSONObject("extra").getString("has2DModel"))) .setHas2DModel(Boolean.valueOf(block.getJSONObject("ExtraRemark").getJSONObject("extra").getString("has2DModel")))
.setHas3DModel(Boolean.valueOf(block.getJSONObject("ExtraRemark").getJSONObject("extra").getString("has3DModel"))) .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")) .setPlateExtraRemark(block.getJSONObject("ExtraRemark"))
.setSideRemark(edgeRemarkToMap(block.getJSONObject("ExtraRemark").getJSONObject("extra"))); .setSideRemark(remarkToMap(block));
} }
plateDetails.put(block.getLong("BlockNo"), plateDetail); plateDetails.put(block.getLong("BlockNo"), plateDetail);
} }
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
+5 -5
View File
@@ -123,9 +123,9 @@ public class HoleXmlVO implements Serializable {
// 是否不要 // 是否不要
@XmlElement(name = "Begin") // @XmlElement(name = "Begin")
private PointBeginXmlVO pointBeginXmlVO; // private PointBeginXmlVO pointBeginXmlVO;
//
@XmlElement(name = "End") // @XmlElement(name = "End")
private PointEndXmlVO pointEndXmlVO; // private PointEndXmlVO pointEndXmlVO;
} }
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/xml/XmlTypeRealize.java
+38 -24
View File
@@ -80,6 +80,7 @@ public class XmlTypeRealize {
if (roomXmlVOS != null && roomXmlVOS.getRoomXmlVOList() != null && roomXmlVOS.getRoomXmlVOList().size() > 0) { if (roomXmlVOS != null && roomXmlVOS.getRoomXmlVOList() != null && roomXmlVOS.getRoomXmlVOList().size() > 0) {
for (RoomXmlVO roomXmlVO : roomXmlVOS.getRoomXmlVOList()) { for (RoomXmlVO roomXmlVO : roomXmlVOS.getRoomXmlVOList()) {
basePositions.put(roomXmlVO.getCode(), BasePosition.builder() basePositions.put(roomXmlVO.getCode(), BasePosition.builder()
.basePointX(Double.valueOf(roomXmlVO.getBasePointX())) .basePointX(Double.valueOf(roomXmlVO.getBasePointX()))
.basePointY(Double.valueOf(roomXmlVO.getBasePointY())) .basePointY(Double.valueOf(roomXmlVO.getBasePointY()))
.basePointZ(Double.valueOf(roomXmlVO.getBasePointZ())) .basePointZ(Double.valueOf(roomXmlVO.getBasePointZ()))
@@ -186,7 +187,7 @@ public class XmlTypeRealize {
List<Object> goodsDOs = new ArrayList<>(); List<Object> goodsDOs = new ArrayList<>();
List<Object> plateDOs = new ArrayList<>(); List<Object> plateDOs = new ArrayList<>();
List<Object> plateDetail = null; List<Object> plateDetail = new ArrayList<>();
// 房间柜体 // 房间柜体
Map<String, Map<String, OrderBodyDO>> roomInfos = bodyInfoChange(orderXmlVO.getRoomXmlVOS(), orderId, organId); // roomInfos 这个在跟着一起变 Map<String, Map<String, OrderBodyDO>> 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(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("orderItemDOS", itemDOList);
map.put("plateDetail", plateDetail); map.put("plateDetail", plateDetail);
map.put("orderPartsRemarks", partRemarks); map.put("orderPartsRemarks", partRemarks);
System.out.println(" orderBodyDOS " + orderBodyDOList); // System.out.println(" orderBodyDOS " + orderBodyDOList);
System.out.println(" orderPartsDOS " + partDOList); // System.out.println(" orderPartsDOS " + partDOList);
return map; return map;
} }
@@ -736,11 +737,11 @@ public class XmlTypeRealize {
} }
public List<Object> plateInfoChange(Long organId, Long orderId, Long goodsId, BlockXmlVOS blockXmlVOS, public List<Object> plateInfoChange(List<Object> plateDetails, Long organId, Long orderId, Long goodsId, BlockXmlVOS blockXmlVOS,
List<Object> plateDOs, Map<String, Object> orderItemMap, Map<String, Object> partsDO, List<Object> plateDOs, Map<String, Object> orderItemMap, Map<String, Object> partsDO,
Map<String, Map<String, OrderBodyDO>> roomInfos, Map<String, OrderGroupDO> groupInfos, Map<String, Map<String, OrderBodyDO>> roomInfos, Map<String, OrderGroupDO> groupInfos,
Map<String, Map<String, BasePosition>> boxBasePositionMap, Map<String, BasePosition> roomBasePositions) { Map<String, Map<String, BasePosition>> boxBasePositionMap, Map<String, BasePosition> roomBasePositions) {
List<Object> plateDetails = new ArrayList<>(); // List<Object> plateDetails = new ArrayList<>();
if (blockXmlVOS != null && blockXmlVOS.getBlockXmlVOList() != null && blockXmlVOS.getBlockXmlVOList().size() > 0) { if (blockXmlVOS != null && blockXmlVOS.getBlockXmlVOList() != null && blockXmlVOS.getBlockXmlVOList().size() > 0) {
for (BlockXmlVO blockXmlVO : blockXmlVOS.getBlockXmlVOList()) { for (BlockXmlVO blockXmlVO : blockXmlVOS.getBlockXmlVOList()) {
@@ -793,7 +794,7 @@ public class XmlTypeRealize {
// 房间基点坐标 // 房间基点坐标
BasePosition roomBasePoint = null; BasePosition roomBasePoint = null;
if (roomBasePositions.get(blockXmlVO.getRoomCode()) != 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()); int plateType = Integer.parseInt(dictDataApi.parseDictData(DictTypeConstants.PLATE_TYPE, blockXmlVO.getType()).getData().getValue());
@@ -833,7 +834,8 @@ public class XmlTypeRealize {
// 基点坐标获取 // 基点坐标获取
BasePosition plateBasePosition = BasePosition.builder() BasePosition plateBasePosition = BasePosition.builder()
.basePoint(blockXmlVO.getProductionCode()) // .basePoint(blockXmlVO.getProductionCode())
.basePoint(String.valueOf(plateId))
.basePointX(Double.valueOf(blockXmlVO.getBasePointX())) .basePointX(Double.valueOf(blockXmlVO.getBasePointX()))
.basePointY(Double.valueOf(blockXmlVO.getBasePointY())) .basePointY(Double.valueOf(blockXmlVO.getBasePointY()))
.basePointZ(Double.valueOf(blockXmlVO.getBasePointZ())) .basePointZ(Double.valueOf(blockXmlVO.getBasePointZ()))
@@ -854,6 +856,8 @@ public class XmlTypeRealize {
.bodyName(blockXmlVO.getBoxName()) .bodyName(blockXmlVO.getBoxName())
.groupNo(blockXmlVO.getGroupCode()) .groupNo(blockXmlVO.getGroupCode())
.groupName(blockXmlVO.getGroupName()) .groupName(blockXmlVO.getGroupName())
.has2DModel(false)
.has3DModel(false)
.texture(plateDO.getTexture()) .texture(plateDO.getTexture())
.typographicFace(plateDO.getHoleFace()) .typographicFace(plateDO.getHoleFace())
.openDoorType(plateDO.getOpenDoorType()) .openDoorType(plateDO.getOpenDoorType())
@@ -875,7 +879,7 @@ public class XmlTypeRealize {
.holeDetail(new ArrayList<>()) .holeDetail(new ArrayList<>())
.contourDetail(new ArrayList<>()) .contourDetail(new ArrayList<>())
.sideHoleDetail(new ArrayList<>()) .sideHoleDetail(new ArrayList<>())
.plateRemark(new HashMap<>()) .sideRemark(new HashMap<>())
.plateExtraRemark(new JSONObject()) .plateExtraRemark(new JSONObject())
.isUnRegular(plateDO.getIsSpecialShaped()) .isUnRegular(plateDO.getIsSpecialShaped())
.build(); .build();
@@ -937,9 +941,9 @@ public class XmlTypeRealize {
// 板件上面添加配件信息 // 板件上面添加配件信息
partsInfos.add(PartsInfo.builder() partsInfos.add(PartsInfo.builder()
.id(orderPartsDO.getId()) .id(orderPartsDO.getId())
.name(correlationXmlVO.getName()) .name(orderPartsDO.getName())
.partNum(Double.valueOf(correlationXmlVO.getCount())) .partNum(Double.valueOf(correlationXmlVO.getCount()))
.unit(correlationXmlVO.getUnit()) .unit(orderPartsDO.getUnit())
.build()); .build());
} }
@@ -1063,9 +1067,13 @@ public class XmlTypeRealize {
.sealColor(pointXmlVO.getEdgingColor()) .sealColor(pointXmlVO.getEdgingColor())
.sealSize(pointXmlVO.getEdgingThickness()) .sealSize(pointXmlVO.getEdgingThickness())
.build()); .build());
indexId++;
} }
} }
String jsonString = JSONObject.toJSONString(extraVO);
JSONObject jsonObject = JSONObject.parseObject(jsonString);
plateDetail.setPlateExtraRemark(jsonObject);
} }
plateDetail.setSealUp(sealUp).setSealDown(sealDown).setSealLeft(sealLeft).setSealRight(sealRight); plateDetail.setSealUp(sealUp).setSealDown(sealDown).setSealLeft(sealLeft).setSealRight(sealRight);
plateDO.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) .holeType(holeType != null ? Integer.valueOf(holeType.getValue()) : null)
.radius(radius) .radius(radius)
.depth(depth) .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(); .build();
if (holeXmlVO.getPointBeginXmlVO() != null) { // if (holeXmlVO.getPointBeginXmlVO() != null) {
holeDetail.setStartX(Double.parseDouble(holeXmlVO.getPointBeginXmlVO().getX())). // holeDetail.setStartX(Double.parseDouble(holeXmlVO.getPointBeginXmlVO().getX())).
setStartY(Double.parseDouble(holeXmlVO.getPointBeginXmlVO().getY())). // setStartY(Double.parseDouble(holeXmlVO.getPointBeginXmlVO().getY())).
setStartZ(Double.parseDouble(holeXmlVO.getPointBeginXmlVO().getZ())); // setStartZ(Double.parseDouble(holeXmlVO.getPointBeginXmlVO().getZ()));
} // }
if (holeXmlVO.getPointEndXmlVO() != null) { // if (holeXmlVO.getPointEndXmlVO() != null) {
holeDetail.setEndX(Double.parseDouble(holeXmlVO.getPointEndXmlVO().getX())). // holeDetail.setEndX(Double.parseDouble(holeXmlVO.getPointEndXmlVO().getX())).
setEndY(Double.parseDouble(holeXmlVO.getPointEndXmlVO().getY())). // setEndY(Double.parseDouble(holeXmlVO.getPointEndXmlVO().getY())).
setEndZ(Double.parseDouble(holeXmlVO.getPointEndXmlVO().getZ())); // setEndZ(Double.parseDouble(holeXmlVO.getPointEndXmlVO().getZ()));
} // }
plateDetail.getHoleDetail().add(holeDetail); plateDetail.getHoleDetail().add(holeDetail);
} }
} }
@@ -1278,9 +1292,9 @@ public class XmlTypeRealize {
private void addRemark(PlateDO plateDO, PlateDetail plateDetail, BlockXmlVO blockXmlVO) { private void addRemark(PlateDO plateDO, PlateDetail plateDetail, BlockXmlVO blockXmlVO) {
if (blockXmlVO.getRemarkXmlVOS() != null && blockXmlVO.getRemarkXmlVOS().getRemarkXmlVOList() != null && blockXmlVO.getRemarkXmlVOS().getRemarkXmlVOList().size() > 0) { if (blockXmlVO.getRemarkXmlVOS() != null && blockXmlVO.getRemarkXmlVOS().getRemarkXmlVOList() != null && blockXmlVO.getRemarkXmlVOS().getRemarkXmlVOList().size() > 0) {
for (RemarkXmlVO remarkXmlVO : blockXmlVO.getRemarkXmlVOS().getRemarkXmlVOList()) { 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()));
} }
} }