新增订单信息接口

sckw-common/sckw-common-core/src/main/java/com/sckw/core/filter/LoginFilter.java

@@ -68,7 +68,6 @@ public class LoginFilter implements Filter {
             filterChain.doFilter(servletRequest, servletResponse);
             return;
         }
-        if (true) return;
         /*2、校验token有效性*/
         //token解析后为用户id
         String token = request.getHeader(RequestConstant.TOKEN);

sckw-common/sckw-common-core/src/main/java/com/sckw/core/filter/RequestCheckFilter.java

@@ -89,7 +89,6 @@ public class RequestCheckFilter implements Filter {
         Integer systemType = request.getIntHeader(RequestConstant.SYSTEM_TYPE);
         String accessSpecial = request.getHeader(RequestConstant.ACCESS_SPECIAL);
         String requestUri = request.getRequestURI();
-        if (true)   filterChain.doFilter(servletRequest, servletResponse);
         /*1、非token校验接口放行*/
         if (EXCLUDEPATH.contains(requestUri)) {
             filterChain.doFilter(servletRequest, servletResponse);

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/dto/WaybillOrderRequest.java

@@ -18,13 +18,7 @@ public class WaybillOrderRequest implements Serializable {
      * 运单号id
      */
     @Schema(description = "运单号id")
-    private Long wOrderId;
+    private Long orderId;
 
-    public Long getwOrderId() {
-        return wOrderId;
-    }
 
-    public void setwOrderId(Long wOrderId) {
-        this.wOrderId = wOrderId;
-    }
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtWaybillOrderV1Service.java

@@ -28,10 +28,7 @@ import com.sckw.stream.model.SckwMessage;
 import com.sckw.stream.model.UserInfo;
 import com.sckw.system.api.RemoteSystemService;
 import com.sckw.system.api.RemoteUserService;
-import com.sckw.system.api.model.dto.res.AreaTreeFrontResDto;
-import com.sckw.system.api.model.dto.res.EntCacheResDto;
-import com.sckw.system.api.model.dto.res.SysDictResDto;
-import com.sckw.system.api.model.dto.res.UserCacheResDto;
+import com.sckw.system.api.model.dto.res.*;
 import com.sckw.transport.common.config.UrlConfigProperties;
 import com.sckw.transport.dao.*;
 import com.sckw.transport.model.*;
@@ -2866,19 +2863,19 @@ public class KwtWaybillOrderV1Service {
      * @date 2024/3/13
      **/
     public WaybillOrderDetailVo queryBillOrderInfo(WaybillOrderRequest params) {
-        if (params.getwOrderId() == null) {
+        if (params.getOrderId() == null) {
             throw new RuntimeException("运单号id不能为空");
         }
         //运单信息
-        KwtWaybillOrderV1 waybillOrder = waybillOrderV1Dao.selectById(params.getwOrderId());
+        KwtWaybillOrderV1 waybillOrder = waybillOrderV1Dao.selectById(params.getOrderId());
         if (waybillOrder == null) {
-            throw new RuntimeException("运单" + params.getwOrderId() + "不存在，请确认！");
+            throw new RuntimeException("运单" + params.getOrderId() + "不存在，请确认！");
         }
         WaybillOrderDetailVo orderDetailVo = new WaybillOrderDetailVo();
         //车队车辆映射关系
         RFleetDriverVo fleetByDriveId = remoteFleetService.findFleetByDriveId(waybillOrder.getDriverId());
         if  (fleetByDriveId == null) {
-            throw new RuntimeException("运单:" + params.getwOrderId() + ", 车辆信息不存在，请确认！");
+            throw new RuntimeException("运单:" + params.getOrderId() + ", 车辆信息不存在，请确认！");
         }
 
         //查询车辆信息
@@ -2890,14 +2887,14 @@ public class KwtWaybillOrderV1Service {
         orderDetailVo.setFleetName(Optional.ofNullable(fleetVO).map(RFleetVo::getName).orElse(""));
 
         //查询企业信息
-        EntCacheResDto entCacheResDto = remoteSystemService.queryEntCacheById(waybillOrder.getEntId());
+        KwsEnterpriseResDto entCacheResDto = remoteSystemService.queryEnterpriseByEntId(waybillOrder.getEntId());
         orderDetailVo.setEntId(waybillOrder.getEntId());
-        orderDetailVo.setEntName(Optional.ofNullable(entCacheResDto).map(EntCacheResDto::getFirmName).orElse(""));
+        orderDetailVo.setEntName(Optional.ofNullable(entCacheResDto).map(KwsEnterpriseResDto::getFirmName).orElse(""));
 
         //查询位置信息
         List<KwtWaybillOrderAddress> orderAddresses = waybillOrderAddressRepository.queryBywOrderIds(Arrays.asList(waybillOrder.getId()));
         if (CollectionUtils.isEmpty(orderAddresses)) {
-            throw new RuntimeException("运单:" + params.getwOrderId() + ", 地址信息不存在，请确认！");
+            throw new RuntimeException("运单:" + params.getOrderId() + ", 地址信息不存在，请确认！");
         }
 
         Map<Integer, String> addressNameMap = orderAddresses.stream()