java_project
/
logisticsplatform-service
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

1.干线基础数据开发

visual
zhenghaoyu 4 months ago
parent
4e3ef3c894
commit
50fb41fd0f
5 changed files with 55 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      blade-biz-common/src/main/java/org/springblade/common/model/NodeFanoutMsg.java
  2. 14
      blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAyscServiceImpl.java
  3. 40
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/CarsLoadAsyncServiceImpl.java
  4. 11
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
  5. 14
      blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java

9
blade-biz-common/src/main/java/org/springblade/common/model/NodeFanoutMsg.java
Unescape View File

@ -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<T> implements Serializable {
*/
private T main;
/**
* 内容
*/
private List<PackageData> details;
// /**
// * 内容
// */
// private List<PackageData> details;
}

14
blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAyscServiceImpl.java
Unescape View File

@ -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<PackageData> 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();

40
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/CarsLoadAsyncServiceImpl.java
Unescape View File

@ -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<Integer, List<TrunklineCarsLoadScanEntity>> 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<Integer, List<TrunklineCarsLoadScanEntity>> 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<Integer, List<TrunklineCarsLoadScanEntity>> 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<PackageData> 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<PackageData> 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<PackageData> 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();

11
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
Unescape View File

@ -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<PackageData> 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<PackageData> packageDataList = new ArrayList<>();
nodeFanoutMsg.setDetails(packageDataList);
FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.trunkline.REPORTDATA.EXCHANGE).msg(JSONObject.toJSONString(nodeFanoutMsg)).build();

14
blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java
Unescape View File

@ -415,6 +415,7 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
nodeFanoutMsg.setWarehouse(warehouseName);
nodeFanoutMsg.setWarehouseId(warehouseId);
nodeFanoutMsg.setOperatorTime(date);
//组装包件数据
List<PackageData> packageDataList = new ArrayList<>();
advanceDetailEntityList.forEach(detailEntity -> {
@ -438,7 +439,7 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
packageData.setSystemType(detailEntity.getSystemType());
packageDataList.add(packageData);
});
nodeFanoutMsg.setDetails(packageDataList);
nodeFanoutMsg.setMain(packageDataList);
FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.trunkline.REPORTDATA.EXCHANGE).msg(JSONObject.toJSONString(nodeFanoutMsg)).build();
@ -484,7 +485,7 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
packageData.setIncomingType(incomingType);
packageDataList.add(packageData);
});
nodeFanoutMsg.setDetails(packageDataList);
nodeFanoutMsg.setMain(packageDataList);
FanoutMsg fanoutMsg = FanoutMsg.builder().exchange(FanoutConstants.trunkline.REPORTDATA.EXCHANGE).msg(JSONObject.toJSONString(nodeFanoutMsg)).build();
@ -514,7 +515,9 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
nodeFanoutMsg.setWarehouse(warehouseName);
nodeFanoutMsg.setWarehouseId(warehouseId);
nodeFanoutMsg.setOperatorTime(new Date());
nodeFanoutMsg.setMain(waybillEntity);
JSONObject json = JSONObject.parseObject(JSONObject.toJSONString(waybillEntity));
//组装包件数据
List<PackageData> packageDataList = new ArrayList<>();
advanceDetailList.forEach(detailEntity -> {
@ -529,7 +532,10 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
packageData.setWaybillNumber(waybillEntity.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();

Write Preview
Loading…
Cancel
Save