|
@@ -25,7 +25,6 @@ import com.sckw.core.web.context.LoginUserHolder;
|
|
|
import com.sckw.core.web.response.HttpResult;
|
|
import com.sckw.core.web.response.HttpResult;
|
|
|
import com.sckw.excel.easyexcel.ExcelImportListener;
|
|
import com.sckw.excel.easyexcel.ExcelImportListener;
|
|
|
import com.sckw.excel.utils.ExcelUtil;
|
|
import com.sckw.excel.utils.ExcelUtil;
|
|
|
-import com.sckw.file.api.dubbo.FileApiDubboService;
|
|
|
|
|
import com.sckw.fleet.dao.*;
|
|
import com.sckw.fleet.dao.*;
|
|
|
import com.sckw.fleet.model.*;
|
|
import com.sckw.fleet.model.*;
|
|
|
import com.sckw.fleet.model.dto.*;
|
|
import com.sckw.fleet.model.dto.*;
|
|
@@ -47,12 +46,10 @@ import com.sckw.transport.api.dubbo.TransportRemoteService;
|
|
|
import com.sckw.transport.api.model.param.CapacityTruckParam;
|
|
import com.sckw.transport.api.model.param.CapacityTruckParam;
|
|
|
import com.sckw.transport.api.model.vo.RWaybillOrderVo;
|
|
import com.sckw.transport.api.model.vo.RWaybillOrderVo;
|
|
|
import com.sckw.transport.api.model.vo.WaybillOrderTaskVO;
|
|
import com.sckw.transport.api.model.vo.WaybillOrderTaskVO;
|
|
|
-import io.seata.spring.annotation.GlobalTransactional;
|
|
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.dubbo.config.annotation.DubboReference;
|
|
import org.apache.dubbo.config.annotation.DubboReference;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
-import org.springframework.transaction.annotation.Propagation;
|
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
|
@@ -89,8 +86,7 @@ public class KwfDriverService {
|
|
|
KwfFleetDriverMapper fleetDriverDao;
|
|
KwfFleetDriverMapper fleetDriverDao;
|
|
|
@DubboReference(version = "1.0.0", group = "design", check = false)
|
|
@DubboReference(version = "1.0.0", group = "design", check = false)
|
|
|
private RemoteSystemService remoteSystemService;
|
|
private RemoteSystemService remoteSystemService;
|
|
|
- @DubboReference(version = "1.0.0", group = "design", check = false)
|
|
|
|
|
- private FileApiDubboService remoteFileService;
|
|
|
|
|
|
|
+
|
|
|
@DubboReference(version = "1.0.0", group = "design", check = false, timeout = 8000)
|
|
@DubboReference(version = "1.0.0", group = "design", check = false, timeout = 8000)
|
|
|
private RemoteUserService remoteUserService;
|
|
private RemoteUserService remoteUserService;
|
|
|
@Autowired
|
|
@Autowired
|
|
@@ -374,7 +370,7 @@ public class KwfDriverService {
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public void saveTruckAndAssociate(DriverAssociatedTruckSaveRequest request) {
|
|
public void saveTruckAndAssociate(DriverAssociatedTruckSaveRequest request) {
|
|
|
log.info("开始新增车辆档案并关联司机,request={}", JSON.toJSONString(request));
|
|
log.info("开始新增车辆档案并关联司机,request={}", JSON.toJSONString(request));
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
String entId = request.getEntId();
|
|
String entId = request.getEntId();
|
|
|
if (org.apache.commons.lang3.StringUtils.isBlank(entId)) {
|
|
if (org.apache.commons.lang3.StringUtils.isBlank(entId)) {
|
|
|
log.error("新增车辆档案失败:企业id不能为空");
|
|
log.error("新增车辆档案失败:企业id不能为空");
|
|
@@ -396,6 +392,7 @@ public class KwfDriverService {
|
|
|
truckSaveParam.setVin(request.getVin());
|
|
truckSaveParam.setVin(request.getVin());
|
|
|
truckSaveParam.setBrand(request.getBrand());
|
|
truckSaveParam.setBrand(request.getBrand());
|
|
|
truckSaveParam.setPositionDevice(request.getPositionDevice());
|
|
truckSaveParam.setPositionDevice(request.getPositionDevice());
|
|
|
|
|
+
|
|
|
truckSaveParam.setEntId(StringUtils.isNotBlank(entId) ? Long.valueOf(entId) : LoginUserHolder.getEntId());
|
|
truckSaveParam.setEntId(StringUtils.isNotBlank(entId) ? Long.valueOf(entId) : LoginUserHolder.getEntId());
|
|
|
log.info("调用truckService.saveTruck保存车辆档案,truckNo={}", request.getTruckNo());
|
|
log.info("调用truckService.saveTruck保存车辆档案,truckNo={}", request.getTruckNo());
|
|
|
try {
|
|
try {
|
|
@@ -411,7 +408,7 @@ public class KwfDriverService {
|
|
|
KwfTruck truck = truckRepository.getOne(Wrappers.<KwfTruck>lambdaQuery()
|
|
KwfTruck truck = truckRepository.getOne(Wrappers.<KwfTruck>lambdaQuery()
|
|
|
.eq(KwfTruck::getTruckNo, request.getTruckNo())
|
|
.eq(KwfTruck::getTruckNo, request.getTruckNo())
|
|
|
.last("limit 1"));
|
|
.last("limit 1"));
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
if (truck == null) {
|
|
if (truck == null) {
|
|
|
log.error("车辆档案保存后查询失败,truckNo={}", request.getTruckNo());
|
|
log.error("车辆档案保存后查询失败,truckNo={}", request.getTruckNo());
|
|
|
throw new BusinessPlatfromException(ErrorCodeEnum.TRUCK_NOT_FOUND, "车辆档案保存失败");
|
|
throw new BusinessPlatfromException(ErrorCodeEnum.TRUCK_NOT_FOUND, "车辆档案保存失败");
|
|
@@ -424,7 +421,7 @@ public class KwfDriverService {
|
|
|
associatedTrackAddRequest.setDriverId(request.getDriverId());
|
|
associatedTrackAddRequest.setDriverId(request.getDriverId());
|
|
|
associatedTrackAddRequest.setTruckNo(truck.getTruckNo());
|
|
associatedTrackAddRequest.setTruckNo(truck.getTruckNo());
|
|
|
associatedTrackAddRequest.setTruckAxleId(request.getTruckAxleId());
|
|
associatedTrackAddRequest.setTruckAxleId(request.getTruckAxleId());
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
log.info("开始关联司机与车辆,driverId={}, truckNo={}", request.getDriverId(), truck.getTruckNo());
|
|
log.info("开始关联司机与车辆,driverId={}, truckNo={}", request.getDriverId(), truck.getTruckNo());
|
|
|
try {
|
|
try {
|
|
|
addAssociatedTrack(associatedTrackAddRequest);
|
|
addAssociatedTrack(associatedTrackAddRequest);
|
|
@@ -433,7 +430,7 @@ public class KwfDriverService {
|
|
|
log.error("司机与车辆关联异常,driverId={}, truckNo={}", request.getDriverId(), truck.getTruckNo(), e);
|
|
log.error("司机与车辆关联异常,driverId={}, truckNo={}", request.getDriverId(), truck.getTruckNo(), e);
|
|
|
throw new BusinessException( "司机与车辆关联异常");
|
|
throw new BusinessException( "司机与车辆关联异常");
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
log.info("新增车辆档案并关联司机流程结束");
|
|
log.info("新增车辆档案并关联司机流程结束");
|
|
|
}
|
|
}
|
|
|
|
|
|