From 172c5525cbdba1c3b32b47cb60bd35bed707101c Mon Sep 17 00:00:00 2001
From: kongdeqiang <123456>
Date: 星期一, 27 三月 2023 17:18:48 +0800
Subject: [PATCH] 增加功能
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AreaController.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 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 3e27411..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,17 +43,18 @@
@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);
}
@RequestMapping(value = "/getByPage", method = RequestMethod.GET)
@ApiOperation(value = "鍒嗛〉鑾峰彇")
- public Result<IPage<Area>> getByPage(String areaId,PageVo page) {
+ public Result<IPage<Area>> getByPage(String name,PageVo page) {
QueryWrapper<Area> wrapper = new QueryWrapper<>();
- if (!StrUtil.isEmpty(areaId))
- wrapper.eq("area_id",areaId);
+ if (!StrUtil.isEmpty(name))
+ wrapper.like("a.name",name);
IPage<Area> data = iAreaService.page2(PageUtil.initMpPage(page),wrapper);
return new ResultUtil<IPage<Area>>().setData(data);
}
@@ -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("璇ヨ溅杈嗗凡琚叾瀹冪墖鍖虹粦瀹�,璇峰厛瑙ｇ粦");
+ }
+ }
+
if (iAreaService.saveOrUpdate(area)) {
return new ResultUtil<Area>().setData(area);
}
--
Gitblit v1.9.1