From d09f872fd38e7106e1fea14b6518b6cd4298428f Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Wed, 12 Jun 2024 11:32:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E8=B6=85=E6=97=B6=E5=BC=82=E5=B8=B8=E6=8B=A6=E6=88=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/GlobalExceptionHandler.java | 27 ++++++++++++++++++ .../config/GlobalExceptionHandler.java | 28 +++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 blade-service/logpm-distribution/src/main/java/com/logpm/distribution/config/GlobalExceptionHandler.java create mode 100644 blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/config/GlobalExceptionHandler.java diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/config/GlobalExceptionHandler.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/config/GlobalExceptionHandler.java new file mode 100644 index 000000000..92519bd18 --- /dev/null +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/config/GlobalExceptionHandler.java @@ -0,0 +1,27 @@ +package com.logpm.distribution.config; + +import org.springblade.core.tool.api.R; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; + +@ControllerAdvice +public class GlobalExceptionHandler { + + + @ExceptionHandler(Exception.class) + public ResponseEntity handleCustomException(Exception e) { + // 从CustomException中获取errorCode和errorMessage + String errorMessage = e.getMessage(); + + // 创建一个自定义的响应体来封装错误信息 + if(errorMessage.contains("Communications link failure")){ + // 返回带有错误信息的HTTP响应 + return new ResponseEntity<>(R.fail(405,"请求超时，请重试"), HttpStatus.BAD_REQUEST); + } + // 返回带有错误信息的HTTP响应 + return new ResponseEntity<>(R.fail(400,errorMessage), HttpStatus.BAD_REQUEST); + } + +} diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/config/GlobalExceptionHandler.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/config/GlobalExceptionHandler.java new file mode 100644 index 000000000..14fb2ffee --- /dev/null +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/config/GlobalExceptionHandler.java @@ -0,0 +1,28 @@ +package com.logpm.trunkline.config; + +import com.mysql.cj.jdbc.exceptions.CommunicationsException; +import org.springblade.core.tool.api.R; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; + +@ControllerAdvice +public class GlobalExceptionHandler { + + + @ExceptionHandler(CommunicationsException.class) + public ResponseEntity handleCustomException(CommunicationsException e) { + // 从CustomException中获取errorCode和errorMessage + String errorMessage = e.getMessage(); + + // 创建一个自定义的响应体来封装错误信息 + if(errorMessage.contains("Communications link failure")){ + // 返回带有错误信息的HTTP响应 + return new ResponseEntity<>(R.fail(405,"请求超时，请重试"), HttpStatus.BAD_REQUEST); + } + // 返回带有错误信息的HTTP响应 + return new ResponseEntity<>(R.fail(e.getErrorCode(),errorMessage), HttpStatus.BAD_REQUEST); + } + +} From 5158b58fe4d602d739c5c30da4e8cc6c9b18fd48 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Wed, 12 Jun 2024 14:35:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=B9=B2=E7=BA=BFbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/TrunklineAdvanceServiceImpl.java | 6 ++- .../impl/TrunklineCarsLoadServiceImpl.java | 45 ++++++++++++++----- 2 files changed, 38 insertions(+), 13 deletions(-) diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java index cee666a21..9d954b043 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java @@ -980,7 +980,7 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl> parcelListEntityMap = parcelListEntityList.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getWaybillNumber)); + Map> parcelListEntityMap = parcelListEntityList.stream().filter(pl->!Objects.isNull(pl.getWaybillNumber())).collect(Collectors.groupingBy(DistributionParcelListEntity::getWaybillNumber)); List updateWaybillList = new ArrayList<>(); parcelListEntityMap.keySet().forEach(waybillNo->{ @@ -997,7 +997,9 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl{ stockArticleClient.updateOrderInfo(orderCode,warehouseId); diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java index d551729a9..444c31522 100644 --- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java +++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java @@ -1442,18 +1442,15 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl waybillNos = addList.stream().map(TrunklineCarsOrderDTO::getWaybillNo).collect(Collectors.toList()); - if(waybillNos.isEmpty()){ - log.warn("##########saveNew: 运单有变动，请重新做计划"); - throw new CustomerException(400, "运单有变动，请重新做计划"); + if(!waybillNos.isEmpty()){ + List freezeOrAbolishWaybillList = warehouseWaybillClient.findFreezeOrAbolishByWaybillNos(waybillNos); + if (!CollUtil.isEmpty(freezeOrAbolishWaybillList)) { + log.warn("##########saveNew: 运单有变动，请重新做计划"); + throw new CustomerException(400, "运单有变动，请重新做计划"); + } } - List freezeOrAbolishWaybillList = warehouseWaybillClient.findFreezeOrAbolishByWaybillNos(waybillNos); - if (!CollUtil.isEmpty(freezeOrAbolishWaybillList)) { - log.warn("##########saveNew: 运单有变动，请重新做计划"); - throw new CustomerException(400, "运单有变动，请重新做计划"); - } - for (TrunklineCarsOrderDTO trunklineCarsOrderDTO : addList) { TrunklineCarsOrderEntity trunklineCarsOrderEntity = new TrunklineCarsOrderEntity(); BeanUtil.copy(trunklineCarsOrderDTO, trunklineCarsOrderEntity); @@ -2129,6 +2126,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("load_id", loadId) @@ -2446,6 +2458,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl planNum) { isAbnormal = 1; remark = "有数据,有计划,大于计划件数,异常装车"; + audio = "大于计划数量装车"; } } @@ -2518,6 +2532,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl planNum) { isAbnormal = 1; remark = "有数据,有计划,大于计划件数,异常装车"; + audio = "大于计划数量装车"; } } @@ -2527,11 +2542,13 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl