From f61a459ec90d486cf9c3d90c57a339d1af9644eb Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Tue, 19 Jul 2022 10:46:05 +0800 Subject: [PATCH] =?UTF-8?q?:rocket:=20=E5=8C=BA=E5=9F=9F=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91=E5=AE=8C=E6=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/RegionController.java | 95 ++++++++----------- .../kicc/system/mapper/RegionMapper.java | 7 -- .../kicc/system/service/RegionService.java | 8 -- .../service/impl/RegionServiceImpl.java | 21 +--- .../main/resources/mapper/RegionMapper.xml | 34 ------- 5 files changed, 46 insertions(+), 119 deletions(-) diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/RegionController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/RegionController.java index 689c42b7..d0569fa2 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/RegionController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/RegionController.java @@ -1,91 +1,78 @@ package com.cloud.kicc.system.controller; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.cloud.kicc.common.core.api.R; import com.cloud.kicc.common.core.constant.AppConstants; +import com.cloud.kicc.system.api.entity.Menu; import com.cloud.kicc.system.api.entity.Region; import com.cloud.kicc.system.service.RegionService; -import com.cloud.kicc.system.service.UserService; import io.swagger.annotations.Api; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** - * @Author: TangSheng - * @Description: 地址管理 - * @Since 1.0 - * @Date Created in 10:22 2022/3/21 + *

+ * 区域管理 + *

+ * + * @Author: entfrm开发团队-王翔 + * @Date: 2022/7/19 */ @RestController @RequiredArgsConstructor @RequestMapping(AppConstants.APP_SYSTEM + "/address") @Api(value = "app", tags = "地址管理模块") public class RegionController { - private final UserService userService; + private final RegionService regionService; - /** - * 新增节点 - * @param region 节点dto - * @return - */ - @PostMapping("/add") - public R add(@RequestBody Region region){ + + private LambdaQueryWrapper getQueryWrapper(Region region) { + return new LambdaQueryWrapper() + .like(StrUtil.isNotBlank(region.getName()), Region::getName, region.getName()) + .eq(StrUtil.isNotBlank(region.getCode()), Region::getCode, region.getCode()) + .between(StrUtil.isNotBlank(region.getBeginTime()) && StrUtil.isNotBlank(region.getEndTime()), Region::getCreateTime, region.getBeginTime(), region.getEndTime()) + .orderByAsc(Region::getSort); + } + + @GetMapping("/list") + public R list(Region region) { + List result = regionService.list(getQueryWrapper(region)); + return R.ok(result, result.size()); + } + + @GetMapping("/lazyList") + public R lazyList(String parentId){ + return R.ok(regionService.lazyList(parentId)); + } + + @GetMapping("/{id:\\w+}") + public R getById(@PathVariable("id") String id) { + return R.ok(regionService.getById(id)); + } + + @PostMapping("/save") + public R save(@RequestBody Region region){ regionService.save(region); return R.ok(region); } - /** - * 修改节点 - * @param region 修改对象 - * @return - */ @PutMapping("/update") public R update(@RequestBody Region region){ regionService.updateById(region); return R.ok(region); } - /** - * 删除地址节点 - * @param id 节点id - * @return - */ - @DeleteMapping("/remove/{id}") + @DeleteMapping("/remove/{id:\\w+}") public R remove(@PathVariable("id") String id){ - if(regionService.getMap(Wrappers.lambdaQuery().eq(Region::getParentId,id))!=null){ + if (regionService.count(new LambdaQueryWrapper().eq(Region::getParentId, id)) > 0) { return R.error("存在下级区域,不允许删除"); } regionService.removeById(id); return R.ok(); } - /** - * 查询根据id - * @param id - * @return - */ - @GetMapping("/{id:\\w+}") - public R getById(@PathVariable("id") String id) { - return R.ok(regionService.getById(id)); - } - - /** - * 查询地址列表 - * @return - */ - @GetMapping("/list") - public R list(Region region){ - return R.ok(regionService.queryList(region)); - } - - /** - * 查询地址列表 - * @return - */ - @GetMapping("/lazyList") - public R lazyList(String parentId){ - return R.ok(regionService.lazyList(parentId)); - } - } diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/RegionMapper.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/RegionMapper.java index 1f09308d..492440c5 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/RegionMapper.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/RegionMapper.java @@ -20,11 +20,4 @@ public interface RegionMapper extends BaseMapper { */ List lazyList(String parentId); - /** - * 条件查询 - * @param region 区域对象 - * @return List - */ - List queryList(Region region); - } diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/RegionService.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/RegionService.java index 68ccc148..768c1c0b 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/RegionService.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/RegionService.java @@ -16,7 +16,6 @@ import java.util.List; */ public interface RegionService extends IService { - /** * 懒加载查询 * @param parentId 父节点 @@ -24,11 +23,4 @@ public interface RegionService extends IService { */ List lazyList(String parentId); - /** - * 条件查询 - * @param region 区域对象 - * @return List - */ - List queryList(Region region); - } diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/RegionServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/RegionServiceImpl.java index e5325807..4e0c17d3 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/RegionServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/RegionServiceImpl.java @@ -23,27 +23,16 @@ import java.util.stream.Collectors; @RequiredArgsConstructor public class RegionServiceImpl extends ServiceImpl implements RegionService { - @Override - public List queryList(Region region) { - List regionList = this.baseMapper.queryList(region); - return regionList.stream().filter(item ->"1".equals(item.getTag())) - .map(item -> { - List regions = regionList.stream().filter(e -> "1".equals(item.getTag())).collect(Collectors.toList()); - if(regions.size() != 0) { - item.setChildren(regions); - } - return item; - }).collect(Collectors.toList()); - } - @Override public List lazyList(String parentId) { List regionList = this.baseMapper.lazyList(parentId); return regionList.stream().filter(item -> item.getParentId().equals(parentId)) .map(item -> { - List regions = regionList.stream().filter(e -> e.getParentId().equals(item.getId())).collect(Collectors.toList()); - if(regions.size() != 0) { - item.setChildren(regions); + // 处理存入子数据,处理让树形表格显示图标 + List regionChildren = regionList.stream() + .filter(e -> e.getParentId().equals(item.getId())).collect(Collectors.toList()); + if(regionChildren.size() != 0) { + item.setChildren(regionChildren); } return item; }).collect(Collectors.toList()); diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/RegionMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/RegionMapper.xml index dd31afb1..d493c0c7 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/RegionMapper.xml +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/RegionMapper.xml @@ -2,40 +2,6 @@ - -