车辆保存接口
This commit is contained in:
parent
bfb79c9b6a
commit
7971645fd3
@ -73,17 +73,11 @@ public class CarInfoController {
|
|||||||
return Result.success(carInfoService.selectCarList(map));
|
return Result.success(carInfoService.selectCarList(map));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 添加
|
|
||||||
* @param carInfo
|
|
||||||
* @return
|
|
||||||
*/
|
|
||||||
@OperLog(operModul = "车辆管理", operType = "添加车辆黑白名单", operDesc = "添加车辆黑白名单管理信息")
|
@OperLog(operModul = "车辆管理", operType = "添加车辆黑白名单", operDesc = "添加车辆黑白名单管理信息")
|
||||||
@ApiOperation(value = "添加车辆黑白名单管理信息", notes = "添加车辆黑白名单管理信息", httpMethod = "POST")
|
@ApiOperation(value = "添加车辆黑白名单管理信息", notes = "添加车辆黑白名单管理信息", httpMethod = "POST")
|
||||||
@PostMapping(value = "/add")
|
@PostMapping(value = "/add")
|
||||||
public Result<CarInfo> add(@RequestBody CarInfo carInfo) {
|
public Result add(@RequestBody CarInfo carInfo) {
|
||||||
carInfoService.addCarInfo(carInfo);
|
return carInfoService.addCarInfo(carInfo);
|
||||||
return Result.ok();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
package com.zhgd.xmgl.modules.car.service;
|
package com.zhgd.xmgl.modules.car.service;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
|
import com.zhgd.jeecg.common.api.vo.Result;
|
||||||
import com.zhgd.jeecg.common.mybatis.EntityMap;
|
import com.zhgd.jeecg.common.mybatis.EntityMap;
|
||||||
import com.zhgd.xmgl.modules.car.entity.CarInfo;
|
import com.zhgd.xmgl.modules.car.entity.CarInfo;
|
||||||
import com.baomidou.mybatisplus.extension.service.IService;
|
import com.baomidou.mybatisplus.extension.service.IService;
|
||||||
@ -17,7 +18,7 @@ public interface ICarInfoService extends IService<CarInfo> {
|
|||||||
|
|
||||||
IPage<EntityMap> selectCarList(Map<String, Object> map);
|
IPage<EntityMap> selectCarList(Map<String, Object> map);
|
||||||
|
|
||||||
void addCarInfo(CarInfo carInfo);
|
Result addCarInfo(CarInfo carInfo);
|
||||||
|
|
||||||
void editCarInfo(CarInfo carInfo);
|
void editCarInfo(CarInfo carInfo);
|
||||||
|
|
||||||
|
|||||||
@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
|
import com.zhgd.jeecg.common.api.vo.Result;
|
||||||
import com.zhgd.jeecg.common.execption.OpenAlertException;
|
import com.zhgd.jeecg.common.execption.OpenAlertException;
|
||||||
import com.zhgd.jeecg.common.mybatis.EntityMap;
|
import com.zhgd.jeecg.common.mybatis.EntityMap;
|
||||||
import com.zhgd.xmgl.async.AsyncHikvision;
|
import com.zhgd.xmgl.async.AsyncHikvision;
|
||||||
@ -95,36 +96,41 @@ public class CarInfoServiceImpl extends ServiceImpl<CarInfoMapper, CarInfo> impl
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void addCarInfo(CarInfo carInfo) {
|
public Result addCarInfo(CarInfo c) {
|
||||||
if (Objects.equals(carInfo.getCarModuleType(), 1)) {
|
QueryWrapper<CarInfo> queryWrapper = new QueryWrapper<>();
|
||||||
QueryWrapper<CarInfo> queryWrapper = new QueryWrapper<>();
|
queryWrapper.lambda().eq(CarInfo::getProjectSn, c.getProjectSn())
|
||||||
queryWrapper.lambda().eq(CarInfo::getProjectSn, carInfo.getProjectSn())
|
.eq(CarInfo::getCarNumber, c.getCarNumber());
|
||||||
.eq(CarInfo::getCarNumber, carInfo.getCarNumber())
|
CarInfo carInfo = carInfoMapper.selectOne(queryWrapper);
|
||||||
.eq(CarInfo::getCarModuleType, 1);
|
if (carInfo != null) {
|
||||||
int count = carInfoMapper.selectCount(queryWrapper);
|
c.setId(carInfo.getId());
|
||||||
if (count > 0) {
|
editCar(c);
|
||||||
throw new OpenAlertException(MessageUtil.get("carNumberExistErr"));
|
if (Objects.equals(c.getCarModuleType(), 1)) {
|
||||||
|
return Result.ok("车辆已存在,数据已覆盖更新");
|
||||||
|
} else {
|
||||||
|
return Result.ok("车辆已存在,预约时间已覆盖更新");
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
carInfoMapper.insert(c);
|
||||||
|
//同步海康
|
||||||
|
asyncHikvision.addCarInfoForHikvision(c);
|
||||||
|
return Result.ok();
|
||||||
}
|
}
|
||||||
carInfoMapper.insert(carInfo);
|
|
||||||
|
|
||||||
//同步海康
|
|
||||||
asyncHikvision.addCarInfoForHikvision(carInfo);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void editCarInfo(CarInfo carInfo) {
|
public void editCarInfo(CarInfo carInfo) {
|
||||||
if (Objects.equals(carInfo.getCarModuleType(), 1)) {
|
QueryWrapper<CarInfo> queryWrapper = new QueryWrapper<>();
|
||||||
QueryWrapper<CarInfo> queryWrapper = new QueryWrapper<>();
|
queryWrapper.lambda().eq(CarInfo::getProjectSn, carInfo.getProjectSn())
|
||||||
queryWrapper.lambda().eq(CarInfo::getProjectSn, carInfo.getProjectSn())
|
.eq(CarInfo::getCarNumber, carInfo.getCarNumber())
|
||||||
.eq(CarInfo::getCarNumber, carInfo.getCarNumber())
|
.ne(CarInfo::getId, carInfo.getId());
|
||||||
.ne(CarInfo::getId, carInfo.getId())
|
int count = carInfoMapper.selectCount(queryWrapper);
|
||||||
.eq(CarInfo::getCarModuleType, 1);
|
if (count > 0) {
|
||||||
int count = carInfoMapper.selectCount(queryWrapper);
|
throw new OpenAlertException(MessageUtil.get("carNumberExistErr"));
|
||||||
if (count > 0) {
|
|
||||||
throw new OpenAlertException(MessageUtil.get("carNumberExistErr"));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
editCar(carInfo);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void editCar(CarInfo carInfo) {
|
||||||
CarInfo old = carInfoMapper.selectById(carInfo.getId());
|
CarInfo old = carInfoMapper.selectById(carInfo.getId());
|
||||||
carInfoMapper.updateById(carInfo);
|
carInfoMapper.updateById(carInfo);
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user