|
|
@@ -9,18 +9,13 @@ import com.sckw.core.exception.BusinessException;
|
|
|
import com.sckw.core.model.constant.UrlConstants;
|
|
|
import com.sckw.core.model.enums.AddressTypeEnum;
|
|
|
import com.sckw.core.model.enums.CarWaybillEnum;
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-import com.sckw.core.web.response.result.PageDataResult;
|
|
|
-
|
|
|
-import com.sckw.fleet.api.model.vo.RDriverVo;
|
|
|
-import com.sckw.fleet.api.model.vo.RFleetDriverVo;
|
|
|
-import com.sckw.transport.common.config.UrlConfigProperties;
|
|
|
import com.sckw.core.utils.DateUtils;
|
|
|
import com.sckw.core.utils.HttpUtil;
|
|
|
import com.sckw.core.web.constant.CommonConstants;
|
|
|
+import com.sckw.core.web.response.result.PageDataResult;
|
|
|
import com.sckw.fleet.api.RemoteFleetService;
|
|
|
+import com.sckw.fleet.api.model.vo.RDriverVo;
|
|
|
+import com.sckw.fleet.api.model.vo.RFleetDriverVo;
|
|
|
import com.sckw.fleet.api.model.vo.RTruckVo;
|
|
|
import com.sckw.manage.api.RemoteManageService;
|
|
|
import com.sckw.order.api.dubbo.RemoteTradeOrderAmountService;
|
|
|
@@ -30,6 +25,7 @@ import com.sckw.product.api.dubbo.GoodsInfoService;
|
|
|
import com.sckw.redis.utils.RedissonUtils;
|
|
|
import com.sckw.system.api.RemoteSystemService;
|
|
|
import com.sckw.system.api.model.dto.res.KwsEnterpriseResDto;
|
|
|
+import com.sckw.transport.common.config.UrlConfigProperties;
|
|
|
import com.sckw.transport.model.KwtWaybillOrder;
|
|
|
import com.sckw.transport.model.KwtWaybillOrderAddress;
|
|
|
import com.sckw.transport.model.KwtWaybillOrderSubtask;
|
|
|
@@ -48,15 +44,12 @@ import com.sckw.transport.repository.KwtWaybillOrderRepository;
|
|
|
import com.sckw.transport.repository.KwtWaybillOrderSubtaskRepository;
|
|
|
import com.sckw.transport.response.CollectZjxlResponse;
|
|
|
import com.sckw.transport.service.zj.VehicleCollectService;
|
|
|
-import jakarta.annotation.Resource;
|
|
|
import jakarta.validation.Valid;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.collections4.CollectionUtils;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.apache.dubbo.config.annotation.DubboReference;
|
|
|
-import org.apache.poi.ss.formula.functions.T;
|
|
|
-import org.jetbrains.annotations.NotNull;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.time.LocalDateTime;
|
|
|
@@ -75,8 +68,7 @@ public class kwfTruckTraceService {
|
|
|
private final KwtWaybillOrderAddressRepository kwtWaybillOrderAddressRepository;
|
|
|
private final UrlConfigProperties urlConfigProperties;
|
|
|
private final KwtWaybillOrderSubtaskRepository kwtWaybillOrderSubtaskRepository;
|
|
|
- @Resource
|
|
|
- private VehicleCollectService vehicleCollectService;
|
|
|
+ private final VehicleCollectService vehicleCollectService;
|
|
|
|
|
|
@DubboReference(version = "1.0.0", group = "design", check = false, timeout = 8000)
|
|
|
RemoteSystemService remoteSystemService;
|