From 6ecf07d2b62791dfc6200758460ea32232a3cb17 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Wed, 25 Dec 2024 16:14:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=93=81=E7=89=8C=E4=B8=8B=E6=8B=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vo/SupermarketBrandSimpleVo.java            | 17 +++++++++++++++++
 .../controller/SupermarketBrandController.java  | 17 +++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SupermarketBrandSimpleVo.java

diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SupermarketBrandSimpleVo.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SupermarketBrandSimpleVo.java
new file mode 100644
index 000000000..e45f1dd02
--- /dev/null
+++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/SupermarketBrandSimpleVo.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 SupermarketBrandSimpleVo {
+
+
+    @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/SupermarketBrandController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketBrandController.java
index d1096523b..25af8b748 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketBrandController.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SupermarketBrandController.java
@@ -6,10 +6,14 @@ 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.SupermarketBrandEntity;
+import com.bsd.pjcloud.supermarket.entity.SupermarketCategoryEntity;
 import com.bsd.pjcloud.supermarket.service.SupermarketBrandService;
+import com.bsd.pjcloud.supermarket.vo.SupermarketBrandSimpleVo;
+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 +122,17 @@ public class SupermarketBrandController {
     public List<SupermarketBrandEntity> export(SupermarketBrandEntity supermarketBrand,Long[] ids) {
         return supermarketBrandService.list(Wrappers.lambdaQuery(supermarketBrand).in(ArrayUtil.isNotEmpty(ids), SupermarketBrandEntity::getId, ids));
     }
+
+
+    /**
+     * 下拉查询
+     * @return
+     */
+    @Operation(summary = "下拉查询")
+    @GetMapping("/simpleAll")
+    public R getSimpleAll() {
+        List<SupermarketBrandEntity> list = supermarketBrandService.list();
+        List<SupermarketBrandSimpleVo> bean = BeanUtils.toBean(list, SupermarketBrandSimpleVo.class);
+        return R.ok(bean);
+    }
 }
\ No newline at end of file