From 93a3a1de1d52c014368a1200139fa46969a80c66 Mon Sep 17 00:00:00 2001 From: kongdeqiang <123456> Date: 星期五, 10 二月 2023 17:11:30 +0800 Subject: [PATCH] 增加功能 --- xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AreaController.java | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AreaController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AreaController.java index c8c02d9..b1cbb90 100644 --- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AreaController.java +++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AreaController.java @@ -5,6 +5,7 @@ import cn.exrick.xboot.core.common.vo.PageVo; import cn.exrick.xboot.core.common.vo.Result; import cn.exrick.xboot.your.entity.Area; +import cn.exrick.xboot.your.entity.Car; import cn.exrick.xboot.your.service.IAreaService; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -42,7 +43,8 @@ @RequestMapping(value = "/getAll", method = RequestMethod.GET) @ApiOperation(value = "鑾峰彇鍏ㄩ儴鏁版嵁") public Result<List<Area>> getAll() { - + QueryWrapper<Area> wrapper = new QueryWrapper<>(); + wrapper.orderByAsc("name"); List<Area> list = iAreaService.list(); return new ResultUtil<List<Area>>().setData(list); } @@ -60,6 +62,15 @@ @RequestMapping(value = "/insertOrUpdate", method = RequestMethod.POST) @ApiOperation(value = "缂栬緫鎴栨洿鏂版暟鎹�") public Result<Area> saveOrUpdate(Area area) { + QueryWrapper<Area> wrapper = new QueryWrapper<>(); + if (StrUtil.isNotEmpty(area.getCarId())){ + wrapper.eq("car_id",area.getCarId()); + Area area1 = iAreaService.getOne(wrapper); + if (area1 != null && !area.getId().equals(area1.getId())){ + return new ResultUtil<Area>().setErrorMsg("璇ヨ溅杈嗗凡琚叾瀹冪墖鍖虹粦瀹�,璇峰厛瑙g粦"); + } + } + if (iAreaService.saveOrUpdate(area)) { return new ResultUtil<Area>().setData(area); } -- Gitblit v1.9.1