From 8936fcfe5fc1f896568235229db3be75e21bd37e Mon Sep 17 00:00:00 2001 From: zjf <1799650030@qq.com> Date: Wed, 25 Dec 2024 15:57:33 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E5=B8=82=E5=88=86=E7=B1=BB=E4=B8=8B?= =?UTF-8?q?=E6=8B=89=EF=BC=8C=E8=8F=9C=E5=8D=95=E5=A2=9E=E5=8A=A0=E9=9D=A2?= =?UTF-8?q?=E5=8C=85=E5=9D=97=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SmErpSupplierTypeController.java | 2 +- .../vo/SupermarketCategorySimpleVo.java | 17 +++++++++++++++++ .../SupermarketCategoryController.java | 15 +++++++++++++++ .../bsd/pjcloud/admin/api/entity/SysMenu.java | 3 +++ .../src/main/resources/mapper/SysMenuMapper.xml | 4 +++- 5 files changed, 39 insertions(+), 2 deletions(-) create mode 100644 pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SupermarketCategorySimpleVo.java diff --git a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/controller/SmErpSupplierTypeController.java b/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/controller/SmErpSupplierTypeController.java index 85e4928f8..69fe4758b 100644 --- a/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/controller/SmErpSupplierTypeController.java +++ b/pjcloud-supermarket-erp/pjcloud-supermarket-erp-biz/src/main/java/com/bsd/pjcloud/supermarketerp/controller/SmErpSupplierTypeController.java @@ -127,7 +127,7 @@ public class SmErpSupplierTypeController { * 下拉查询 * @return */ - @Operation(summary = "下拉查询" , description = "分页查询" ) + @Operation(summary = "下拉查询" ) @GetMapping("/simpleAll") public R getSimpleAll() { List list = smErpSupplierTypeService.list(); diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SupermarketCategorySimpleVo.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SupermarketCategorySimpleVo.java new file mode 100644 index 000000000..b946effdd --- /dev/null +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SupermarketCategorySimpleVo.java @@ -0,0 +1,17 @@ +package com.bsd.pjcloud.supermarket.vo; + + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +public class SupermarketCategorySimpleVo { + + + @Schema(description = "分类id") + private Long id; + + + @Schema(description = "分类名称") + private String name; +} diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketCategoryController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketCategoryController.java index b47f4ac5d..fc129aa86 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketCategoryController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketCategoryController.java @@ -6,10 +6,12 @@ import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.bsd.pjcloud.common.core.util.BeanUtils; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.log.annotation.SysLog; import com.bsd.pjcloud.supermarket.entity.SupermarketCategoryEntity; import com.bsd.pjcloud.supermarket.service.SupermarketCategoryService; +import com.bsd.pjcloud.supermarket.vo.SupermarketCategorySimpleVo; import org.springframework.security.access.prepost.PreAuthorize; import com.bsd.pjcloud.common.excel.annotation.ResponseExcel; import io.swagger.v3.oas.annotations.security.SecurityRequirement; @@ -118,4 +120,17 @@ public class SupermarketCategoryController { public List export(SupermarketCategoryEntity supermarketCategory,Long[] ids) { return supermarketCategoryService.list(Wrappers.lambdaQuery(supermarketCategory).in(ArrayUtil.isNotEmpty(ids), SupermarketCategoryEntity::getId, ids)); } + + + /** + * 下拉查询 + * @return + */ + @Operation(summary = "下拉查询") + @GetMapping("/simpleAll") + public R getSimpleAll() { + List list = supermarketCategoryService.list(); + List bean = BeanUtils.toBean(list, SupermarketCategorySimpleVo.class); + return R.ok(bean); + } } \ No newline at end of file diff --git a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/entity/SysMenu.java b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/entity/SysMenu.java index afe221395..3e4eae3eb 100644 --- a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/entity/SysMenu.java +++ b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/entity/SysMenu.java @@ -157,4 +157,7 @@ public class SysMenu extends Model { @Schema(description = "删除标记,1:已删除,0:正常") private String delFlag; + + @Schema(description = "菜单面包块图标") + private String menuPic; } diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysMenuMapper.xml b/pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysMenuMapper.xml index 99c3b249d..fe2286a8a 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysMenuMapper.xml +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysMenuMapper.xml @@ -38,6 +38,7 @@ + @@ -56,7 +57,8 @@ sys_menu.update_time, sys_menu.del_flag, sys_menu.embedded, - sys_menu.visible + sys_menu.visible, + sys_menu.menu_pic FROM sys_menu LEFT JOIN sys_role_menu ON sys_menu.menu_id = sys_role_menu.menu_id WHERE sys_menu.del_flag = '0'