diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductCategoryController.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductCategoryController.java index 90f3f2e4c..f658f70fa 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductCategoryController.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductCategoryController.java @@ -8,6 +8,8 @@ import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; import cn.iocoder.yudao.module.erp.controller.admin.product.vo.category.ErpProductCategoryListReqVO; import cn.iocoder.yudao.module.erp.controller.admin.product.vo.category.ErpProductCategoryRespVO; import cn.iocoder.yudao.module.erp.controller.admin.product.vo.category.ErpProductCategorySaveReqVO; +import cn.iocoder.yudao.module.erp.controller.admin.product.vo.category.ErpProductCategoryTreeRespVO; +import cn.iocoder.yudao.module.erp.controller.admin.product.vo.category.ErpProductCategoryTypeGroupRespVO; import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductCategoryDO; import cn.iocoder.yudao.module.erp.service.product.ErpProductCategoryService; import io.swagger.v3.oas.annotations.Operation; @@ -21,7 +23,10 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; +import java.util.ArrayList; +import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; @@ -77,10 +82,28 @@ public class ErpProductCategoryController { return success(BeanUtils.toBean(list, ErpProductCategoryRespVO.class)); } + @GetMapping("/group-tree") + @Operation(summary = "按类型分组获得产品分类树") + @PreAuthorize("@ss.hasPermission('erp:product-category:query')") + public CommonResult> getProductCategoryGroupTree(@Valid ErpProductCategoryListReqVO listReqVO) { + List list = productCategoryService.getProductCategoryList(listReqVO); + Map> typeMap = new LinkedHashMap<>(); + for (ErpProductCategoryDO category : list) { + typeMap.computeIfAbsent(category.getType(), key -> new ArrayList<>()).add(category); + } + List result = new ArrayList<>(); + for (Map.Entry> entry : typeMap.entrySet()) { + ErpProductCategoryTypeGroupRespVO group = new ErpProductCategoryTypeGroupRespVO(); + group.setType(entry.getKey()); + group.setChildren(buildCategoryTree(entry.getValue())); + result.add(group); + } + return success(result); + } @GetMapping("/simple-list") @Operation(summary = "获得产品分类精简列表", description = "只包含被开启的分类，主要用于前端的下拉选项") - public CommonResult> getProductCategorySimpleList(@RequestParam("type") Integer type) { + public CommonResult> getProductCategorySimpleList(@RequestParam("type") Integer type) { List list = productCategoryService.getProductCategoryList( new ErpProductCategoryListReqVO().setStatus(CommonStatusEnum.ENABLE.getStatus()).setType(type)); return success(convertList(list, category -> new ErpProductCategoryRespVO() @@ -92,11 +115,33 @@ public class ErpProductCategoryController { @PreAuthorize("@ss.hasPermission('erp:product-category:export')") @ApiAccessLog(operateType = EXPORT) public void exportProductCategoryExcel(@Valid ErpProductCategoryListReqVO listReqVO, - HttpServletResponse response) throws IOException { + HttpServletResponse response) throws IOException { List list = productCategoryService.getProductCategoryList(listReqVO); - // 导出 Excel ExcelUtils.write(response, "产品分类.xls", "数据", ErpProductCategoryRespVO.class, - BeanUtils.toBean(list, ErpProductCategoryRespVO.class)); + BeanUtils.toBean(list, ErpProductCategoryRespVO.class)); + } + + private List buildCategoryTree(List categories) { + Map nodeMap = new LinkedHashMap<>(); + for (ErpProductCategoryDO category : categories) { + ErpProductCategoryTreeRespVO node = BeanUtils.toBean(category, ErpProductCategoryTreeRespVO.class); + node.setChildren(new ArrayList<>()); + node.setLeaf(true); + nodeMap.put(category.getId(), node); + } + List roots = new ArrayList<>(); + for (ErpProductCategoryDO category : categories) { + ErpProductCategoryTreeRespVO node = nodeMap.get(category.getId()); + Long parentId = category.getParentId(); + ErpProductCategoryTreeRespVO parent = parentId == null ? null : nodeMap.get(parentId); + if (parent == null || ErpProductCategoryDO.PARENT_ID_ROOT.equals(parentId)) { + roots.add(node); + continue; + } + parent.getChildren().add(node); + parent.setLeaf(false); + } + return roots; } -} \ No newline at end of file +} diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/category/ErpProductCategoryListReqVO.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/category/ErpProductCategoryListReqVO.java index 23808167c..356603de2 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/category/ErpProductCategoryListReqVO.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/category/ErpProductCategoryListReqVO.java @@ -10,6 +10,12 @@ public class ErpProductCategoryListReqVO { @Schema(description = "分类名称", example = "芋艿") private String name; + @Schema(description = "分类编码", example = "S110") + private String code; + + @Schema(description = "父分类编号", example = "0") + private Long parentId; + @Schema(description = "分类类型", example = "1") private Integer type; diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/product/ErpProductCategoryMapper.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/product/ErpProductCategoryMapper.java index 45759b1dd..47a8f26c4 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/product/ErpProductCategoryMapper.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/product/ErpProductCategoryMapper.java @@ -19,15 +19,17 @@ public interface ErpProductCategoryMapper extends BaseMapperX selectList(ErpProductCategoryListReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .likeIfPresent(ErpProductCategoryDO::getName, reqVO.getName()) + .likeIfPresent(ErpProductCategoryDO::getCode, reqVO.getCode()) + .eqIfPresent(ErpProductCategoryDO::getParentId, reqVO.getParentId()) .eqIfPresent(ErpProductCategoryDO::getType, reqVO.getType()) .eqIfPresent(ErpProductCategoryDO::getStatus, reqVO.getStatus()) .orderByDesc(ErpProductCategoryDO::getSort) .orderByDesc(ErpProductCategoryDO::getId)); - } + } - default ErpProductCategoryDO selectByParentIdAndName(Long parentId, String name) { - return selectOne(ErpProductCategoryDO::getParentId, parentId, ErpProductCategoryDO::getName, name); - } + default ErpProductCategoryDO selectByParentIdAndName(Long parentId, String name) { + return selectOne(ErpProductCategoryDO::getParentId, parentId, ErpProductCategoryDO::getName, name); + } default ErpProductCategoryDO selectByName(String name) { return selectOne(ErpProductCategoryDO::getName, name); diff --git a/yudao-server/src/main/resources/application.yaml b/yudao-server/src/main/resources/application.yaml index 33974fb04..fb3a8c322 100644 --- a/yudao-server/src/main/resources/application.yaml +++ b/yudao-server/src/main/resources/application.yaml @@ -40,15 +40,15 @@ server: springdoc: api-docs: - enabled: false + enabled: true path: /v3/api-docs swagger-ui: - enabled: false + enabled: true path: /swagger-ui default-flat-param-object: true # 参见 https://doc.xiaominfo.com/docs/faq/v4/knife4j-parameterobject-flat-param 文档 knife4j: - enable: false + enable: true setting: language: zh_cn