|
|
@ -3,10 +3,7 @@ package com.yxt.anrui.base.biz.basemodelconfig; |
|
|
|
import cn.hutool.core.bean.BeanUtil; |
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage; |
|
|
|
import com.yxt.anrui.base.api.basemodelconfig.*; |
|
|
|
import com.yxt.anrui.base.api.basevehicle.AppCurrentCarModelByPageListVo; |
|
|
|
import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel; |
|
|
|
import com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigVo; |
|
|
|
import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderDetailsVo; |
|
|
|
import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService; |
|
|
|
import com.yxt.anrui.base.biz.basevehmodelconfig.BaseVehmodelConfigService; |
|
|
|
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; |
|
|
@ -22,7 +19,6 @@ import org.springframework.web.bind.annotation.RequestMapping; |
|
|
|
import org.springframework.web.bind.annotation.RestController; |
|
|
|
|
|
|
|
import java.util.Arrays; |
|
|
|
import java.util.HashMap; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
|
|
|
@ -62,10 +58,10 @@ public class BaseModelConfigRest implements BaseModelConfigFeign { |
|
|
|
for (BaseModelConfigVo record : records) { |
|
|
|
String sid = record.getSid(); |
|
|
|
List<BaseVehmodelConfigVo> baseVehmodelConfigVos = baseVehmodelConfigService.getListByConfigSid(sid); |
|
|
|
if (baseVehmodelConfigVos.size() > 0){ |
|
|
|
if (baseVehmodelConfigVos.size() > 0) { |
|
|
|
record.setIsRelationState(1); |
|
|
|
record.setIsUseState(1); |
|
|
|
}else { |
|
|
|
} else { |
|
|
|
record.setIsRelationState(0); |
|
|
|
record.setIsUseState(0); |
|
|
|
} |
|
|
@ -78,23 +74,84 @@ public class BaseModelConfigRest implements BaseModelConfigFeign { |
|
|
|
@Override |
|
|
|
public ResultBean save(BaseModelConfigDto dto) { |
|
|
|
ResultBean rb = ResultBean.fireFail(); |
|
|
|
//车型sid
|
|
|
|
/*String vehicleSid = dto.getVehicleSid(); |
|
|
|
String vehicleCode = dto.getVehicleCode();*/ |
|
|
|
//根据车型sid和整车编码查询是否存在
|
|
|
|
/* int count = baseModelConfigService.selectBySidAndCode(vehicleSid, vehicleCode); |
|
|
|
if (count > 0) { |
|
|
|
return rb.setMsg("该车型已存在该车型配置代码的车型配置信息"); |
|
|
|
}*/ |
|
|
|
String userSid = dto.getUserSid(); |
|
|
|
String sid = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid(); |
|
|
|
BaseModelConfig entity = new BaseModelConfig(); |
|
|
|
dto.fillEntity(entity); |
|
|
|
String configName = ""; |
|
|
|
configName += dto.getCarColor() + "/" + dto.getSpecification() + "/" + dto.getFuelTank() + "/" + dto.getBaffleModel() + "/" + dto.getIndependentSources() + "/" + dto.getTireCover() + "/" + dto.getSaddle() + "/" + dto.getAirConditioner() + "/" + dto.getRearAxleRatio() + "/" + dto.getTireSize() + "/" + dto.getSlowMachine() + "/" + dto.getRearViewMirror() + "/" + dto.getWheelbase() + "/" + dto.getSuspension() + "/" + dto.getPackingCase() + "/" + dto.getSeat() + "/" + dto.getHubMaterial() + "/" + dto.getConfiguringBao() + "/" + dto.getMultimedia() + "/" + dto.getBumper(); |
|
|
|
//缓速器
|
|
|
|
if (StringUtils.isNotBlank(dto.getSlowMachine()) && "有".equals(dto.getSlowMachine())) { |
|
|
|
configName += "缓速器/"; |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(dto.getRearViewMirror())) { |
|
|
|
configName += dto.getRearViewMirror() + "/"; |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(dto.getTireSize())) { |
|
|
|
configName += dto.getTireSize() + "/"; |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(dto.getRearAxleRatio())) { |
|
|
|
configName += dto.getRearAxleRatio() + "/"; |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(dto.getAirConditioner()) && "有".equals(dto.getAirConditioner())) { |
|
|
|
configName += "空调/"; |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(dto.getHubMaterial())) { |
|
|
|
configName += dto.getHubMaterial() + "/"; |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(dto.getBaffleModel())) { |
|
|
|
configName += dto.getBaffleModel() + "/"; |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(dto.getSuspension())) { |
|
|
|
configName += dto.getSuspension() + "/"; |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(dto.getSeat())) { |
|
|
|
configName += dto.getSeat() + "/"; |
|
|
|
} |
|
|
|
//护轮罩
|
|
|
|
if (StringUtils.isNotBlank(dto.getTireCover()) && "有".equals(dto.getTireCover())) { |
|
|
|
configName += "护轮罩/"; |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(dto.getSaddle())) { |
|
|
|
configName += dto.getSaddle() + "/"; |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(dto.getWheelbase())) { |
|
|
|
configName += dto.getWheelbase() + "/"; |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(dto.getBumper())) { |
|
|
|
configName += dto.getBumper() + "/"; |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(dto.getConfiguringBao())) { |
|
|
|
configName += dto.getConfiguringBao() + "/"; |
|
|
|
} |
|
|
|
//独立热源
|
|
|
|
if (StringUtils.isNotBlank(dto.getIndependentSources()) && "有".equals(dto.getIndependentSources())) { |
|
|
|
configName += "独立热源/"; |
|
|
|
} |
|
|
|
//油罐
|
|
|
|
if (StringUtils.isNotBlank(dto.getFuelTank())) { |
|
|
|
configName += dto.getFuelTank() + "/"; |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(dto.getMultimedia()) && "有".equals(dto.getMultimedia())) { |
|
|
|
configName += "多媒体/"; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//颜色
|
|
|
|
if (StringUtils.isNotBlank(dto.getCarColor())) { |
|
|
|
configName += dto.getCarColor() + "/"; |
|
|
|
} |
|
|
|
//驾驶室规格
|
|
|
|
if (StringUtils.isNotBlank(dto.getSpecification())) { |
|
|
|
configName += dto.getSpecification() + "/"; |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(dto.getPackingCase())) { |
|
|
|
configName += dto.getPackingCase() + "/"; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
entity.setConfigName(configName); |
|
|
|
int i = baseModelConfigService.checkByConfigName(configName); |
|
|
|
if (i > 0){ |
|
|
|
if (i > 0) { |
|
|
|
return rb.setMsg("该常用配置已存在"); |
|
|
|
} |
|
|
|
entity.setCreateOrgSId(sid); |
|
|
@ -113,21 +170,90 @@ public class BaseModelConfigRest implements BaseModelConfigFeign { |
|
|
|
return rb.setMsg("该车型配置信息不存在"); |
|
|
|
} |
|
|
|
int i2 = baseVehmodelConfigService.checkByConfigSid(sid); |
|
|
|
if (i2 > 0){ |
|
|
|
if (i2 > 0) { |
|
|
|
return rb.setMsg("该配置已有关联车型,无法修改"); |
|
|
|
} |
|
|
|
String userSid = dto.getUserSid(); |
|
|
|
ResultBean<SysOrganizationVo> useOrgByUserSid = sysOrganizationFeign.getUseOrgByUserSid(userSid); |
|
|
|
String sid1 = useOrgByUserSid.getData().getSid(); |
|
|
|
int i3 = baseModelConfigService.checkByCreateOrgSidAndConfigSid(sid1, sid); |
|
|
|
if (i3 == 0){ |
|
|
|
if (i3 == 0) { |
|
|
|
return rb.setMsg("该配置不属于当前分公司,无法修改"); |
|
|
|
} |
|
|
|
String configName = ""; |
|
|
|
configName += dto.getCarColor() + "/" + dto.getSpecification() + "/" + dto.getFuelTank() + "/" + dto.getBaffleModel() + "/" + dto.getIndependentSources() + "/" + dto.getTireCover() + "/" + dto.getSaddle() + "/" + dto.getAirConditioner() + "/" + dto.getRearAxleRatio() + "/" + dto.getTireSize() + "/" + dto.getSlowMachine() + "/" + dto.getRearViewMirror() + "/" + dto.getWheelbase() + "/" + dto.getSuspension() + "/" + dto.getPackingCase() + "/" + dto.getSeat() + "/" + dto.getHubMaterial() + "/" + dto.getConfiguringBao() + "/" + dto.getMultimedia() + "/" + dto.getBumper(); |
|
|
|
// configName += dto.getCarColor() + "/" + dto.getSpecification() + "/" + dto.getFuelTank() + "/" + dto.getBaffleModel() + "/" + dto.getIndependentSources() + "/" + dto.getTireCover() + "/" + dto.getSaddle() + "/" + dto.getAirConditioner() + "/" + dto.getRearAxleRatio() + "/" + dto.getTireSize() + "/" + dto.getSlowMachine() + "/" + dto.getRearViewMirror() + "/" + dto.getWheelbase() + "/" + dto.getSuspension() + "/" + dto.getPackingCase() + "/" + dto.getSeat() + "/" + dto.getHubMaterial() + "/" + dto.getConfiguringBao() + "/" + dto.getMultimedia() + "/" + dto.getBumper();
|
|
|
|
//缓速器
|
|
|
|
if (StringUtils.isNotBlank(dto.getSlowMachine()) && "有".equals(dto.getSlowMachine())) { |
|
|
|
configName += "缓速器/"; |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(dto.getRearViewMirror())) { |
|
|
|
configName += dto.getRearViewMirror() + "/"; |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(dto.getTireSize())) { |
|
|
|
configName += dto.getTireSize() + "/"; |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(dto.getRearAxleRatio())) { |
|
|
|
configName += dto.getRearAxleRatio() + "/"; |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(dto.getAirConditioner()) && "有".equals(dto.getAirConditioner())) { |
|
|
|
configName += "空调/"; |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(dto.getHubMaterial())) { |
|
|
|
configName += dto.getHubMaterial() + "/"; |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(dto.getBaffleModel())) { |
|
|
|
configName += dto.getBaffleModel() + "/"; |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(dto.getSuspension())) { |
|
|
|
configName += dto.getSuspension() + "/"; |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(dto.getSeat())) { |
|
|
|
configName += dto.getSeat() + "/"; |
|
|
|
} |
|
|
|
//护轮罩
|
|
|
|
if (StringUtils.isNotBlank(dto.getTireCover()) && "有".equals(dto.getTireCover())) { |
|
|
|
configName += "护轮罩/"; |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(dto.getSaddle())) { |
|
|
|
configName += dto.getSaddle() + "/"; |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(dto.getWheelbase())) { |
|
|
|
configName += dto.getWheelbase() + "/"; |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(dto.getBumper())) { |
|
|
|
configName += dto.getBumper() + "/"; |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(dto.getConfiguringBao())) { |
|
|
|
configName += dto.getConfiguringBao() + "/"; |
|
|
|
} |
|
|
|
//独立热源
|
|
|
|
if (StringUtils.isNotBlank(dto.getIndependentSources()) && "有".equals(dto.getIndependentSources())) { |
|
|
|
configName += "独立热源/"; |
|
|
|
} |
|
|
|
//油罐
|
|
|
|
if (StringUtils.isNotBlank(dto.getFuelTank())) { |
|
|
|
configName += dto.getFuelTank() + "/"; |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(dto.getMultimedia()) && "有".equals(dto.getMultimedia())) { |
|
|
|
configName += "多媒体/"; |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//颜色
|
|
|
|
if (StringUtils.isNotBlank(dto.getCarColor())) { |
|
|
|
configName += dto.getCarColor() + "/"; |
|
|
|
} |
|
|
|
//驾驶室规格
|
|
|
|
if (StringUtils.isNotBlank(dto.getSpecification())) { |
|
|
|
configName += dto.getSpecification() + "/"; |
|
|
|
} |
|
|
|
if (StringUtils.isNotBlank(dto.getPackingCase())) { |
|
|
|
configName += dto.getPackingCase() + "/"; |
|
|
|
} |
|
|
|
|
|
|
|
dto.setConfigName(configName); |
|
|
|
int i1 = baseModelConfigService.checkByConfigName(configName); |
|
|
|
if (i1 > 0){ |
|
|
|
if (i1 > 0) { |
|
|
|
return rb.setMsg("该常用配置已存在"); |
|
|
|
} |
|
|
|
int i = baseModelConfigService.updateBySid(dto.toMap(), sid); |
|
|
@ -138,7 +264,7 @@ public class BaseModelConfigRest implements BaseModelConfigFeign { |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public ResultBean deleteBySids(String sids,String userSid) { |
|
|
|
public ResultBean deleteBySids(String sids, String userSid) { |
|
|
|
List<String> sidList = Arrays.asList(sids.split(",")); |
|
|
|
// int count = baseModelConfigService.deleteBySids(sidList);
|
|
|
|
// if (count != sidList.size()) {
|
|
|
@ -146,13 +272,13 @@ public class BaseModelConfigRest implements BaseModelConfigFeign { |
|
|
|
// }
|
|
|
|
for (String sid : sidList) { |
|
|
|
int i = baseVehmodelConfigService.checkByConfigSid(sid); |
|
|
|
if (i > 0){ |
|
|
|
if (i > 0) { |
|
|
|
return ResultBean.fireFail().setMsg("该配置已有关联车型,无法删除"); |
|
|
|
} |
|
|
|
ResultBean<SysOrganizationVo> s = sysOrganizationFeign.getUseOrgByUserSid(userSid); |
|
|
|
String sid1 = s.getData().getSid(); |
|
|
|
int i1 = baseModelConfigService.checkByCreateOrgSidAndConfigSid(sid1, sid); |
|
|
|
if (i1 == 0){ |
|
|
|
if (i1 == 0) { |
|
|
|
return ResultBean.fireFail().setMsg("该配置不属于当前分公司,无法删除"); |
|
|
|
} |
|
|
|
int count = baseModelConfigService.updateBySidIsDeletes(sid); |
|
|
@ -223,8 +349,8 @@ public class BaseModelConfigRest implements BaseModelConfigFeign { |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public ResultBean<List<Map<String,String>>> getListByVeSid(String vehicleSid) { |
|
|
|
ResultBean<List<Map<String,String>>> rb = ResultBean.fireFail(); |
|
|
|
public ResultBean<List<Map<String, String>>> getListByVeSid(String vehicleSid) { |
|
|
|
ResultBean<List<Map<String, String>>> rb = ResultBean.fireFail(); |
|
|
|
List<Map<String, String>> listByVeSid = baseVehicleModelService.getListByVeSid(vehicleSid); |
|
|
|
return rb.success().setData(listByVeSid); |
|
|
|
} |
|
|
|