|
@@ -4,6 +4,7 @@ import api.common.pojo.common.ResponseBodyVO;
|
|
|
import api.common.pojo.constants.LogConstants;
|
|
|
import api.common.pojo.param.model.VehiclePageParam;
|
|
|
import api.common.pojo.po.model.VehicleTempPO;
|
|
|
+import api.common.pojo.po.system.DictPO;
|
|
|
import api.common.pojo.vo.model.VehicleDefaultValueVO;
|
|
|
import api.common.pojo.vo.model.VehicleTempVO;
|
|
|
import api.common.util.ObjectUtil;
|
|
@@ -13,6 +14,7 @@ import com.css.simulation.resource.common.utils.PoUtil;
|
|
|
import com.css.simulation.resource.log.service.LogService;
|
|
|
import com.css.simulation.resource.model.mapper.VehicleMapper;
|
|
|
import com.css.simulation.resource.model.mapper.VehicleTempMapper;
|
|
|
+import com.css.simulation.resource.system.mapper.DictMapper;
|
|
|
import com.github.pagehelper.PageInfo;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.stereotype.Service;
|
|
@@ -32,6 +34,9 @@ public class VehicleTempService {
|
|
|
VehicleMapper vehicleMapper;
|
|
|
@Resource
|
|
|
LogService logService;
|
|
|
+ @Resource
|
|
|
+ DictMapper dictMapper;
|
|
|
+
|
|
|
|
|
|
public List getVehicleTempTree() {
|
|
|
List<VehicleTempVO> list = vehicleTempMapper.getVehicleTempTree();
|
|
@@ -93,11 +98,22 @@ public class VehicleTempService {
|
|
|
String id = newVehicle.getId();
|
|
|
//常规字段赋值
|
|
|
PoUtil.initAddPo(newVehicle);
|
|
|
+
|
|
|
+ DictPO dictPo=new DictPO();
|
|
|
+ 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.setDictOrder(1);
|
|
|
+ dictMapper.saveSystemDict(dictPo);
|
|
|
logService.logVehicle(LogConstants.SYS_LOG_VEHICLE_INSERT, newVehicle);
|
|
|
} else { //修改
|
|
|
if (oldVehicle.getModelLabel().equals(newVehicle.getModelLabel())){
|
|
@@ -105,6 +121,9 @@ 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);
|
|
|
}
|
|
|
return new ResponseBodyVO<>(ResponseBodyVO.Response.SUCCESS, newVehicle);
|
|
@@ -113,6 +132,13 @@ public class VehicleTempService {
|
|
|
public int delVehicleTempById(VehicleTempPO po) {
|
|
|
PoUtil.initDelPo(po);
|
|
|
logService.logVehicle(LogConstants.SYS_LOG_VEHICLE_DEL, po);
|
|
|
+ //删除字典车辆模型
|
|
|
+ VehiclePageParam param=new VehiclePageParam();
|
|
|
+ VehicleTempVO vehicleTempVO= vehicleTempMapper.getVehicleTempInfo(param);
|
|
|
+ DictPO dictPo=new DictPO();
|
|
|
+ dictPo.setDictCode(vehicleTempVO.getModelLabel());
|
|
|
+ PoUtil.initDelPo(dictPo);
|
|
|
+ dictMapper.deleteSystemDict(dictPo);
|
|
|
return vehicleTempMapper.delVehicleTempById(po);
|
|
|
}
|
|
|
}
|