Add JAXB dependencies, update transport order logic, refine CourierMQ listener, …

…and adjust CORS configuration

Add JAXB dependencies, update transport order logic, refine CourierMQ listener, …
…and adjust CORS configuration
shaofan
1 parent df3394c5
Showing 6 changed files with 53 additions and 9 deletions
sl-express-gateway/src/main/resources/bootstrap-local.yml
sl-express-ms-web-driver/pom.xml
sl-express-ms-work-service/src/main/java/com/sl/ms/work/mq/CourierMQListener.java
sl-express-ms-work-service/src/main/java/com/sl/ms/work/mq/TransportTaskMQListener.java
sl-express-ms-work-service/src/main/java/com/sl/ms/work/service/impl/PickupDispatchTaskServiceImpl.java
sl-express-ms-work-service/src/main/java/com/sl/ms/work/service/impl/TransportOrderServiceImpl.java
@@ -19,9 +19,7 @@ spring:
       globalcors:
         cors-configurations:
           '[/**]':
-            allowed-origins:
-              - "http://127.0.0.1:5173"
-              - "http://localhost:5173"
+            allowed-origin-patterns: "*"
             allowed-headers: "*"
             allow-credentials: true
             allowed-methods:
@@ -28,6 +28,26 @@
  
     <dependencies>
         <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.2.11</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-core</artifactId>
+            <version>2.2.11</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>2.2.11</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.activation</groupId>
+            <artifactId>activation</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+        <dependency>
             <groupId>com.sl-express.common</groupId>
             <artifactId>sl-express-common</artifactId>
             <version>${sl-express-common.version}</version>
 package com.sl.ms.work.mq;
  
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
+import com.sl.ms.base.api.common.MQFeign;
 import com.sl.ms.oms.api.OrderFeign;
 import com.sl.ms.oms.dto.OrderDTO;
 import com.sl.ms.oms.enums.OrderStatus;
@@ -11,6 +13,7 @@ import com.sl.ms.work.domain.enums.pickupDispatchtask.PickupDispatchTaskSignStat
 import com.sl.ms.work.domain.enums.pickupDispatchtask.PickupDispatchTaskStatus;
 import com.sl.ms.work.domain.enums.pickupDispatchtask.PickupDispatchTaskType;
 import com.sl.ms.work.entity.PickupDispatchTaskEntity;
+import com.sl.ms.work.entity.TransportOrderEntity;
 import com.sl.ms.work.service.PickupDispatchTaskService;
 import com.sl.ms.work.service.TransportOrderService;
 import com.sl.transport.common.constant.Constants;
@@ -19,6 +22,7 @@ import com.sl.transport.common.util.BeanUtil;
 import com.sl.transport.common.util.ObjectUtil;
 import com.sl.transport.common.vo.CourierMsg;
 import com.sl.transport.common.vo.CourierTaskMsg;
+import com.sl.transport.common.vo.TransportInfoMsg;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.ExchangeTypes;
 import org.springframework.amqp.rabbit.annotation.Exchange;
@@ -28,6 +32,7 @@ import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
  
+import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.List;
@@ -49,6 +54,9 @@ public class CourierMQListener {
     @Autowired
     private OrderFeign orderFeign;
  
+    @Autowired
+    private MQFeign mqFeign;
+
  
     /**
      * 生成快递员取派件任务
@@ -131,7 +139,19 @@ public class CourierMQListener {
         log.info("接收到快递员取件成功的消息 >>> msg = {}", msg);
         //解析消息
         CourierMsg courierMsg = JSONUtil.toBean(msg, CourierMsg.class);
-        System.out.println(courierMsg);
-        //TODO 未实现具体逻辑
+
+        //订单转运单
+        TransportOrderEntity transportOrder = this.transportOrderService.orderToTransportOrder(courierMsg.getOrderId());
+
+        //发送运单跟踪消息
+        String info = StrUtil.format("神领快递员已取件， 取件人【{}，电话 {}】", courierMsg.getCourierName(), courierMsg.getCourierMobile());
+        //构建消息实体类
+        String transportInfoMsg = TransportInfoMsg.builder()
+                .transportOrderId(transportOrder.getId())//运单id
+                .status("已取件")//消息状态
+                .info(info)//消息详情
+                .created(DateUtil.current())//创建时间
+                .build().toJson();
+        this.mqFeign.sendMsg(Constants.MQ.Exchanges.TRANSPORT_INFO, Constants.MQ.RoutingKeys.TRANSPORT_INFO_APPEND, transportInfoMsg);
     }
 }
@@ -34,6 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
  
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
  
@@ -67,9 +68,12 @@ public class TransportTaskMQListener {
     public void listenTransportTaskMsg(String msg) {
         //解析消息 {"driverIds":[123,345], "truckPlanId":456, "truckId":1210114964812075008,"totalVolume":4.2,"endOrganId":90001,"totalWeight":7,"transportOrderIdList":[320733749248,420733749248],"startOrganId":100280}
         JSONObject jsonObject = JSONUtil.parseObj(msg);
-
+        JSONArray driverIds1 = jsonObject.getJSONArray("driverIds");
+        List<Long> driverIds = new ArrayList<>();
+        for (Object o : driverIds1.toArray()) {
+            driverIds.add(Convert.toLong(o));
+        }
 //        获取到司机ID列表
-        List<Long> driverIds = CollUtil.getFieldValues(jsonObject, "driverIds", Long.class);
  
 //        分配状态
         TransportTaskAssignedStatus assignedStatus = CollUtil.isEmpty(driverIds) ? TransportTaskAssignedStatus.MANUAL_DISTRIBUTED : TransportTaskAssignedStatus.DISTRIBUTED;
@@ -60,11 +60,12 @@ public class PickupDispatchTaskServiceImpl extends ServiceImpl&lt;TaskPickupDispatc
     @Transactional
     public Boolean updateStatus(PickupDispatchTaskDTO pickupDispatchTaskDTO) {
         WorkExceptionEnum paramError = WorkExceptionEnum.PICKUP_DISPATCH_TASK_PARAM_ERROR;
-        if (ObjectUtil.hasEmpty(pickupDispatchTaskDTO.getId(), pickupDispatchTaskDTO.getStatus())) {
+        PickupDispatchTaskStatus status = pickupDispatchTaskDTO.getStatus();
+        if (ObjectUtil.hasEmpty(pickupDispatchTaskDTO.getId(), status)) {
             throw new SLException("更新取派件任务状态，id或status不能为空", paramError.getCode());
         }
-
         PickupDispatchTaskEntity pickupDispatchTask = getById(pickupDispatchTaskDTO.getId());
+        pickupDispatchTask.setStatus(status);
  
         switch (pickupDispatchTask.getStatus()) {
             case NEW:
@@ -159,6 +159,7 @@ public class TransportOrderServiceImpl extends
             transportOrder.setNextAgencyId(sendAgentId);
             //运单状态(1.新建 2.已装车 3.运输中 4.到达终端网点 5.已签收 6.拒收)
             transportOrder.setStatus(TransportOrderStatus.ARRIVED_END);
+            transportOrder.setIsRejection(false);
             //调度状态(1.待调度2.未匹配线路3.已调度)
             transportOrder.setSchedulingStatus(TransportOrderSchedulingStatus.SCHEDULED);
         }