From a07f0e7fb1e7fdbdb4c7796b2d938140e3e8dfef Mon Sep 17 00:00:00 2001
From: zhangzeli <123456>
Date: 星期三, 03 十一月 2021 17:27:13 +0800
Subject: [PATCH] 商户表，配送片区表，片区段表
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CustomerController.java | 11 ++-
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AreaController.java | 78 ++++++++++++++++++++++++++
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AreaSectionController.java | 79 ++++++++++++++++++++++++++
3 files changed, 164 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
new file mode 100644
index 0000000..3e27411
--- /dev/null
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AreaController.java
@@ -0,0 +1,78 @@
+package cn.exrick.xboot.your.controller;
+
+import cn.exrick.xboot.core.common.utils.PageUtil;
+import cn.exrick.xboot.core.common.utils.ResultUtil;
+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.service.IAreaService;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * @author zhangzeli
+ */
+@Slf4j
+@RestController
+@Api(tags = "閰嶉�佺墖鍖虹鐞嗘帴鍙�")
+@RequestMapping("/xboot/area")
+@Transactional
+public class AreaController {
+
+ @Autowired
+ private IAreaService iAreaService;
+
+ @RequestMapping(value = "/get/{id}", method = RequestMethod.GET)
+ @ApiOperation(value = "閫氳繃id鑾峰彇")
+ public Result<Area> get(@PathVariable String id) {
+
+ Area area = iAreaService.getById(id);
+ return new ResultUtil<Area>().setData(area);
+ }
+
+ @RequestMapping(value = "/getAll", method = RequestMethod.GET)
+ @ApiOperation(value = "鑾峰彇鍏ㄩ儴鏁版嵁")
+ public Result<List<Area>> getAll() {
+
+ 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) {
+ QueryWrapper<Area> wrapper = new QueryWrapper<>();
+ if (!StrUtil.isEmpty(areaId))
+ wrapper.eq("area_id",areaId);
+ IPage<Area> data = iAreaService.page2(PageUtil.initMpPage(page),wrapper);
+ return new ResultUtil<IPage<Area>>().setData(data);
+ }
+
+ @RequestMapping(value = "/insertOrUpdate", method = RequestMethod.POST)
+ @ApiOperation(value = "缂栬緫鎴栨洿鏂版暟鎹�")
+ public Result<Area> saveOrUpdate(Area area) {
+ if (iAreaService.saveOrUpdate(area)) {
+ return new ResultUtil<Area>().setData(area);
+ }
+ return new ResultUtil<Area>().setErrorMsg("鎿嶄綔澶辫触");
+ }
+
+ @RequestMapping(value = "/delByIds", method = RequestMethod.POST)
+ @ApiOperation(value = "鎵归噺閫氳繃id鍒犻櫎")
+ public Result<Object> delAllByIds(@RequestParam String[] ids) {
+
+ for (String id : ids) {
+ iAreaService.removeById(id);
+ }
+ return ResultUtil.success("鎵归噺閫氳繃id鍒犻櫎鏁版嵁鎴愬姛");
+ }
+}
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AreaSectionController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AreaSectionController.java
new file mode 100644
index 0000000..ccfb087
--- /dev/null
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/AreaSectionController.java
@@ -0,0 +1,79 @@
+package cn.exrick.xboot.your.controller;
+
+import cn.exrick.xboot.core.common.utils.PageUtil;
+import cn.exrick.xboot.core.common.utils.ResultUtil;
+import cn.exrick.xboot.core.common.vo.PageVo;
+import cn.exrick.xboot.core.common.vo.Result;
+import cn.exrick.xboot.your.entity.AreaSection;
+import cn.exrick.xboot.your.service.IAreaSectionService;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+/**
+ * @author zhangzeli
+ */
+@Slf4j
+@RestController
+@Api(tags = "鐗囧尯娈电鐞嗘帴鍙�")
+@RequestMapping("/xboot/areaSection")
+@Transactional
+public class AreaSectionController {
+
+ @Autowired
+ private IAreaSectionService iAreaSectionService;
+
+ @RequestMapping(value = "/get/{id}", method = RequestMethod.GET)
+ @ApiOperation(value = "閫氳繃id鑾峰彇")
+ public Result<AreaSection> get(@PathVariable String id) {
+
+ AreaSection areaSection = iAreaSectionService.getById(id);
+ return new ResultUtil<AreaSection>().setData(areaSection);
+ }
+
+ @RequestMapping(value = "/getAll", method = RequestMethod.GET)
+ @ApiOperation(value = "鑾峰彇鍏ㄩ儴鏁版嵁")
+ public Result<List<AreaSection>> getAll() {
+
+ List<AreaSection> list = iAreaSectionService.list();
+ return new ResultUtil<List<AreaSection>>().setData(list);
+ }
+
+ @RequestMapping(value = "/getByPage", method = RequestMethod.GET)
+ @ApiOperation(value = "鍒嗛〉鑾峰彇")
+ public Result<IPage<AreaSection>> getByPage(String areaId,PageVo page) {
+ QueryWrapper<AreaSection> wrapper = new QueryWrapper<>();
+ if (!StrUtil.isEmpty(areaId))
+ wrapper.eq("area_id",areaId);
+ IPage<AreaSection> data = iAreaSectionService.page(PageUtil.initMpPage(page),wrapper);
+ return new ResultUtil<IPage<AreaSection>>().setData(data);
+ }
+
+ @RequestMapping(value = "/insertOrUpdate", method = RequestMethod.POST)
+ @ApiOperation(value = "缂栬緫鎴栨洿鏂版暟鎹�")
+ public Result<AreaSection> saveOrUpdate(AreaSection areaSection) {
+
+ if (iAreaSectionService.saveOrUpdate(areaSection)) {
+ return new ResultUtil<AreaSection>().setData(areaSection);
+ }
+ return new ResultUtil<AreaSection>().setErrorMsg("鎿嶄綔澶辫触");
+ }
+
+ @RequestMapping(value = "/delByIds", method = RequestMethod.POST)
+ @ApiOperation(value = "鎵归噺閫氳繃id鍒犻櫎")
+ public Result<Object> delAllByIds(@RequestParam String[] ids) {
+
+ for (String id : ids) {
+ iAreaSectionService.removeById(id);
+ }
+ return ResultUtil.success("鎵归噺閫氳繃id鍒犻櫎鏁版嵁鎴愬姛");
+ }
+}
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CustomerController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CustomerController.java
index 57d6aaf..df25787 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CustomerController.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/CustomerController.java
@@ -48,10 +48,13 @@
}
@RequestMapping(value = "/getByPage", method = RequestMethod.GET)
- @ApiOperation(value = "鍒嗛〉鑾峰彇")
- public Result<IPage<Customer>> getByPage(PageVo page) {
-
- IPage<Customer> data = iCustomerService.page(PageUtil.initMpPage(page));
+ @ApiOperation(value = "" +
+ "")
+ public Result<IPage<Customer>> getByPage(String areaSectionId,PageVo page) {
+ QueryWrapper<Customer> wrapper = new QueryWrapper<>();
+ if (!StrUtil.isEmpty(areaSectionId))
+ wrapper.eq("area_section_id",areaSectionId);
+ IPage<Customer> data = iCustomerService.page(PageUtil.initMpPage(page),wrapper);
return new ResultUtil<IPage<Customer>>().setData(data);
}
--
Gitblit v1.9.1