diff --git a/blade-biz-common/src/main/java/org/springblade/common/model/NodeFanoutMsg.java b/blade-biz-common/src/main/java/org/springblade/common/model/NodeFanoutMsg.java index 8d1dd499a..ef611963b 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/model/NodeFanoutMsg.java +++ b/blade-biz-common/src/main/java/org/springblade/common/model/NodeFanoutMsg.java @@ -9,7 +9,6 @@ import org.springblade.common.enums.BizOperationEnums; import java.io.Serializable; import java.util.Date; -import java.util.List; /** * 节点广播消息 @@ -72,9 +71,9 @@ public class NodeFanoutMsg implements Serializable { */ private T main; - /** - * 内容 - */ - private List details; +// /** +// * 内容 +// */ +// private List details; } diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAyscServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAyscServiceImpl.java index ca27c6bd5..5296b6773 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAyscServiceImpl.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAyscServiceImpl.java @@ -52,9 +52,11 @@ public class AftersalesAyscServiceImpl implements IAftersalesAyscService { nodeFanoutMsg.setWarehouse(warehouseName); nodeFanoutMsg.setWarehouseId(warehouseId); nodeFanoutMsg.setOperatorTime(new Date()); - nodeFanoutMsg.setMain(carsLoadEntity); + //组装包件数据 + JSONObject json = JSONObject.parseObject(JSONObject.toJSONString(carsLoadEntity)); + List packageDataList = new ArrayList<>(); orderPackageCodeList.forEach(packageCode -> { @@ -64,8 +66,8 @@ public class AftersalesAyscServiceImpl implements IAftersalesAyscService { packageData.setPackageType(PackageTypeEnums.CMP); packageDataList.add(packageData); }); - - nodeFanoutMsg.setDetails(packageDataList); + json.put("details",packageDataList); + nodeFanoutMsg.setMain(json); FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.trunkline.REPORTDATA.EXCHANGE).msg(JSONObject.toJSONString(nodeFanoutMsg)).build(); @@ -90,10 +92,12 @@ public class AftersalesAyscServiceImpl implements IAftersalesAyscService { nodeFanoutMsg.setWarehouse(warehouseName); nodeFanoutMsg.setWarehouseId(warehouseId); nodeFanoutMsg.setOperatorTime(new Date()); - nodeFanoutMsg.setMain(carsLoadEntity); //组装包件数据 - nodeFanoutMsg.setDetails(packageDataList); + JSONObject json = JSONObject.parseObject(JSONObject.toJSONString(carsLoadEntity)); + + json.put("details",packageDataList); + nodeFanoutMsg.setMain(json); FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.trunkline.REPORTDATA.EXCHANGE).msg(JSONObject.toJSONString(nodeFanoutMsg)).build(); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/CarsLoadAsyncServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/CarsLoadAsyncServiceImpl.java index 85c62ed3c..4eabe3911 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/CarsLoadAsyncServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/CarsLoadAsyncServiceImpl.java @@ -701,9 +701,10 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService { nodeFanoutMsg.setWarehouse(warehouseName); nodeFanoutMsg.setWarehouseId(warehouseId); nodeFanoutMsg.setOperatorTime(new Date()); - nodeFanoutMsg.setMain(carsLoadEntity); //组装包件数据 + JSONObject json = JSONObject.parseObject(JSONObject.toJSONString(carsLoadEntity)); + //把carsLoadScanEntityList通过type进行分组 Map> collect = carsLoadScanEntityList.stream().collect(Collectors.groupingBy(TrunklineCarsLoadScanEntity::getType)); @@ -750,7 +751,8 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService { }); - nodeFanoutMsg.setDetails(packageDataList); + json.put("details",packageDataList); + nodeFanoutMsg.setMain(json); FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.trunkline.REPORTDATA.EXCHANGE).msg(JSONObject.toJSONString(nodeFanoutMsg)).build(); @@ -776,9 +778,10 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService { nodeFanoutMsg.setWarehouse(warehouseName); nodeFanoutMsg.setWarehouseId(warehouseId); nodeFanoutMsg.setOperatorTime(new Date()); - nodeFanoutMsg.setMain(carsLoadEntity); //组装包件数据 + JSONObject json = JSONObject.parseObject(JSONObject.toJSONString(carsLoadEntity)); + //把carsLoadScanEntityList通过type进行分组 Map> collect = carsLoadScanEntityList.stream().collect(Collectors.groupingBy(TrunklineCarsLoadScanEntity::getType)); @@ -825,7 +828,8 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService { }); - nodeFanoutMsg.setDetails(packageDataList); + json.put("details",packageDataList); + nodeFanoutMsg.setMain(json); FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.trunkline.REPORTDATA.EXCHANGE).msg(JSONObject.toJSONString(nodeFanoutMsg)).build(); @@ -844,9 +848,10 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService { nodeFanoutMsg.setWarehouse(warehouseName); nodeFanoutMsg.setWarehouseId(warehouseId); nodeFanoutMsg.setOperatorTime(new Date()); - nodeFanoutMsg.setMain(carsLoadEntity); //组装包件数据 + JSONObject json = JSONObject.parseObject(JSONObject.toJSONString(carsLoadEntity)); + //把carsLoadScanEntityList通过type进行分组 Map> collect = carsLoadScanEntityList.stream().collect(Collectors.groupingBy(TrunklineCarsLoadScanEntity::getType)); @@ -892,8 +897,8 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService { } }); - - nodeFanoutMsg.setDetails(packageDataList); + json.put("details",packageDataList); + nodeFanoutMsg.setMain(json); FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.trunkline.REPORTDATA.EXCHANGE).msg(JSONObject.toJSONString(nodeFanoutMsg)).build(); @@ -911,9 +916,11 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService { nodeFanoutMsg.setWarehouse(warehouseName); nodeFanoutMsg.setWarehouseId(warehouseId); nodeFanoutMsg.setOperatorTime(new Date()); - nodeFanoutMsg.setMain(carsLoadEntity); + //组装包件数据 + JSONObject json = JSONObject.parseObject(JSONObject.toJSONString(carsLoadEntity)); + List packageDataList = new ArrayList<>(); orderPackageCodeList.forEach(packageCode -> { @@ -924,7 +931,9 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService { packageDataList.add(packageData); }); - nodeFanoutMsg.setDetails(packageDataList); + json.put("details",packageDataList); + + nodeFanoutMsg.setMain(json); FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.trunkline.REPORTDATA.EXCHANGE).msg(JSONObject.toJSONString(nodeFanoutMsg)).build(); @@ -943,9 +952,11 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService { nodeFanoutMsg.setWarehouse(warehouseName); nodeFanoutMsg.setWarehouseId(warehouseId); nodeFanoutMsg.setOperatorTime(new Date()); - nodeFanoutMsg.setMain(carsLoadEntity); + //组装包件数据 + JSONObject json = JSONObject.parseObject(JSONObject.toJSONString(carsLoadEntity)); + List packageDataList = new ArrayList<>(); sendList.forEach(zeroDetailVO -> { @@ -959,7 +970,8 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService { packageDataList.add(packageData); }); - nodeFanoutMsg.setDetails(packageDataList); + json.put("details",packageDataList); + nodeFanoutMsg.setMain(json); FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.trunkline.REPORTDATA.EXCHANGE).msg(JSONObject.toJSONString(nodeFanoutMsg)).build(); @@ -980,9 +992,10 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService { nodeFanoutMsg.setWarehouse(warehouseEntity.getName()); nodeFanoutMsg.setWarehouseId(warehouseId); nodeFanoutMsg.setOperatorTime(new Date()); - nodeFanoutMsg.setMain(carsLoadEntity); //组装包件数据 + JSONObject json = JSONObject.parseObject(JSONObject.toJSONString(carsLoadEntity)); + List packageDataList = new ArrayList<>(); scanEntityList.forEach(scanEntity -> { @@ -993,7 +1006,8 @@ public class CarsLoadAsyncServiceImpl implements ICarsLoadAsyncService { packageDataList.add(packageData); }); - nodeFanoutMsg.setDetails(packageDataList); + json.put("details",packageDataList); + nodeFanoutMsg.setMain(json); FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.trunkline.REPORTDATA.EXCHANGE).msg(JSONObject.toJSONString(nodeFanoutMsg)).build(); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java index 9fb2417a4..60fc242b3 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java @@ -959,7 +959,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService { nodeFanoutMsg.setWarehouse(warehouseName); nodeFanoutMsg.setWarehouseId(warehouseId); nodeFanoutMsg.setOperatorTime(new Date()); - nodeFanoutMsg.setMain(waybillEntity); + + JSONObject json = JSONObject.parseObject(JSONObject.toJSONString(waybillEntity)); + //组装包件数据 List packageDataList = new ArrayList<>(); details.forEach(detailEntity -> { @@ -974,7 +976,8 @@ public class OpenOrderServiceImpl implements IOpenOrderService { packageData.setWaybillNumber(detailEntity.getWaybillNo()); packageDataList.add(packageData); }); - nodeFanoutMsg.setDetails(packageDataList); + json.put("details",packageDataList); + nodeFanoutMsg.setMain(json); FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.trunkline.REPORTDATA.EXCHANGE).msg(JSONObject.toJSONString(nodeFanoutMsg)).build(); @@ -2625,10 +2628,6 @@ public class OpenOrderServiceImpl implements IOpenOrderService { nodeFanoutMsg.setWarehouseId(warehouseId); nodeFanoutMsg.setOperatorTime(new Date()); nodeFanoutMsg.setMain(waybillEntity); - //组装包件数据 - List packageDataList = new ArrayList<>(); - - nodeFanoutMsg.setDetails(packageDataList); FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.trunkline.REPORTDATA.EXCHANGE).msg(JSONObject.toJSONString(nodeFanoutMsg)).build(); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java index b79d227c9..2d667f043 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java @@ -415,6 +415,7 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl packageDataList = new ArrayList<>(); advanceDetailEntityList.forEach(detailEntity -> { @@ -438,7 +439,7 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl packageDataList = new ArrayList<>(); advanceDetailList.forEach(detailEntity -> { @@ -529,7 +532,10 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl