Merge remote-tracking branch 'origin/master'
| | |
| | | @ApiOperation(value = "新增点位") |
| | | // @Transactional |
| | | // @ShardingSphereTransactionType(TransactionType.BASE) |
| | | public R add(@Validated @RequestBody PointAddDto pointAddDto) { |
| | | xpPointService.addPointWithGeneratedNumber(pointAddDto); |
| | | return R.ok(); |
| | | public R<XpPoint> add(@Validated @RequestBody PointAddDto pointAddDto) { |
| | | return R.ok(xpPointService.addPointWithGeneratedNumber(pointAddDto)); |
| | | } |
| | | |
| | | /** |
| | |
| | | /** |
| | | * 新增点位并根据规则生成点位编号 |
| | | */ |
| | | void addPointWithGeneratedNumber(@Valid PointAddDto pointAddDto); |
| | | XpPoint addPointWithGeneratedNumber(@Valid PointAddDto pointAddDto); |
| | | |
| | | /** |
| | | * 获取附近上车站点 |
| | |
| | | private RedissonClient redissonClient; |
| | | |
| | | @Override |
| | | public void addPointWithGeneratedNumber(PointAddDto pointAddDto) { |
| | | public XpPoint addPointWithGeneratedNumber(PointAddDto pointAddDto) { |
| | | if (pointAddDto == null) { |
| | | throw new ServiceException("参数不能为空", I18nKeyConstant.SYSTEM_EXCEPTION); |
| | | } |
| | |
| | | BeanUtils.copyProperties(pointAddDto, xpPoint); |
| | | xpPoint.setPointNumber(pointNumber); |
| | | this.save(xpPoint); |
| | | return xpPoint; |
| | | } |
| | | |
| | | @Override |