Merge remote-tracking branch 'origin/v26.2-jdk17springboot3-20240912' into test_jdk17

performance-web/src/main/java/com/clx/performance/listener/OrderGoodsDriverTruckListener.java

@@ -7,6 +7,7 @@ import com.clx.performance.constant.RabbitKeyConstants;
 import com.clx.performance.dao.OrderGoodsDriverTruckDao;
 import com.clx.performance.model.OrderGoodsDriverTruck;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.exception.ExceptionUtils;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,47 +25,53 @@ public class OrderGoodsDriverTruckListener {
     @RabbitListener(queues = RabbitKeyConstants.ORDER_GOODS_SYNC_TRUCK_DRIVER_INFO_QUEUE)
     @Transactional(rollbackFor = Exception.class)
     public void onMessage(Message message) throws Exception {
-        log.info("处理货单定向司机表,数据为{}", message);
-        JSONArray jsonArray = JSONUtil.parseArray(new String(message.getBody()));
-        if (jsonArray.isEmpty()) {
-            log.info("处理货单定向司机表,数据为空,不处理");
-            return;
-        }
-        for (Object o : jsonArray) {
-            JSONObject jsonObject = (JSONObject) o;
-            Object driverUserNo = jsonObject.getByPath("driverUserNo");
-            Object operateType = jsonObject.getByPath("operateType");
-            Object driverName = jsonObject.getByPath("driverName");
-            Object truckNo = jsonObject.getByPath("truckNo");
-            Object driverMobile = jsonObject.getByPath("driverMobile");
-            Object truckId = jsonObject.getByPath("truckId");
-            switch (operateType.toString()) {
-                case "1":
-                    OrderGoodsDriverTruck driverTruck = new OrderGoodsDriverTruck();
-                    driverTruck.setTruckNo(truckNo == null ? "" : truckNo.toString());
-                    driverTruck.setDriverMobile(driverMobile == null ? "" : driverMobile.toString());
-                    driverTruck.setDriverName(driverName == null ? "" : driverName.toString());
-                    driverTruck.setDriverUserNo(driverUserNo == null ? null : Long.valueOf(driverUserNo.toString()));
-                    driverTruck.setTruckId(truckId == null ? null : Integer.valueOf(truckId.toString()));
+        try{
+            log.info("处理货单定向司机表,数据为{}", message);
+            JSONArray jsonArray = JSONUtil.parseArray(new String(message.getBody()));
+            if (jsonArray.isEmpty()) {
+                log.info("处理货单定向司机表,数据为空,不处理");
+                return;
+            }
+            for (Object o : jsonArray) {
+                JSONObject jsonObject = (JSONObject) o;
+                Object driverUserNo = jsonObject.getByPath("driverUserNo");
+                Object operateType = jsonObject.getByPath("operateType");
+                Object driverName = jsonObject.getByPath("driverName");
+                Object truckNo = jsonObject.getByPath("truckNo");
+                Object driverMobile = jsonObject.getByPath("driverMobile");
+                Object truckId = jsonObject.getByPath("truckId");
+                switch (operateType.toString()) {
+                    case "1":
+                        OrderGoodsDriverTruck driverTruck = new OrderGoodsDriverTruck();
+                        driverTruck.setTruckNo(truckNo == null ? "" : truckNo.toString());
+                        driverTruck.setDriverMobile(driverMobile == null ? "" : driverMobile.toString());
+                        driverTruck.setDriverName(driverName == null ? "" : driverName.toString());
+                        driverTruck.setDriverUserNo(driverUserNo == null ? null : Long.valueOf(driverUserNo.toString()));
+                        driverTruck.setTruckId(truckId == null ? null : Integer.valueOf(truckId.toString()));
 
-                    orderGoodsDriverTruckDao.saveEntity(driverTruck);
-                    log.info("处理货单定向司机表：执行插入");
-                    break;
-                case "2":
-                    if (truckNo == null || driverUserNo == null) {
+                        orderGoodsDriverTruckDao.saveEntity(driverTruck);
+                        log.info("处理货单定向司机表：执行插入");
+                        break;
+                    case "2":
+                        if (truckNo == null || driverUserNo == null) {
+                            break;
+                        }
+                        orderGoodsDriverTruckDao.deleteByTruckNoAndDriverUserNo(truckNo.toString(), driverUserNo.toString(), Integer.valueOf(truckId.toString()));
+                        log.info("处理货单定向司机表：执行删除");
+                        break;
+                    case "3":
+                        orderGoodsDriverTruckDao.updateTruckNoByTruckId(truckNo.toString(), Integer.valueOf(truckId.toString()));
+                        log.info("处理货单定向司机表：执行更新");
                         break;
-                    }
-                    orderGoodsDriverTruckDao.deleteByTruckNoAndDriverUserNo(truckNo.toString(), driverUserNo.toString(), Integer.valueOf(truckId.toString()));
-                    log.info("处理货单定向司机表：执行删除");
-                    break;
-                case "3":
-                    orderGoodsDriverTruckDao.updateTruckNoByTruckId(truckNo.toString(), Integer.valueOf(truckId.toString()));
-                    log.info("处理货单定向司机表：执行更新");
-                    break;
-                default:
-                    break;
+                    default:
+                        break;
+                }
             }
+        }catch(Exception e){
+            log.error("处理货单定向司机表发生异常，,数据为{}，异常原因：{}", message, ExceptionUtils.getStackTrace(e));
+
         }
 
+
     }
 }