From f01bc656a4d367aa2dd8aa286f68142e705c7381 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Tue, 22 Oct 2024 12:01:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=8F=96=E6=B6=88=E8=80=81=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E5=85=A5=E5=BA=93=E7=9A=84=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BasicdataDriverArteryController.java          | 12 +++++++++---
 .../impl/BasicdataDriverArteryServiceImpl.java    | 15 ++++++++-------
 .../controller/FactoryCommonController.java       |  4 ++--
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java
index 711134592..b9a233e05 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java
@@ -38,6 +38,7 @@ import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
+import org.springblade.common.exception.CustomerException;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.log.exception.ServiceException;
@@ -292,9 +293,14 @@ public class BasicdataDriverArteryController extends BladeController {
 	@ApiOperation(value = "导入司机信息", notes = "传入excel")
 	public R importDriverArteryEntry(MultipartFile file) {
 		log.info("传入>>>>>>>{}", file);
-		BasicdataDriverArteryImporter basicdataDriverArteryImporter = new BasicdataDriverArteryImporter(basicdataDriverArteryService);
-		ExcelUtil.save(file, basicdataDriverArteryImporter, BasicdataDriverArteryImproterExcel.class);
-		return R.success("操作成功");
+		try {
+			BasicdataDriverArteryImporter basicdataDriverArteryImporter = new BasicdataDriverArteryImporter(basicdataDriverArteryService);
+			ExcelUtil.save(file, basicdataDriverArteryImporter, BasicdataDriverArteryImproterExcel.class);
+			return R.success("操作成功");
+		} catch (CustomerException e) {
+			log.error("导入失败", e);
+			return R.fail(e.getMessage());
+		}
 	}
 
 	/**
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataDriverArteryServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataDriverArteryServiceImpl.java
index b872b50dd..05e76453b 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataDriverArteryServiceImpl.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataDriverArteryServiceImpl.java
@@ -44,6 +44,7 @@ import org.springblade.common.constant.driver.DriverApprovedDrivingModelConstant
 import org.springblade.common.constant.driver.DriverBankTypeConverter;
 import org.springblade.common.constant.driver.DriverPositionTypeConstant;
 import org.springblade.common.constant.driver.DriverTypeStatusConstant;
+import org.springblade.common.exception.CustomerException;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.BladeUser;
@@ -268,7 +269,7 @@ public class BasicdataDriverArteryServiceImpl extends BaseServiceImpl<BasicdataD
 
 //				log.error("必填数据不能为空");
 //				continue;
-                    throw new ServiceException("必填数据不能为空！");
+                    throw new CustomerException("必填数据不能为空！");
                 }
                 if (!ObjectUtils.isEmpty(datum.getPhone())) {
                     String phone = datum.getPhone();
@@ -281,7 +282,7 @@ public class BasicdataDriverArteryServiceImpl extends BaseServiceImpl<BasicdataD
                     if (userR.getData() == null) {
 //					log.error("未找到用户");
 //					continue;
-                        throw new ServiceException("未找到用户！");
+                        throw new CustomerException("未找到用户！");
                     } else {
                         datum.setUserId(userR.getData().getId());
                     }
@@ -293,7 +294,7 @@ public class BasicdataDriverArteryServiceImpl extends BaseServiceImpl<BasicdataD
 
                         if (carListByName.isEmpty()) {
 //						log.error("未找到可绑定的车辆");
-                            throw new ServiceException("未找到可绑定的车辆！");
+                            throw new CustomerException("未找到可绑定的车辆！");
                         } else {
                             BasicdataDrivermiddleEntity basicdataDrivermiddleEntity = new BasicdataDrivermiddleEntity();
                             basicdataDrivermiddleEntity.setBrandId(carListByName.get(0).getId());
@@ -308,7 +309,7 @@ public class BasicdataDriverArteryServiceImpl extends BaseServiceImpl<BasicdataD
                     if (ObjectUtils.isEmpty(basicdataCarrierEntities)) {
 //					log.error("未找到承运商");
 //					continue;
-                        throw new ServiceException("未找到承运商！");
+                        throw new CustomerException("未找到承运商！");
                     } else {
                         datum.setCarrierId(basicdataCarrierEntities.get(0).getId());
                     }
@@ -375,11 +376,11 @@ public class BasicdataDriverArteryServiceImpl extends BaseServiceImpl<BasicdataD
                     basicdataDrivermiddleServiceImpl.save(basicdataDrivermiddleEntity);
                 }
             } catch (DataAccessException e) {
-                throw new ServiceException("用户" + datum.getName() + "数据长度异常");
+                throw new CustomerException("用户" + datum.getName() + "数据长度异常");
             } catch (ServiceException e) {
-                throw new ServiceException("用户" + datum.getName() + e.getMessage());
+                throw new CustomerException("用户" + datum.getName() + e.getMessage());
             } catch (Exception e) {
-                throw new RuntimeException("用户" + datum.getName() + "数据错误" + e.getMessage());
+                throw new CustomerException("用户" + datum.getName() + "数据错误" + e.getMessage());
             }
 
         }
diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/controller/FactoryCommonController.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/controller/FactoryCommonController.java
index cc9c1e578..11135b05b 100644
--- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/controller/FactoryCommonController.java
+++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/comfac/controller/FactoryCommonController.java
@@ -107,12 +107,12 @@ public class FactoryCommonController {
 			// 将消息携带绑定键值
 			rabbitTemplate.convertAndSend(RabbitConstant.ORDER_STATUS_EXCHANGE, RabbitConstant.ORDER_STATUS_ROUTING, map);
 			map.put("type", "DealWith");
-			if (StringUtil.equals(sendDataProperties.getPush(), "old")) {
+//			if (StringUtil.equals(sendDataProperties.getSend(), "old")) {
 				rabbitTemplate.convertAndSend(RabbitConstant.DEAL_WITH_EXCHANGE, RabbitConstant.DEAL_WITH_ROUTING, map, message -> {
 					message.getMessageProperties().setHeader("x-delay", 2000);
 					return message;
 				});
-			}
+//			}
 
 //			R r = factoryDataService.handleStatusData(orderStatusDTO);
 			return R.success("调用成功");