|
|
|
@ -8,8 +8,13 @@ import com.yxt.anrui.base.api.basemodelconfig.PcChooseBaseModelConfigVo; |
|
|
|
import com.yxt.anrui.base.api.basemodelszconfig.BaseModelSzconfigVo; |
|
|
|
import com.yxt.anrui.base.api.basetrailer.BaseTrailerVo; |
|
|
|
import com.yxt.anrui.base.api.basevehiclemodel.*; |
|
|
|
import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendix; |
|
|
|
import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixDto; |
|
|
|
import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixQuery; |
|
|
|
import com.yxt.anrui.base.api.basevehiclemodelappendix.BaseVehicleModelAppendixVo; |
|
|
|
import com.yxt.anrui.base.biz.basemodelszconfig.BaseModelSzconfigService; |
|
|
|
import com.yxt.anrui.base.biz.basetrailer.BaseTrailerService; |
|
|
|
import com.yxt.anrui.base.biz.basevehiclemodelappendix.BaseVehicleModelAppendixService; |
|
|
|
import com.yxt.anrui.portal.api.sysorganization.SysOrgVo; |
|
|
|
import com.yxt.anrui.portal.api.sysorganization.SysOrganization; |
|
|
|
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; |
|
|
|
@ -17,6 +22,7 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; |
|
|
|
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; |
|
|
|
import com.yxt.anrui.portal.api.sysuser.SysUserFeign; |
|
|
|
import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo; |
|
|
|
import com.yxt.common.base.config.component.FileUploadComponent; |
|
|
|
import com.yxt.common.base.service.MybatisBaseService; |
|
|
|
import com.yxt.common.base.utils.PagerUtil; |
|
|
|
import com.yxt.common.base.utils.StringUtils; |
|
|
|
@ -53,6 +59,10 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel |
|
|
|
private BaseModelSzconfigService baseModelSzconfigService; |
|
|
|
@Autowired |
|
|
|
private BaseTrailerService baseTrailerService; |
|
|
|
@Autowired |
|
|
|
private FileUploadComponent fileUploadComponent; |
|
|
|
@Autowired |
|
|
|
private BaseVehicleModelAppendixService baseVehicleModelAppendixService; |
|
|
|
|
|
|
|
/** |
|
|
|
* 车型信息分页列表 |
|
|
|
@ -76,19 +86,45 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel |
|
|
|
QueryWrapper<BaseVehicleModelVo> qw = new QueryWrapper<>(); |
|
|
|
if (pagerQuery != null) { |
|
|
|
qw.eq("bvm.isDelete", "0"); |
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getModelName())) {//车型名称
|
|
|
|
qw.like("bvm.modelName", pagerQuery.getModelName()); |
|
|
|
} |
|
|
|
/* if (StringUtils.isNotBlank(pagerQuery.getCarModel())) {//车型型号
|
|
|
|
qw.like("bvm.carModel", pagerQuery.getCarModel()); |
|
|
|
}*/ |
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getBrandName())) {//品牌
|
|
|
|
qw.like("bvm.brandName", pagerQuery.getBrandName()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getCarBrand())) {//品牌sid
|
|
|
|
qw.eq("bvm.carBrand", pagerQuery.getCarBrand()); |
|
|
|
} |
|
|
|
|
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getVehicleType())) {//功能key
|
|
|
|
qw.eq("bvm.vehicleType", pagerQuery.getVehicleType()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getProductLine())) {//系列key
|
|
|
|
qw.eq("bvm.productLine", pagerQuery.getProductLine()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getDriveForm())) {//驱动key
|
|
|
|
qw.eq("bvm.driveForm", pagerQuery.getDriveForm()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getPower())) {//马力key
|
|
|
|
qw.eq("bvm.power", pagerQuery.getPower()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getVehicleVersion())) {//车辆版本key值
|
|
|
|
qw.eq("bvm.vehicleVersion", pagerQuery.getVehicleVersion()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getFuelType())) {//燃料种类key值
|
|
|
|
qw.eq("bvm.fuelType", pagerQuery.getFuelType()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getVehicleTypeCode())) {//车型编码
|
|
|
|
qw.eq("bvm.vehicleTypeCode", pagerQuery.getVehicleTypeCode()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getGearboxType())) {//变速箱key值
|
|
|
|
qw.eq("bvm.gearboxType", pagerQuery.getGearboxType()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getEmissionStandard())) {//排放标准key值
|
|
|
|
qw.eq("bvm.emissionStandard", pagerQuery.getEmissionStandard()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getEngineType())) {//发动机型号key值
|
|
|
|
qw.eq("bvm.engineType", pagerQuery.getEngineType()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getMarketSegments())) {//细分市场key值
|
|
|
|
qw.eq("bvm.marketSegments", pagerQuery.getMarketSegments()); |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(pagerQuery.getSpecifications())) {//规格型号
|
|
|
|
qw.eq("bvm.specifications", pagerQuery.getSpecifications()); |
|
|
|
} |
|
|
|
} |
|
|
|
return qw; |
|
|
|
} |
|
|
|
@ -121,10 +157,6 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel |
|
|
|
BaseModelConfigVo baseModelConfigVo = new BaseModelConfigVo(); |
|
|
|
BeanUtil.copyProperties(pcChooseBaseModelConfigVo, baseModelConfigVo); |
|
|
|
baseVehicleModelDetailsVo.setBaseModelConfigVo(baseModelConfigVo != null ? baseModelConfigVo : new BaseModelConfigVo()); |
|
|
|
BaseModelSzconfigVo baseModelSzconfigVo = baseModelSzconfigService.fetchByModelSid(sid); |
|
|
|
baseVehicleModelDetailsVo.setBaseModelSzconfigVo(baseModelSzconfigVo != null ? baseModelSzconfigVo : new BaseModelSzconfigVo()); |
|
|
|
BaseTrailerVo baseTrailerVo = baseTrailerService.fetchByModelSid(sid); |
|
|
|
baseVehicleModelDetailsVo.setBaseTrailerVo(baseTrailerVo != null ? baseTrailerVo : new BaseTrailerVo()); |
|
|
|
return baseVehicleModelDetailsVo; |
|
|
|
} |
|
|
|
|
|
|
|
@ -252,6 +284,14 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel |
|
|
|
} |
|
|
|
baseVehicleModelSelectVo.setUseOrg(s); |
|
|
|
} |
|
|
|
List<BaseVehicleModelAppendixVo> baseVehicleModelAppendixVos = baseVehicleModelAppendixService.fetchByVehModelSid(sid); |
|
|
|
for (BaseVehicleModelAppendixVo baseVehicleModelAppendixVo : baseVehicleModelAppendixVos) { |
|
|
|
String filePath = baseVehicleModelAppendixVo.getFilePath(); |
|
|
|
String urlPrefix = fileUploadComponent.getUrlPrefix(); |
|
|
|
filePath = urlPrefix + filePath; |
|
|
|
baseVehicleModelAppendixVo.setFilePath(filePath); |
|
|
|
} |
|
|
|
baseVehicleModelSelectVo.setBaseVehicleModelAppendixVos(baseVehicleModelAppendixVos); |
|
|
|
return baseVehicleModelSelectVo; |
|
|
|
} |
|
|
|
|
|
|
|
@ -353,4 +393,54 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel |
|
|
|
QueryWrapper<BaseVehicleModelListVo> qw = createBuildQueryWrapper(query.getParams()); |
|
|
|
return baseMapper.modelPageList(page, qw); |
|
|
|
} |
|
|
|
|
|
|
|
public ResultBean saveOrUpdateAll(BaseVehicleModelDto dto) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
String sid = dto.getSid(); |
|
|
|
if (StringUtils.isBlank(sid)){ |
|
|
|
BaseVehicleModel entity = new BaseVehicleModel(); |
|
|
|
String sid1 = entity.getSid(); |
|
|
|
BeanUtil.copyProperties(dto,entity); |
|
|
|
entity.setSid(sid1); |
|
|
|
boolean isSave = save(entity); |
|
|
|
if (!isSave) { |
|
|
|
return rb.setMsg("车型信息保存失败"); |
|
|
|
} |
|
|
|
List<BaseVehicleModelAppendixDto> baseVehicleModelAppendixDtos = dto.getBaseVehicleModelAppendixDtos(); |
|
|
|
for (BaseVehicleModelAppendixDto baseVehicleModelAppendixDto : baseVehicleModelAppendixDtos) { |
|
|
|
String filePath = baseVehicleModelAppendixDto.getFilePath(); |
|
|
|
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { |
|
|
|
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); |
|
|
|
} |
|
|
|
baseVehicleModelAppendixDto.setModelSid(entity.getSid()); |
|
|
|
baseVehicleModelAppendixDto.setFilePath(filePath); |
|
|
|
BaseVehicleModelAppendix baseVehicleModelAppendix = new BaseVehicleModelAppendix(); |
|
|
|
baseVehicleModelAppendixDto.fillEntity(baseVehicleModelAppendix); |
|
|
|
baseVehicleModelAppendixService.save(baseVehicleModelAppendix); |
|
|
|
} |
|
|
|
return rb.success().setMsg("保存成功"); |
|
|
|
} |
|
|
|
BaseVehicleModel baseVehicleModel = fetchBySid(sid); |
|
|
|
if (baseVehicleModel == null) { |
|
|
|
return rb.setMsg("该车型信息不存在"); |
|
|
|
} |
|
|
|
int i = updateBySid(dto.toMap(), sid); |
|
|
|
baseVehicleModelAppendixService.deleteByVehModelSid(sid); |
|
|
|
List<BaseVehicleModelAppendixDto> baseVehicleModelAppendixDtos = dto.getBaseVehicleModelAppendixDtos(); |
|
|
|
for (BaseVehicleModelAppendixDto baseVehicleModelAppendixDto : baseVehicleModelAppendixDtos) { |
|
|
|
String filePath = baseVehicleModelAppendixDto.getFilePath(); |
|
|
|
if (filePath.indexOf(fileUploadComponent.getUrlPrefix()) > -1) { |
|
|
|
filePath = filePath.replace(fileUploadComponent.getUrlPrefix(), ""); |
|
|
|
} |
|
|
|
baseVehicleModelAppendixDto.setModelSid(sid); |
|
|
|
baseVehicleModelAppendixDto.setFilePath(filePath); |
|
|
|
BaseVehicleModelAppendix baseVehicleModelAppendix = new BaseVehicleModelAppendix(); |
|
|
|
baseVehicleModelAppendixDto.fillEntity(baseVehicleModelAppendix); |
|
|
|
baseVehicleModelAppendixService.save(baseVehicleModelAppendix); |
|
|
|
} |
|
|
|
if (i == 0) { |
|
|
|
return rb.setMsg("修改失败"); |
|
|
|
} |
|
|
|
return rb.success().setMsg("修改成功"); |
|
|
|
} |
|
|
|
} |
God
