From a134e40126c09ddd79bf7131c7e7d42444cd4cf7 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Fri, 12 Apr 2024 14:46:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxt/goods/apiadmin/base/BaseGoodsBrandRest.java | 8 +++++--- .../yxt/goods/apiadmin/base/BaseGoodsTypeRest.java | 13 ++++++------- .../yxt/goods/apiadmin/base/BaseGoodsUnitRest.java | 13 ++++++------- .../goods/apiadmin/base/BaseManufacturerRest.java | 11 ++++------- .../base/basebrandinfo/BaseBrandInfoService.java | 2 +- .../base/basegoodstype/BaseGoodsTypeService.java | 2 +- .../base/basegoodsunit/BaseGoodsUnitService.java | 2 +- .../basemanufacturer/BaseManufacturerService.java | 2 +- 8 files changed, 25 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/yxt/goods/apiadmin/base/BaseGoodsBrandRest.java b/src/main/java/com/yxt/goods/apiadmin/base/BaseGoodsBrandRest.java index 3a4482c..281c214 100644 --- a/src/main/java/com/yxt/goods/apiadmin/base/BaseGoodsBrandRest.java +++ b/src/main/java/com/yxt/goods/apiadmin/base/BaseGoodsBrandRest.java @@ -9,6 +9,8 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * @author wangpengfei * @date 2024/2/26 15:49 @@ -27,9 +29,9 @@ public class BaseGoodsBrandRest { return baseBrandInfoService.listPage(pq); } @ApiOperation("查询所有的品牌") - @GetMapping("/getAllType") - public ResultBean getAllType() { - return baseBrandInfoService.getAllType(); + @GetMapping("/listAll") + public ResultBean> listAll() { + return baseBrandInfoService.listAll(); } @ApiOperation("保存修改") @PostMapping("/saveOrUpdate") diff --git a/src/main/java/com/yxt/goods/apiadmin/base/BaseGoodsTypeRest.java b/src/main/java/com/yxt/goods/apiadmin/base/BaseGoodsTypeRest.java index 352bca7..34fc20e 100644 --- a/src/main/java/com/yxt/goods/apiadmin/base/BaseGoodsTypeRest.java +++ b/src/main/java/com/yxt/goods/apiadmin/base/BaseGoodsTypeRest.java @@ -1,9 +1,6 @@ package com.yxt.goods.apiadmin.base; -import com.yxt.goods.biz.base.basegoodstype.BaseGoodsTypeDto; -import com.yxt.goods.biz.base.basegoodstype.BaseGoodsTypeQuery; -import com.yxt.goods.biz.base.basegoodstype.BaseGoodsTypeService; -import com.yxt.goods.biz.base.basegoodstype.BaseGoodsTypeVo; +import com.yxt.goods.biz.base.basegoodstype.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -12,6 +9,8 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * @author wangpengfei * @date 2024/2/26 13:44 @@ -30,9 +29,9 @@ public class BaseGoodsTypeRest { return baseGoodsTypeService.listPage(pq); } @ApiOperation("查询所有的类别") - @GetMapping("/getAllType") - public ResultBean getAllType() { - return baseGoodsTypeService.getAllType(); + @GetMapping("/listAll") + public ResultBean> listAll() { + return baseGoodsTypeService.listAll(); } @ApiOperation("保存修改") diff --git a/src/main/java/com/yxt/goods/apiadmin/base/BaseGoodsUnitRest.java b/src/main/java/com/yxt/goods/apiadmin/base/BaseGoodsUnitRest.java index 1ca8356..1356a06 100644 --- a/src/main/java/com/yxt/goods/apiadmin/base/BaseGoodsUnitRest.java +++ b/src/main/java/com/yxt/goods/apiadmin/base/BaseGoodsUnitRest.java @@ -1,9 +1,6 @@ package com.yxt.goods.apiadmin.base; -import com.yxt.goods.biz.base.basegoodsunit.BaseGoodsUnitDto; -import com.yxt.goods.biz.base.basegoodsunit.BaseGoodsUnitQuery; -import com.yxt.goods.biz.base.basegoodsunit.BaseGoodsUnitService; -import com.yxt.goods.biz.base.basegoodsunit.BaseGoodsUnitVo; +import com.yxt.goods.biz.base.basegoodsunit.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -12,6 +9,8 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * @author wangpengfei * @date 2024/3/8 9:19 @@ -30,9 +29,9 @@ public class BaseGoodsUnitRest { return baseGoodsUnitService.listPage(pq); } @ApiOperation("查询所有的类别") - @GetMapping("/getAllUnit") - public ResultBean getAllType() { - return baseGoodsUnitService.getAllType(); + @GetMapping("/listAll") + public ResultBean> listAll() { + return baseGoodsUnitService.listAll(); } @ApiOperation("保存修改") diff --git a/src/main/java/com/yxt/goods/apiadmin/base/BaseManufacturerRest.java b/src/main/java/com/yxt/goods/apiadmin/base/BaseManufacturerRest.java index b69f18d..711524d 100644 --- a/src/main/java/com/yxt/goods/apiadmin/base/BaseManufacturerRest.java +++ b/src/main/java/com/yxt/goods/apiadmin/base/BaseManufacturerRest.java @@ -1,9 +1,6 @@ package com.yxt.goods.apiadmin.base; -import com.yxt.goods.biz.base.basemanufacturer.BaseManufacturerDto; -import com.yxt.goods.biz.base.basemanufacturer.BaseManufacturerQuery; -import com.yxt.goods.biz.base.basemanufacturer.BaseManufacturerService; -import com.yxt.goods.biz.base.basemanufacturer.BaseManufacturerVo; +import com.yxt.goods.biz.base.basemanufacturer.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -33,9 +30,9 @@ public class BaseManufacturerRest { } @ApiOperation("查询所有的厂家") - @GetMapping("/getAllType") - public ResultBean getAllType() { - return baseManufacturerService.getAllType(); + @GetMapping("/listAll") + public ResultBean> listAll() { + return baseManufacturerService.listAll(); } @ApiOperation("保存修改") diff --git a/src/main/java/com/yxt/goods/biz/base/basebrandinfo/BaseBrandInfoService.java b/src/main/java/com/yxt/goods/biz/base/basebrandinfo/BaseBrandInfoService.java index 6bef3b9..0830b66 100644 --- a/src/main/java/com/yxt/goods/biz/base/basebrandinfo/BaseBrandInfoService.java +++ b/src/main/java/com/yxt/goods/biz/base/basebrandinfo/BaseBrandInfoService.java @@ -50,7 +50,7 @@ public class BaseBrandInfoService extends MybatisBaseService getAllType() { + public ResultBean> listAll() { ResultBean rb = ResultBean.fireFail(); List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1)); return rb.success().setData(pagging); diff --git a/src/main/java/com/yxt/goods/biz/base/basegoodstype/BaseGoodsTypeService.java b/src/main/java/com/yxt/goods/biz/base/basegoodstype/BaseGoodsTypeService.java index 95a1548..2ca0bb3 100644 --- a/src/main/java/com/yxt/goods/biz/base/basegoodstype/BaseGoodsTypeService.java +++ b/src/main/java/com/yxt/goods/biz/base/basegoodstype/BaseGoodsTypeService.java @@ -44,7 +44,7 @@ public class BaseGoodsTypeService extends MybatisBaseService getAllType() { + } public ResultBean> listAll() { ResultBean rb = ResultBean.fireFail(); List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1)); return rb.success().setData(pagging); diff --git a/src/main/java/com/yxt/goods/biz/base/basegoodsunit/BaseGoodsUnitService.java b/src/main/java/com/yxt/goods/biz/base/basegoodsunit/BaseGoodsUnitService.java index 0fcd5f2..f298d68 100644 --- a/src/main/java/com/yxt/goods/biz/base/basegoodsunit/BaseGoodsUnitService.java +++ b/src/main/java/com/yxt/goods/biz/base/basegoodsunit/BaseGoodsUnitService.java @@ -37,7 +37,7 @@ public class BaseGoodsUnitService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); List records = pagging.getRecords(); return rb.success().setData(p); - } public ResultBean getAllType() { + } public ResultBean> listAll() { ResultBean rb = ResultBean.fireFail(); List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1)); return rb.success().setData(pagging); diff --git a/src/main/java/com/yxt/goods/biz/base/basemanufacturer/BaseManufacturerService.java b/src/main/java/com/yxt/goods/biz/base/basemanufacturer/BaseManufacturerService.java index b2abe6b..e05fa4c 100644 --- a/src/main/java/com/yxt/goods/biz/base/basemanufacturer/BaseManufacturerService.java +++ b/src/main/java/com/yxt/goods/biz/base/basemanufacturer/BaseManufacturerService.java @@ -38,7 +38,7 @@ public class BaseManufacturerService extends MybatisBaseService records = pagging.getRecords(); return rb.success().setData(p); } - public ResultBean getAllType() { + public ResultBean> listAll() { ResultBean rb = ResultBean.fireFail(); List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1)); return rb.success().setData(pagging);