From 98690191b991fe208bd898ac259aa6d0ab3cf187 Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Wed, 11 Dec 2024 16:16:33 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=8F=96=E6=B6=88mq=E6=B6=88=E8=B4=B9?= =?UTF-8?q?=E8=80=85=E7=9A=84=E7=9A=84=E6=96=B9=E6=B3=95=E4=BA=8B=E7=89=A9?= =?UTF-8?q?=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../receiver/WarehouseTrayAllocationListener.java | 4 ++-- .../distribution/receiver/report/BillPlanReportListener.java | 2 +- .../receiver/report/BillReViewReportListener.java | 2 +- .../receiver/report/BillSignforReportListener.java | 2 +- .../distribution/receiver/report/CarStartReportListener.java | 2 +- .../receiver/report/ConsigneeArriveReportListener.java | 2 +- .../receiver/report/DeliverFinishReportListener.java | 4 ++-- .../distribution/receiver/report/LoadingReportListener.java | 2 +- .../distribution/receiver/report/PlanReportListener.java | 2 +- .../distribution/receiver/report/ReViewReportListener.java | 2 +- .../receiver/report/ReservationPlanReportListener.java | 2 +- .../receiver/report/ReturnWarehouseReportListener.java | 2 +- .../distribution/receiver/report/SignforReportListener.java | 2 +- .../distribution/receiver/report/StockReportListener.java | 2 +- .../com/logpm/factorydata/olo/mq/FactoryOrderListener.java | 2 +- .../com/logpm/factorydata/olo/mq/NodeDataPushListener.java | 2 +- .../logpm/factorydata/suofeiya/mq/FactoryOrderListener.java | 2 +- .../logpm/factorydata/suofeiya/mq/NodeDataPushListener.java | 2 +- .../com/logpm/warehouse/receiver/OldTrayTypeListener.java | 2 +- 19 files changed, 21 insertions(+), 21 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/WarehouseTrayAllocationListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/WarehouseTrayAllocationListener.java index 8c41d0188..c855f7b22 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/WarehouseTrayAllocationListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/WarehouseTrayAllocationListener.java @@ -43,7 +43,7 @@ public class WarehouseTrayAllocationListener { value = @Queue(name = FanoutConstants.warehouse.TRAYTYPE.QUEUE.TRAYTYPE_MESSAGE), exchange = @Exchange(name = FanoutConstants.warehouse.TRAYTYPE.EXCHANGE, type = ExchangeTypes.FANOUT) )) - @Transactional(rollbackFor = Exception.class) +// @Transactional(rollbackFor = Exception.class) public void trayTypeMessage(String msg) { log.info("##########trayTypeMessage: 配送消费托盘广播 开始 msg={}",msg); if(StringUtil.isNotBlank(msg)){ @@ -66,7 +66,7 @@ public class WarehouseTrayAllocationListener { value = @Queue(name = FanoutConstants.warehouse.ALLOCATION.QUEUE.ALLOCATION_MESSAGE), exchange = @Exchange(name = FanoutConstants.warehouse.ALLOCATION.EXCHANGE, type = ExchangeTypes.FANOUT) )) - @Transactional(rollbackFor = Exception.class) +// @Transactional(rollbackFor = Exception.class) public void allocationMessage(String msg) { log.info("##########allocationMessage: 配送消费库位广播 开始 msg={}", msg); if(StringUtil.isNotBlank(msg)){ diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillPlanReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillPlanReportListener.java index 468354358..57c334d7c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillPlanReportListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillPlanReportListener.java @@ -56,7 +56,7 @@ public class BillPlanReportListener { value = @Queue(name = FanoutConstants.DeliveryOfPickup.BillPlan.QUEUE.REPORT, durable = "true"), exchange = @Exchange(name = FanoutConstants.DeliveryOfPickup.BillPlan.EXCHANGE, type = ExchangeTypes.FANOUT) )) - @Transactional(rollbackFor = Exception.class) +// @Transactional(rollbackFor = Exception.class) public void buildReport(String msg) { if (!destinationProperties.getReport().getBillPlanReport()) { return; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillReViewReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillReViewReportListener.java index 821e17b7e..6c7b400ae 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillReViewReportListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillReViewReportListener.java @@ -53,7 +53,7 @@ public class BillReViewReportListener { value = @Queue(name = FanoutConstants.DeliveryOfPickup.BillSignReview.QUEUE.REPORT, durable = "true"), exchange = @Exchange(name = FanoutConstants.DeliveryOfPickup.BillSignReview.EXCHANGE, type = ExchangeTypes.FANOUT) )) - @Transactional(rollbackFor = Exception.class) +// @Transactional(rollbackFor = Exception.class) public void buildReport(String msg) { if (!destinationProperties.getReport().getBillReviewReport()) { return; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillSignforReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillSignforReportListener.java index ae92415fb..28fc72b64 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillSignforReportListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillSignforReportListener.java @@ -53,7 +53,7 @@ public class BillSignforReportListener { value = @Queue(name = FanoutConstants.DeliveryOfPickup.BillSign.QUEUE.REPORT, durable = "true"), exchange = @Exchange(name = FanoutConstants.DeliveryOfPickup.BillSign.EXCHANGE, type = ExchangeTypes.FANOUT) )) - @Transactional(rollbackFor = Exception.class) +// @Transactional(rollbackFor = Exception.class) public void buildReport(String msg) { if (!destinationProperties.getReport().getBillSignforReport()) { return; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/CarStartReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/CarStartReportListener.java index 9cc493480..75723cd5a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/CarStartReportListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/CarStartReportListener.java @@ -47,7 +47,7 @@ public class CarStartReportListener { value = @Queue(name = FanoutConstants.distribution.DeliveryAndCarStart.QUEUE.REPORT, durable = "true"), exchange = @Exchange(name = FanoutConstants.distribution.DeliveryAndCarStart.EXCHANGE, type = ExchangeTypes.FANOUT) )) - @Transactional(rollbackFor = Exception.class) +// @Transactional(rollbackFor = Exception.class) public void buildReport(String msg) { if (!destinationProperties.getReport().getCarStartReport()) { return; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ConsigneeArriveReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ConsigneeArriveReportListener.java index 8bd79cf5c..ffb4e2c9f 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ConsigneeArriveReportListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ConsigneeArriveReportListener.java @@ -47,7 +47,7 @@ public class ConsigneeArriveReportListener { value = @Queue(name = FanoutConstants.distribution.DeliveryAndConsigneeArrive.QUEUE.REPORT, durable = "true"), exchange = @Exchange(name = FanoutConstants.distribution.DeliveryAndConsigneeArrive.EXCHANGE, type = ExchangeTypes.FANOUT) )) - @Transactional(rollbackFor = Exception.class) +// @Transactional(rollbackFor = Exception.class) public void buildReport(String msg) { if (!destinationProperties.getReport().getConsigneeArriveReport()) { return; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/DeliverFinishReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/DeliverFinishReportListener.java index a0504917a..406513416 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/DeliverFinishReportListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/DeliverFinishReportListener.java @@ -79,7 +79,7 @@ public class DeliverFinishReportListener { value = @Queue(name = FanoutConstants.DeliveryOfPickup.BillAndFinish.QUEUE.REPORT, durable = "true"), exchange = @Exchange(name = FanoutConstants.DeliveryOfPickup.BillAndFinish.EXCHANGE, type = ExchangeTypes.FANOUT) )) - @Transactional(rollbackFor = Exception.class) +// @Transactional(rollbackFor = Exception.class) public void buildPickUpReport(String msg) { this.buildReport(msg); @@ -89,7 +89,7 @@ public class DeliverFinishReportListener { value = @Queue(name = FanoutConstants.distribution.DeliveryAndFinish.QUEUE.REPORT, durable = "true"), exchange = @Exchange(name = FanoutConstants.distribution.DeliveryAndFinish.EXCHANGE, type = ExchangeTypes.FANOUT) )) - @Transactional(rollbackFor = Exception.class) +// @Transactional(rollbackFor = Exception.class) public void buildReport(String msg) { if (!destinationProperties.getReport().getDeliverFinishReport()) { return; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/LoadingReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/LoadingReportListener.java index 0ee96aca1..4c1cba4e8 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/LoadingReportListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/LoadingReportListener.java @@ -53,7 +53,7 @@ public class LoadingReportListener { value = @Queue(name = FanoutConstants.distribution.DeliveryAndLoading.QUEUE.REPORT, durable = "true"), exchange = @Exchange(name = FanoutConstants.distribution.DeliveryAndLoading.EXCHANGE, type = ExchangeTypes.FANOUT) )) - @Transactional(rollbackFor = Exception.class) +// @Transactional(rollbackFor = Exception.class) public void buildReport(String msg) { if (!destinationProperties.getReport().getLoadingReport()) { return; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/PlanReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/PlanReportListener.java index 1ec0dfb47..3b8961b95 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/PlanReportListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/PlanReportListener.java @@ -61,7 +61,7 @@ public class PlanReportListener { value = @Queue(name = FanoutConstants.distribution.DeliveryAndPlan.QUEUE.REPORT, durable = "true"), exchange = @Exchange(name = FanoutConstants.distribution.DeliveryAndPlan.EXCHANGE, type = ExchangeTypes.FANOUT) )) - @Transactional(rollbackFor = Exception.class) +// @Transactional(rollbackFor = Exception.class) public void buildReport(String msg) { if (!destinationProperties.getReport().getLoadingReport()) { return; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReViewReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReViewReportListener.java index dcb7a6c01..af4683960 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReViewReportListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReViewReportListener.java @@ -53,7 +53,7 @@ public class ReViewReportListener { value = @Queue(name = FanoutConstants.distribution.DeliveryAndrecheck.QUEUE.REPORT, durable = "true"), exchange = @Exchange(name = FanoutConstants.distribution.DeliveryAndrecheck.EXCHANGE, type = ExchangeTypes.FANOUT) )) - @Transactional(rollbackFor = Exception.class) +// @Transactional(rollbackFor = Exception.class) public void buildReport(String msg) { if (!destinationProperties.getReport().getReViewReport()) { return; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReservationPlanReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReservationPlanReportListener.java index bbde97ba8..703ae20ed 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReservationPlanReportListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReservationPlanReportListener.java @@ -56,7 +56,7 @@ public class ReservationPlanReportListener { value = @Queue(name = FanoutConstants.reservation.OwnReservation.QUEUE.REPORT, durable = "true"), exchange = @Exchange(name = FanoutConstants.reservation.OwnReservation.EXCHANGE, type = ExchangeTypes.FANOUT) )) - @Transactional(rollbackFor = Exception.class) +// @Transactional(rollbackFor = Exception.class) public void buildReport(String msg) throws InterruptedException { if (!destinationProperties.getReport().getReservationPlanReport()) { return; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReturnWarehouseReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReturnWarehouseReportListener.java index 5fe7e9a06..6aec684f1 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReturnWarehouseReportListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReturnWarehouseReportListener.java @@ -53,7 +53,7 @@ public class ReturnWarehouseReportListener { value = @Queue(name = FanoutConstants.distribution.DeliveryAndReturnWarehouse.QUEUE.REPORT, durable = "true"), exchange = @Exchange(name = FanoutConstants.distribution.DeliveryAndReturnWarehouse.EXCHANGE, type = ExchangeTypes.FANOUT) )) - @Transactional(rollbackFor = Exception.class) +// @Transactional(rollbackFor = Exception.class) public void buildReport(String msg) { if (!destinationProperties.getReport().getReturnWarehouseReport()) { return; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/SignforReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/SignforReportListener.java index f22a5d515..fef058866 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/SignforReportListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/SignforReportListener.java @@ -54,7 +54,7 @@ public class SignforReportListener { value = @Queue(name = FanoutConstants.distribution.DeliveryAndSignfor.QUEUE.REPORT, durable = "true"), exchange = @Exchange(name = FanoutConstants.distribution.DeliveryAndSignfor.EXCHANGE, type = ExchangeTypes.FANOUT) )) - @Transactional(rollbackFor = Exception.class) +// @Transactional(rollbackFor = Exception.class) public void buildReport(String msg) { if (!destinationProperties.getReport().getSignforReport()) { return; diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/StockReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/StockReportListener.java index cda00f1cb..8e65940a9 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/StockReportListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/StockReportListener.java @@ -54,7 +54,7 @@ public class StockReportListener { value = @Queue(name = FanoutConstants.distribution.stock.QUEUE.REPORT, durable = "true"), exchange = @Exchange(name = FanoutConstants.distribution.stock.EXCHANGE, type = ExchangeTypes.FANOUT) )) - @Transactional(rollbackFor = Exception.class) +// @Transactional(rollbackFor = Exception.class) public void buildReport(String msg) { if (!destinationProperties.getReport().getStockReport()) { return; diff --git a/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/mq/FactoryOrderListener.java b/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/mq/FactoryOrderListener.java index 3302a2229..6334a7de9 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/mq/FactoryOrderListener.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/mq/FactoryOrderListener.java @@ -52,7 +52,7 @@ public class FactoryOrderListener { exchange = @Exchange(name = FactoryDataConstants.Mq.Exchanges.FACTORY_ORDER, type = ExchangeTypes.TOPIC), key = FactoryDataConstants.Mq.RoutingKeys.OLO_FACTORY_ORDER )) - @Transactional(rollbackFor = Exception.class) +// @Transactional(rollbackFor = Exception.class) public void factoryOrder(String msg) { log.info("处理我乐订单：{}", msg); if (StrUtil.isEmpty(msg)) { diff --git a/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/mq/NodeDataPushListener.java b/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/mq/NodeDataPushListener.java index 5f87b8b19..2d1636412 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/mq/NodeDataPushListener.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-olo/src/main/java/com/logpm/factorydata/olo/mq/NodeDataPushListener.java @@ -63,7 +63,7 @@ public class NodeDataPushListener { exchange = @Exchange(name = FactoryDataConstants.Mq.Exchanges.NODE_DATA_PUSH, type = ExchangeTypes.TOPIC), key = FactoryDataConstants.Mq.RoutingKeys.OLO_NODE_DATA_PUSH )) - @Transactional(rollbackFor = Exception.class) +// @Transactional(rollbackFor = Exception.class) public void nodeDataPush(String msg) { log.info("接收到节点数据推送：{}", msg); if (checkData(msg)) { diff --git a/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/mq/FactoryOrderListener.java b/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/mq/FactoryOrderListener.java index 09a76a4b5..1087c6960 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/mq/FactoryOrderListener.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/mq/FactoryOrderListener.java @@ -56,7 +56,7 @@ public class FactoryOrderListener { exchange = @Exchange(name = FactoryDataConstants.Mq.Exchanges.FACTORY_ORDER, type = ExchangeTypes.TOPIC), key = FactoryDataConstants.Mq.RoutingKeys.SFY_FACTORY_ORDER )) - @Transactional(rollbackFor = Exception.class) +// @Transactional(rollbackFor = Exception.class) public void factoryOrder(String msg) { log.info("处理索菲亚订单：{}", msg); if (StrUtil.isEmpty(msg)) { diff --git a/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/mq/NodeDataPushListener.java b/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/mq/NodeDataPushListener.java index deafe3d85..7c2a2d0bb 100644 --- a/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/mq/NodeDataPushListener.java +++ b/blade-service/logpm-factory-data/logpm-factory-data-suofeiya/src/main/java/com/logpm/factorydata/suofeiya/mq/NodeDataPushListener.java @@ -49,7 +49,7 @@ public class NodeDataPushListener { exchange = @Exchange(name = FactoryDataConstants.Mq.Exchanges.NODE_DATA_PUSH, type = ExchangeTypes.TOPIC), key = FactoryDataConstants.Mq.RoutingKeys.SFY_NODE_DATA_PUSH )) - @Transactional(rollbackFor = Exception.class) +// @Transactional(rollbackFor = Exception.class) public void nodeDataPush(String msg) { log.info("接收到节点数据推送：{}", msg); if (checkData(msg)) { diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/receiver/OldTrayTypeListener.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/receiver/OldTrayTypeListener.java index 20679f291..09785bb7e 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/receiver/OldTrayTypeListener.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/receiver/OldTrayTypeListener.java @@ -36,7 +36,7 @@ public class OldTrayTypeListener { exchange = @Exchange(name = RabbitConstant.OLD_TRAY_TYPE_EXCHANGE, type = ExchangeTypes.DIRECT), key = RabbitConstant.OLD_TRAY_TYPE_ROUTING )) - @Transactional(rollbackFor = Exception.class) +// @Transactional(rollbackFor = Exception.class) public void oldTrayTypeInfo(String msg) { JSONObject jsonObject = JSONUtil.parseObj(msg);