开发：货单下订单列表修改状态文案以及增加处理货单定向司机表

performance-api/src/main/java/com/clx/order/params/PageCarrierOrderListParam.java

@@ -22,7 +22,7 @@ public class PageCarrierOrderListParam extends PageParam {
     @ApiModelProperty(value = "联系人(货主)id")
     private Integer contactId;
 
-    @ApiModelProperty(value = "订单状态：2报价已确认 3平台已承接  7 挂单中 8运输中 11 挂单中")
+    @ApiModelProperty(value = "订单状态：2:报价已确认 3:平台已承接  7:挂单中 8:运输中 11:已挂单")
     private Integer orderStatus;
 
     @ApiModelProperty(value = "开始时间", example = "2023-09-09 12:00:01", required = true)

performance-web/src/main/java/com/clx/performance/config/RabbitConfig.java

@@ -83,27 +83,27 @@ public class RabbitConfig implements RabbitListenerConfigurer {
 
 
     // 存在此名字的bean 自带的容器工厂会不加载（yml下rabbitmq下的listener下的simple配置），如果想自定义来区分开 需要改变bean 的名称
-    @Bean
-    public SimpleRabbitListenerContainerFactory rabbitListenerContainerFactory() {
-        SimpleRabbitListenerContainerFactory containerFactory = new SimpleRabbitListenerContainerFactory();
-        containerFactory.setConnectionFactory(rabbitConnectionFactory);
-
-        // 预加载消息数量 -- QOS
-        containerFactory.setPrefetchCount(1);
-        // 应答模式（此处设置为手动）
-        containerFactory.setAcknowledgeMode(AcknowledgeMode.MANUAL);
-        //消息序列化方式
-        containerFactory.setMessageConverter(new Jackson2JsonMessageConverter());
-        // 设置通知调用链 （这里设置的是重试机制的调用链）
-        containerFactory.setAdviceChain(
-                RetryInterceptorBuilder
-                        .stateless()
-                        .recoverer(new RejectAndDontRequeueRecoverer())
-                        //.retryOperations(rabbitRetryTemplate())
-                        .build()
-        );
-        return containerFactory;
-    }
+//    @Bean
+//    public SimpleRabbitListenerContainerFactory rabbitListenerContainerFactory() {
+//        SimpleRabbitListenerContainerFactory containerFactory = new SimpleRabbitListenerContainerFactory();
+//        containerFactory.setConnectionFactory(rabbitConnectionFactory);
+//
+//        // 预加载消息数量 -- QOS
+//        containerFactory.setPrefetchCount(1);
+//        // 应答模式（此处设置为手动）
+//        containerFactory.setAcknowledgeMode(AcknowledgeMode.MANUAL);
+//        //消息序列化方式
+//        containerFactory.setMessageConverter(new Jackson2JsonMessageConverter());
+//        // 设置通知调用链 （这里设置的是重试机制的调用链）
+//        containerFactory.setAdviceChain(
+//                RetryInterceptorBuilder
+//                        .stateless()
+//                        .recoverer(new RejectAndDontRequeueRecoverer())
+//                        //.retryOperations(rabbitRetryTemplate())
+//                        .build()
+//        );
+//        return containerFactory;
+//    }
 
     @Bean
     public SimpleMessageListenerContainer simpleMessageListenerContainer(SimpleRabbitListenerContainerFactory connectionFactory) {
@@ -133,29 +133,29 @@ public class RabbitConfig implements RabbitListenerConfigurer {
 
     //重试的Template
 
-
-    @Bean
-    public ExponentialBackOffPolicy backOffPolicyByProperties() {
-        ExponentialBackOffPolicy backOffPolicy = new ExponentialBackOffPolicy();
-        long maxInterval = properties.getListener().getSimple().getRetry().getMaxInterval().getSeconds();
-        long initialInterval = properties.getListener().getSimple().getRetry().getInitialInterval().getSeconds();
-        double multiplier = properties.getListener().getSimple().getRetry().getMultiplier();
-        // 重试间隔
-        backOffPolicy.setInitialInterval(initialInterval * 1000);
-        // 重试最大间隔
-        backOffPolicy.setMaxInterval(maxInterval * 1000);
-        // 重试间隔乘法策略
-        backOffPolicy.setMultiplier(multiplier);
-        return backOffPolicy;
-    }
-
-    @Bean
-    public SimpleRetryPolicy retryPolicyByProperties() {
-        SimpleRetryPolicy retryPolicy = new SimpleRetryPolicy();
-        int maxAttempts = properties.getListener().getSimple().getRetry().getMaxAttempts();
-        retryPolicy.setMaxAttempts(maxAttempts);
-        return retryPolicy;
-    }
+//
+//    @Bean
+//    public ExponentialBackOffPolicy backOffPolicyByProperties() {
+//        ExponentialBackOffPolicy backOffPolicy = new ExponentialBackOffPolicy();
+//        long maxInterval = properties.getListener().getSimple().getRetry().getMaxInterval().getSeconds();
+//        long initialInterval = properties.getListener().getSimple().getRetry().getInitialInterval().getSeconds();
+//        double multiplier = properties.getListener().getSimple().getRetry().getMultiplier();
+//        // 重试间隔
+//        backOffPolicy.setInitialInterval(initialInterval * 1000);
+//        // 重试最大间隔
+//        backOffPolicy.setMaxInterval(maxInterval * 1000);
+//        // 重试间隔乘法策略
+//        backOffPolicy.setMultiplier(multiplier);
+//        return backOffPolicy;
+//    }
+//
+//    @Bean
+//    public SimpleRetryPolicy retryPolicyByProperties() {
+//        SimpleRetryPolicy retryPolicy = new SimpleRetryPolicy();
+//        int maxAttempts = properties.getListener().getSimple().getRetry().getMaxAttempts();
+//        retryPolicy.setMaxAttempts(maxAttempts);
+//        return retryPolicy;
+//    }
 
     @Override
     public void configureRabbitListeners(RabbitListenerEndpointRegistrar registrar) {

performance-web/src/main/java/com/clx/performance/constant/RabbitKeyConstants.java

@@ -19,4 +19,6 @@ public class RabbitKeyConstants {
 
     public static final String ORDER_ON_DEAD_QUEUE ="order.on.dead.queue";
 
+
+    public static final String ORDER_GOODS_SYNC_TRUCK_DRIVER_INFO_QUEUE = "order.goods.sync.truck.driver.info.queue";
 }

performance-web/src/main/java/com/clx/performance/dao/OrderGoodsDriverTruckDao.java

@@ -13,4 +13,6 @@ import java.util.List;
  */
 public interface OrderGoodsDriverTruckDao extends BaseDao<OrderGoodsDriverTruckMapper, OrderGoodsDriverTruck, Integer> {
     List<Integer> getTrucksByOrderGoodsNo(String orderGoodsNo);
+
+    void deleteByTruckNoAndDriverUserNo(String truckNo, String driverUserNo);
 }

performance-web/src/main/java/com/clx/performance/dao/impl/OrderGoodsDriverTruckDaoImpl.java

 package com.clx.performance.dao.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.conditions.query.QueryChainWrapper;
 import com.clx.performance.dao.OrderGoodsDriverTruckDao;
 import com.msl.common.dao.BaseDao;
 import com.msl.common.dao.impl.BaseDaoImpl;
@@ -20,4 +22,12 @@ public class OrderGoodsDriverTruckDaoImpl extends BaseDaoImpl<OrderGoodsDriverTr
     public List<Integer> getTrucksByOrderGoodsNo(String orderGoodsNo) {
         return baseMapper.getTrucksByOrderGoodsNo(orderGoodsNo);
     }
+
+    @Override
+    public void deleteByTruckNoAndDriverUserNo(String truckNo, String driverUserNo) {
+        baseMapper.delete(new QueryWrapper<OrderGoodsDriverTruck>().lambda()
+                .eq(OrderGoodsDriverTruck::getTruckNo,truckNo)
+                .eq(OrderGoodsDriverTruck::getDriverUserNo, Long.valueOf(driverUserNo))
+        );
+    }
 }

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

-//package com.clx.performance.listener;
-//
-//import com.clx.performance.constant.RabbitKeyConstants;
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.amqp.rabbit.annotation.RabbitListener;
-//import org.springframework.stereotype.Component;
-//
-//@Component
-//@Slf4j
-//public class OrderGoodsDriverTruckListener {
-//
-//
-//    @RabbitListener(queues = RabbitKeyConstants.ORDER_ON_DEAD_QUEUE)
-//    public void onMessage(String message) throws Exception {
-//        log.info("处理订单状态由已挂单变为挂弹中监听器执行,订单ID为{}", message);
-//        if (StringUtils.isBlank(message)) {
-//            return;
-//        }
-//        OrderInfo orderInfo = orderInfoDao.getByOrderNo(message);
-//        if (orderInfo == null) {
-//            log.info("处理订单状态由已挂单变为挂弹中监听器未查询到订单数据,消息为{}", message);
-//            return;
-//        }
-//        if (OrderEnum.Status.POST_ORDER.getCode().equals(orderInfo.getOrderStatus())) {
-//            log.info("处理订单状态由已挂单变为挂单中监听器执行,从状态{}-----变更为{}", OrderEnum.Status.POST_ORDER.getName(), OrderEnum.Status.ON_ORDER.getName());
-//            orderInfoDao.updateOrderStatusById(orderInfo.getId(), OrderEnum.Status.ON_ORDER.getCode());
-//        }
-//    }
-//}
+package com.clx.performance.listener;
+
+import cn.hutool.json.JSON;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+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.lang3.StringUtils;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+@Component
+@Slf4j
+public class OrderGoodsDriverTruckListener {
+
+
+    @Autowired
+    private OrderGoodsDriverTruckDao orderGoodsDriverTruckDao;
+
+    @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");
+
+            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()));
+                    orderGoodsDriverTruckDao.saveEntity(driverTruck);
+                    log.info("处理货单定向司机表：执行插入");
+                    break;
+                case "2":
+                    if (truckNo == null || driverUserNo == null) {
+                        break;
+                    }
+                    orderGoodsDriverTruckDao.deleteByTruckNoAndDriverUserNo(truckNo.toString(), driverUserNo.toString());
+                    log.info("处理货单定向司机表：执行删除");
+                    break;
+                default:
+                    break;
+            }
+        }
+
+    }
+}

