|
@@ -16,9 +16,12 @@ import lombok.RequiredArgsConstructor;
|
|
|
import org.dromara.common.redis.utils.CacheUtils;
|
|
import org.dromara.common.redis.utils.CacheUtils;
|
|
|
import org.dromara.common.redis.utils.RedisUtils;
|
|
import org.dromara.common.redis.utils.RedisUtils;
|
|
|
import org.dromara.common.satoken.utils.LoginHelper;
|
|
import org.dromara.common.satoken.utils.LoginHelper;
|
|
|
|
|
+import org.dromara.system.domain.SysUser;
|
|
|
import org.dromara.system.domain.TblDzbcPath;
|
|
import org.dromara.system.domain.TblDzbcPath;
|
|
|
|
|
+import org.dromara.system.domain.vo.SysUserVo;
|
|
|
import org.dromara.system.domain.vo.TblDzbcCarVo;
|
|
import org.dromara.system.domain.vo.TblDzbcCarVo;
|
|
|
import org.dromara.system.domain.vo.TblDzbcPathVo;
|
|
import org.dromara.system.domain.vo.TblDzbcPathVo;
|
|
|
|
|
+import org.dromara.system.mapper.SysUserMapper;
|
|
|
import org.dromara.system.mapper.TblDzbcCarMapper;
|
|
import org.dromara.system.mapper.TblDzbcCarMapper;
|
|
|
import org.dromara.system.mapper.TblDzbcPathMapper;
|
|
import org.dromara.system.mapper.TblDzbcPathMapper;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
@@ -46,6 +49,8 @@ public class TblDzbcPathSchedulingServiceImpl implements ITblDzbcPathSchedulingS
|
|
|
private final TblDzbcCarMapper carMapper;
|
|
private final TblDzbcCarMapper carMapper;
|
|
|
private final TblDzbcPathMapper pathMapper;
|
|
private final TblDzbcPathMapper pathMapper;
|
|
|
|
|
|
|
|
|
|
+ private final SysUserMapper userMapper;
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 查询定制班车-路线排班
|
|
* 查询定制班车-路线排班
|
|
|
*/
|
|
*/
|
|
@@ -105,9 +110,20 @@ public class TblDzbcPathSchedulingServiceImpl implements ITblDzbcPathSchedulingS
|
|
|
Map<String, Object> params = bo.getParams();
|
|
Map<String, Object> params = bo.getParams();
|
|
|
if(add.getCarId()!=null){
|
|
if(add.getCarId()!=null){
|
|
|
TblDzbcCarVo carVo = carMapper.selectVoById(bo.getCarId());
|
|
TblDzbcCarVo carVo = carMapper.selectVoById(bo.getCarId());
|
|
|
|
|
+
|
|
|
if(carVo == null){
|
|
if(carVo == null){
|
|
|
throw new RuntimeException("车辆不存在");
|
|
throw new RuntimeException("车辆不存在");
|
|
|
}
|
|
}
|
|
|
|
|
+ SysUserVo userVo = userMapper.selectUserById(carVo.getDriverId());
|
|
|
|
|
+ SysUserVo userVo1 = new SysUserVo();
|
|
|
|
|
+ userVo1.setUserId(userVo.getUserId());
|
|
|
|
|
+ userVo1.setUserName(userVo.getUserName());
|
|
|
|
|
+ userVo1.setNickName(userVo.getNickName());
|
|
|
|
|
+ userVo1.setPhonenumber(userVo.getPhonenumber());
|
|
|
|
|
+ userVo1.setEmail(userVo.getEmail());
|
|
|
|
|
+ userVo1.setSex(userVo.getSex());
|
|
|
|
|
+ userVo1.setAvatar(userVo.getAvatar());
|
|
|
|
|
+ params.put("driverInfo",userVo1);
|
|
|
params.put("carInfo",carVo);
|
|
params.put("carInfo",carVo);
|
|
|
}
|
|
}
|
|
|
if(add.getPathId()!=null){
|
|
if(add.getPathId()!=null){
|