From 58766aa147558d27994645c151a3491ebcd2353d Mon Sep 17 00:00:00 2001 From: feijinping Date: Wed, 30 Nov 2022 00:01:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/SysDictDataController.java | 16 ++++++++++++++++ .../controller/ProductCategoryController.java | 6 +++--- .../java/com/cyl/pms/domain/ProductCategory.java | 4 ++-- .../cyl/pms/pojo/query/ProductCategoryQuery.java | 2 +- .../com/cyl/pms/pojo/vo/ProductCategoryVO.java | 4 ++-- .../mapper/system/SysDictDataMapper.xml | 6 ++++++ sql/mall_pms结构.sql | 2 +- 7 files changed, 31 insertions(+), 9 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java index c0248c1..1b53fb7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java @@ -82,6 +82,22 @@ public class SysDictDataController extends BaseController return AjaxResult.success(data); } + /** + * 根据字典类型查询字典数据信息 + */ + @PostMapping(value = "/all-by-types") + public AjaxResult allByTypes(@RequestBody List dictTypes) + { + SysDictData query = new SysDictData(); + query.getParams().put("dictTypes", dictTypes); + List data = dictDataService.selectDictDataList(query); + if (StringUtils.isNull(data)) + { + data = new ArrayList<>(); + } + return AjaxResult.success(data); + } + /** * 新增字典类型 */ diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/controller/ProductCategoryController.java b/ruoyi-mall/src/main/java/com/cyl/pms/controller/ProductCategoryController.java index 60b7445..4ebcfe6 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/controller/ProductCategoryController.java +++ b/ruoyi-mall/src/main/java/com/cyl/pms/controller/ProductCategoryController.java @@ -45,9 +45,9 @@ public class ProductCategoryController extends BaseController { @ApiOperation("查询商品分类列表") @PreAuthorize("@ss.hasPermi('pms:productCategory:list')") @PostMapping("/list") - public ResponseEntity> list(@RequestBody ProductCategoryQuery query, Pageable page) { - List list = service.selectList(query, page); - return ResponseEntity.ok(new PageImpl<>(list, page, ((com.github.pagehelper.Page)list).getTotal())); + public ResponseEntity> list(@RequestBody ProductCategoryQuery query) { + List list = service.selectList(query, null); + return ResponseEntity.ok(list); } @ApiOperation("导出商品分类列表") diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/domain/ProductCategory.java b/ruoyi-mall/src/main/java/com/cyl/pms/domain/ProductCategory.java index 9725da1..067c2da 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/domain/ProductCategory.java +++ b/ruoyi-mall/src/main/java/com/cyl/pms/domain/ProductCategory.java @@ -20,8 +20,8 @@ public class ProductCategory extends BaseAudit { @ApiModelProperty("ID") private Long id; - @ApiModelProperty("上机分类的编号：0表示一级分类") - @Excel(name = "上机分类的编号：0表示一级分类") + @ApiModelProperty("上级分类的编号：0表示一级分类") + @Excel(name = "上级分类的编号：0表示一级分类") private Long parentId; @ApiModelProperty("NAME") diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/pojo/query/ProductCategoryQuery.java b/ruoyi-mall/src/main/java/com/cyl/pms/pojo/query/ProductCategoryQuery.java index 63c1f0f..0aadaf8 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/pojo/query/ProductCategoryQuery.java +++ b/ruoyi-mall/src/main/java/com/cyl/pms/pojo/query/ProductCategoryQuery.java @@ -12,7 +12,7 @@ import io.swagger.annotations.ApiModelProperty; @ApiModel(description="商品分类 查询 对象") @Data public class ProductCategoryQuery { - @ApiModelProperty("上机分类的编号：0表示一级分类 精确匹配") + @ApiModelProperty("上级分类的编号：0表示一级分类 精确匹配") private Long parentId; @ApiModelProperty("NAME 精确匹配") diff --git a/ruoyi-mall/src/main/java/com/cyl/pms/pojo/vo/ProductCategoryVO.java b/ruoyi-mall/src/main/java/com/cyl/pms/pojo/vo/ProductCategoryVO.java index 8d587ce..232cdc5 100644 --- a/ruoyi-mall/src/main/java/com/cyl/pms/pojo/vo/ProductCategoryVO.java +++ b/ruoyi-mall/src/main/java/com/cyl/pms/pojo/vo/ProductCategoryVO.java @@ -13,8 +13,8 @@ import lombok.Data; public class ProductCategoryVO extends BaseAudit { /** ID */ private Long id; - /** 上机分类的编号：0表示一级分类 */ - @Excel(name = "上机分类的编号：0表示一级分类") + /** 上级分类的编号：0表示一级分类 */ + @Excel(name = "上级分类的编号：0表示一级分类") private Long parentId; /** NAME */ @Excel(name = "NAME") diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml index 9e06985..9ec6034 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml @@ -37,6 +37,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND status = #{status} + + AND dict_type in + + #{it} + + order by dict_sort asc diff --git a/sql/mall_pms结构.sql b/sql/mall_pms结构.sql index 8069d94..a5c22a5 100644 --- a/sql/mall_pms结构.sql +++ b/sql/mall_pms结构.sql @@ -53,7 +53,7 @@ DROP TABLE IF EXISTS `pms_product_category`; CREATE TABLE `pms_product_category` ( `id` bigint(20) NOT NULL AUTO_INCREMENT, - `parent_id` bigint(20) NULL DEFAULT NULL COMMENT '上机分类的编号：0表示一级分类', + `parent_id` bigint(20) NULL DEFAULT NULL COMMENT '上级分类的编号：0表示一级分类', `name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, `level` int(1) NULL DEFAULT NULL COMMENT '分类级别：0->1级；1->2级', `show_status` int(1) NULL DEFAULT NULL COMMENT '显示状态：0->不显示；1->显示',