|
@@ -100,18 +100,17 @@ public class VehicleTempService {
|
|
|
PoUtil.initAddPo(newVehicle);
|
|
|
|
|
|
DictPO dictPo=new DictPO();
|
|
|
+ dictPo.setDictCode(newVehicle.getModelLabel());
|
|
|
+ dictPo.setDictName(newVehicle.getVehicleTopView());//osgb路径
|
|
|
PoUtil.initAddPo(dictPo);
|
|
|
if (ObjectUtil.isNull(id)) {//新增
|
|
|
newVehicle.setId(StringUtil.getRandomUUID());
|
|
|
newVehicle.setVehicleCode(StringUtil.getRandomCode());
|
|
|
newVehicle.setValid("1");
|
|
|
vehicleTempMapper.insert(newVehicle);
|
|
|
-
|
|
|
//字典新增osgb文件
|
|
|
dictPo.setId(StringUtil.getRandomUUID());
|
|
|
- dictPo.setDictCode("carType");
|
|
|
- dictPo.setDictCode(newVehicle.getModelLabel());
|
|
|
- dictPo.setDictName(newVehicle.getVehicleTopView());//osgb路径
|
|
|
+ dictPo.setDictType("carType");
|
|
|
dictPo.setDictOrder(1);
|
|
|
dictMapper.saveSystemDict(dictPo);
|
|
|
logService.logVehicle(LogConstants.SYS_LOG_VEHICLE_INSERT, newVehicle);
|
|
@@ -121,8 +120,6 @@ public class VehicleTempService {
|
|
|
vehicleMapper.updateModelLabel(oldVehicle.getModelLabel(),newVehicle.getModelLabel());
|
|
|
}
|
|
|
vehicleTempMapper.update(newVehicle);
|
|
|
- dictPo.setDictCode(newVehicle.getModelLabel());
|
|
|
- dictPo.setDictName(newVehicle.getVehicleTopView());//osgb路径
|
|
|
dictMapper.updateSystemDict(dictPo);
|
|
|
logService.logVehicle(LogConstants.SYS_LOG_VEHICLE_UPDATE, newVehicle);
|
|
|
}
|
|
@@ -134,6 +131,7 @@ public class VehicleTempService {
|
|
|
logService.logVehicle(LogConstants.SYS_LOG_VEHICLE_DEL, po);
|
|
|
//删除字典车辆模型
|
|
|
VehiclePageParam param=new VehiclePageParam();
|
|
|
+ param.setId(po.getId());
|
|
|
VehicleTempVO vehicleTempVO= vehicleTempMapper.getVehicleTempInfo(param);
|
|
|
DictPO dictPo=new DictPO();
|
|
|
dictPo.setDictCode(vehicleTempVO.getModelLabel());
|