|
|
|
@ -6,11 +6,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
import com.yxt.anrui.base.api.basemodelconfig.*; |
|
|
|
import com.yxt.anrui.base.api.basemodelmodprice.BaseModelVehicleVersionVo; |
|
|
|
import com.yxt.anrui.base.api.basevehicle.ConfigInfo; |
|
|
|
import com.yxt.anrui.base.api.basevehicle.ModelLabel; |
|
|
|
import com.yxt.anrui.base.api.basevehicle.MoreConfigVo; |
|
|
|
import com.yxt.anrui.base.api.basevehicle.ConfigInfo; |
|
|
|
import com.yxt.anrui.base.api.basevehicle.VehicleModelPriceVo; |
|
|
|
import com.yxt.anrui.base.biz.basevehicleappendix.BaseVehicleAppendixService; |
|
|
|
import com.yxt.anrui.base.biz.basevehiclemodelappendix.BaseVehicleModelAppendixService; |
|
|
|
import com.yxt.anrui.base.common.enums.VehicleState; |
|
|
|
import com.yxt.anrui.portal.api.appsubsetversion.AppSubVersionVo; |
|
|
|
@ -321,7 +319,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa |
|
|
|
} |
|
|
|
return iPage; |
|
|
|
}*/ |
|
|
|
public List<BaseModelConfigListVo> getConfigName(List<BaseModelConfigListVo> records) { |
|
|
|
/*public List<BaseModelConfigListVo> getConfigName(List<BaseModelConfigListVo> records) { |
|
|
|
for (BaseModelConfigListVo record : records) { |
|
|
|
// String slowMachine = StringUtils.isNotBlank(record.getSlowMachine()) && "有".equals(record.getSlowMachine()) ? ("缓速器" + "/") : "";
|
|
|
|
String slowMachine = StringUtils.isNotBlank(record.getSlowMachine()) ? (record.getSlowMachine() + "/") : ""; |
|
|
|
@ -373,7 +371,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa |
|
|
|
} |
|
|
|
return records; |
|
|
|
|
|
|
|
} |
|
|
|
}*/ |
|
|
|
|
|
|
|
/** |
|
|
|
* 更多配置分页列表(非本公司的) |
|
|
|
@ -513,15 +511,15 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa |
|
|
|
|
|
|
|
public ModelConfigVo getModelConfigList(PagerQuery<ModelConfigListQuery> pagerQuery) { |
|
|
|
String userSid = pagerQuery.getParams().getUserSid(); |
|
|
|
// String orgPath = pagerQuery.getParams().getOrgPath();
|
|
|
|
// String orgSid = "";
|
|
|
|
// if (StringUtils.isBlank(orgPath)) {
|
|
|
|
// orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
|
|
|
|
// } else {
|
|
|
|
// orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
|
|
|
|
// }
|
|
|
|
String orgPath = pagerQuery.getParams().getOrgPath(); |
|
|
|
String orgSid = ""; |
|
|
|
if (StringUtils.isBlank(orgPath)) { |
|
|
|
orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); |
|
|
|
} else { |
|
|
|
orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); |
|
|
|
} |
|
|
|
// 1、根据业务员部门sid查询分公司sid
|
|
|
|
String orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); |
|
|
|
// String orgSid = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
|
|
|
|
if (StringUtils.isNotBlank(orgSid)) { |
|
|
|
pagerQuery.getParams().setUseOrg(orgSid); |
|
|
|
} |
|
|
|
@ -559,7 +557,6 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa |
|
|
|
//配置列表
|
|
|
|
IPage<ModelConfigListQuery> page = PagerUtil.queryToPage(pagerQuery); |
|
|
|
QueryWrapper<AppModelConfigListVo> qw = modelConfigQueryWrapper(pagerQuery.getParams()); |
|
|
|
// List<AppModelConfigListVo> appModelConfigListVos = baseMapper.getModelConfigPageList(page, qw, VehicleState.LockEnum.UN_LOCK.getCode(), orgSid);
|
|
|
|
List<AppModelConfigListVo> appModelConfigListVos = baseMapper.getModelConfigPageList(qw, VehicleState.LockEnum.UN_LOCK.getCode(), orgSid); |
|
|
|
long pages = page.getPages(); |
|
|
|
vo.setPages((int) pages); |
|
|
|
@ -581,7 +578,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa |
|
|
|
} |
|
|
|
appModelConfigListVo.setMoreList(moreConfigVos); |
|
|
|
} |
|
|
|
addDonfigName(appModelConfigListVos); |
|
|
|
addDonfigName1(appModelConfigListVos); |
|
|
|
vo.setModelConfigList(appModelConfigListVos); |
|
|
|
return vo; |
|
|
|
} |
|
|
|
@ -640,11 +637,22 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa |
|
|
|
} |
|
|
|
appModelConfigListVo.setMoreList(moreConfigVos); |
|
|
|
}*/ |
|
|
|
addDonfigName(appModelConfigListVos); |
|
|
|
addDonfigName1(appModelConfigListVos); |
|
|
|
vo.setModelConfigList(appModelConfigListVos); |
|
|
|
return vo; |
|
|
|
} |
|
|
|
|
|
|
|
public List<AppModelConfigListVo> addDonfigName1(List<AppModelConfigListVo> appModelConfigListVos) { |
|
|
|
for (AppModelConfigListVo appModelConfigListVo : appModelConfigListVos) { |
|
|
|
BaseModelConfig baseModelConfig = fetchBySid(appModelConfigListVo.getConfigSid()); |
|
|
|
String configName = configNameSpell(baseModelConfig); |
|
|
|
appModelConfigListVo.setConfigName(configName); |
|
|
|
} |
|
|
|
return appModelConfigListVos; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
* 拼接常用车型字段（configName） |
|
|
|
* |
|
|
|
@ -870,7 +878,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa |
|
|
|
} |
|
|
|
appModelConfigListVo.setMoreList(moreConfigVos); |
|
|
|
} |
|
|
|
addDonfigName(appModelConfigListVos1); |
|
|
|
addDonfigName1(appModelConfigListVos1); |
|
|
|
return appModelConfigListVos; |
|
|
|
} |
|
|
|
|
|
|
|
@ -897,14 +905,14 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa |
|
|
|
ModelConfigVo vo = baseMapper.getStockModelConfigList(modelSid, orgSid); |
|
|
|
List<ModelLabel> modelLabels = new ArrayList<>(); |
|
|
|
StringBuilder labelValue = new StringBuilder(); |
|
|
|
if (StringUtils.isNotBlank(vo.getLabelName())){ |
|
|
|
if (StringUtils.isNotBlank(vo.getLabelName())) { |
|
|
|
String[] labelNames = vo.getLabelName().split(","); |
|
|
|
for (String labelName : labelNames) { |
|
|
|
labelValue.append(labelName).append("/"); |
|
|
|
} |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(labelValue.toString())){ |
|
|
|
vo.setLabelValue(labelValue.substring(0,labelValue.lastIndexOf("/"))); |
|
|
|
if (StringUtils.isNotBlank(labelValue.toString())) { |
|
|
|
vo.setLabelValue(labelValue.substring(0, labelValue.lastIndexOf("/"))); |
|
|
|
} |
|
|
|
List<String> modelImages = baseVehicleModelAppendixService.selectImageList(modelSid); |
|
|
|
List<String> modelImagesList = new ArrayList<>(); |
|
|
|
@ -1006,7 +1014,7 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa |
|
|
|
} |
|
|
|
List<AppModelConfigListVo> appModelConfigListVos = baseMapper.getModelConfigLableList(qw, VehicleState.LockEnum.UN_LOCK.getCode(), orgSid, params.getLabel()); |
|
|
|
for (AppModelConfigListVo appModelConfigListVo : appModelConfigListVos) { |
|
|
|
if (StringUtils.isNotBlank(appModelConfigListVo.getLabelName())){ |
|
|
|
if (StringUtils.isNotBlank(appModelConfigListVo.getLabelName())) { |
|
|
|
String labelName = appModelConfigListVo.getLabelName(); |
|
|
|
String[] mains = labelName.split(","); |
|
|
|
List<ModelLabel> modelLabelss = new ArrayList<>(); |
|
|
|
@ -1049,12 +1057,97 @@ public class BaseModelConfigService extends MybatisBaseService<BaseModelConfigMa |
|
|
|
} |
|
|
|
appModelConfigListVo.setMoreList(moreConfigVos); |
|
|
|
} |
|
|
|
addDonfigName(appModelConfigListVos); |
|
|
|
addDonfigName1(appModelConfigListVos); |
|
|
|
vo.setModelConfigList(appModelConfigListVos); |
|
|
|
return vo; |
|
|
|
} |
|
|
|
|
|
|
|
public BaseModelConfigVo selectByConfigName(String sid, String configName) { |
|
|
|
return baseMapper.selectByConfigName(sid,configName); |
|
|
|
return baseMapper.selectByConfigName(sid, configName); |
|
|
|
} |
|
|
|
|
|
|
|
public String configNameSpell(BaseModelConfig baseModelConfig) { |
|
|
|
String configName = ""; |
|
|
|
//后桥
|
|
|
|
if (StringUtils.isNotBlank(baseModelConfig.getRearAxleValue()) && !"-".equals(baseModelConfig.getRearAxleValue())) { |
|
|
|
configName += baseModelConfig.getRearAxleValue() + "/"; |
|
|
|
} |
|
|
|
//速比
|
|
|
|
if (StringUtils.isNotBlank(baseModelConfig.getRearAxleRatio()) && !"-".equals(baseModelConfig.getRearAxleRatio())) { |
|
|
|
configName += baseModelConfig.getRearAxleRatio() + "/"; |
|
|
|
} |
|
|
|
//轴距
|
|
|
|
if (StringUtils.isNotBlank(baseModelConfig.getWheelbase()) && !"-".equals(baseModelConfig.getWheelbase())) { |
|
|
|
configName += baseModelConfig.getWheelbase() + "/"; |
|
|
|
} |
|
|
|
//悬架
|
|
|
|
if (StringUtils.isNotBlank(baseModelConfig.getSuspension()) && !"-".equals(baseModelConfig.getSuspension())) { |
|
|
|
configName += baseModelConfig.getSuspension() + "/"; |
|
|
|
} |
|
|
|
//鞍座
|
|
|
|
if (StringUtils.isNotBlank(baseModelConfig.getSaddle()) && !"-".equals(baseModelConfig.getSaddle())) { |
|
|
|
configName += baseModelConfig.getSaddle() + "/"; |
|
|
|
} |
|
|
|
//颜色
|
|
|
|
if (StringUtils.isNotBlank(baseModelConfig.getCarColor()) && !"-".equals(baseModelConfig.getCarColor())) { |
|
|
|
configName += baseModelConfig.getCarColor() + "/"; |
|
|
|
} |
|
|
|
//驾驶室
|
|
|
|
if (StringUtils.isNotBlank(baseModelConfig.getSpecification()) && !"-".equals(baseModelConfig.getSpecification())) { |
|
|
|
configName += baseModelConfig.getSpecification() + "/"; |
|
|
|
} |
|
|
|
//保险杠
|
|
|
|
if (StringUtils.isNotBlank(baseModelConfig.getBumper()) && !"-".equals(baseModelConfig.getBumper())) { |
|
|
|
configName += baseModelConfig.getBumper() + "/"; |
|
|
|
} |
|
|
|
//燃料箱
|
|
|
|
if (StringUtils.isNotBlank(baseModelConfig.getFuelTank()) && !"-".equals(baseModelConfig.getFuelTank())) { |
|
|
|
configName += baseModelConfig.getFuelTank() + "/"; |
|
|
|
} |
|
|
|
//导流罩
|
|
|
|
if (StringUtils.isNotBlank(baseModelConfig.getBaffleModel()) && !"-".equals(baseModelConfig.getBaffleModel())) { |
|
|
|
configName += baseModelConfig.getBaffleModel() + "/"; |
|
|
|
} |
|
|
|
//独立热源
|
|
|
|
if (StringUtils.isNotBlank(baseModelConfig.getIndependentSources()) && !"-".equals(baseModelConfig.getIndependentSources())) { |
|
|
|
configName += baseModelConfig.getIndependentSources() + "/"; |
|
|
|
} |
|
|
|
//缓速器
|
|
|
|
if (StringUtils.isNotBlank(baseModelConfig.getSlowMachine()) && !"-".equals(baseModelConfig.getSlowMachine())) { |
|
|
|
configName += baseModelConfig.getSlowMachine() + "/"; |
|
|
|
} |
|
|
|
//护轮罩
|
|
|
|
if (StringUtils.isNotBlank(baseModelConfig.getTireCover()) && !"-".equals(baseModelConfig.getTireCover())) { |
|
|
|
configName += baseModelConfig.getTireCover() + "/"; |
|
|
|
} |
|
|
|
//后视镜
|
|
|
|
if (StringUtils.isNotBlank(baseModelConfig.getRearViewMirror()) && !"-".equals(baseModelConfig.getRearViewMirror())) { |
|
|
|
configName += baseModelConfig.getRearViewMirror() + "/"; |
|
|
|
} |
|
|
|
//轮胎
|
|
|
|
if (StringUtils.isNotBlank(baseModelConfig.getTireSize()) && !"-".equals(baseModelConfig.getTireSize())) { |
|
|
|
configName += baseModelConfig.getTireSize() + "/"; |
|
|
|
} |
|
|
|
//轮毂材质
|
|
|
|
if (StringUtils.isNotBlank(baseModelConfig.getHubMaterial()) && !"-".equals(baseModelConfig.getHubMaterial())) { |
|
|
|
configName += baseModelConfig.getHubMaterial() + "/"; |
|
|
|
} |
|
|
|
//空调
|
|
|
|
if (StringUtils.isNotBlank(baseModelConfig.getAirConditioner()) && !"-".equals(baseModelConfig.getAirConditioner())) { |
|
|
|
configName += baseModelConfig.getAirConditioner() + "/"; |
|
|
|
} |
|
|
|
//座椅
|
|
|
|
if (StringUtils.isNotBlank(baseModelConfig.getSeat()) && !"-".equals(baseModelConfig.getSeat())) { |
|
|
|
configName += baseModelConfig.getSeat() + "/"; |
|
|
|
} |
|
|
|
//多媒体
|
|
|
|
if (StringUtils.isNotBlank(baseModelConfig.getMultimedia()) && !"-".equals(baseModelConfig.getMultimedia())) { |
|
|
|
configName += baseModelConfig.getMultimedia() + "/"; |
|
|
|
} |
|
|
|
//配置包
|
|
|
|
if (StringUtils.isNotBlank(baseModelConfig.getConfiguringBao()) && !"-".equals(baseModelConfig.getConfiguringBao())) { |
|
|
|
configName += baseModelConfig.getConfiguringBao() + "/"; |
|
|
|
} |
|
|
|
return configName; |
|
|
|
} |
|
|
|
} |
God
2 years ago