performance-web/src/main/java/com/clx/performance/model/OrderGoodsDriverTruck.java

@@ -26,14 +26,6 @@ public class OrderGoodsDriverTruck implements HasKey<Integer> {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-    @TableField("order_no")
-    @ApiModelProperty("订单编号")
-    private String orderNo;
-
-    @TableField("order_goods_no")
-    @ApiModelProperty("货单编号")
-    private String orderGoodsNo;
-
     @TableField("truck_id")
     @ApiModelProperty("车辆ID")
     private Integer truckId;
@@ -42,9 +34,17 @@ public class OrderGoodsDriverTruck implements HasKey<Integer> {
     @ApiModelProperty("车牌号")
     private String truckNo;
 
-    @TableField("order_user_no")
-    @ApiModelProperty("接单人用户编号")
-    private Long orderUserNo;
+    @TableField("driver_user_no")
+    @ApiModelProperty("司机用户编号")
+    private Long driverUserNo;
+
+    @TableField("driver_name")
+    @ApiModelProperty(value = "司机名称")
+    private String driverName;
+
+    @TableField("driver_mobile")
+    @ApiModelProperty("司机手机号")
+    private String driverMobile;
 
     @TableField("create_time")
     @ApiModelProperty("创建时间")
@@ -54,6 +54,7 @@ public class OrderGoodsDriverTruck implements HasKey<Integer> {
     @ApiModelProperty("修改时间")
     private LocalDateTime modifiedTime;
 
+
     @Override
     @KeyColumn("id")
     public Integer gainKey() {