From 21ba8358f1172285385c38ba31db0194dd19a7da Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Thu, 13 Jun 2024 08:40:28 +0800 Subject: [PATCH] 6/13 --- .../warehouse/apiadmin/WarehouseAreaRest.java | 8 +++--- .../apiadmin/WarehouseAreaTypeRest.java | 21 ++++++++------- .../warehouse/apiadmin/WarehouseInfoRest.java | 15 ++++++----- .../warehouse/apiadmin/WarehouseRackRest.java | 13 +++++---- .../biz/warehousearea/WarehouseAreaQuery.java | 12 +++++++++ .../warehousearea/WarehouseAreaService.java | 23 +++------------- .../WarehouseAreaTypeQuery.java | 12 +++++++++ .../WarehouseAreaTypeService.java | 18 ++++--------- .../biz/warehouseinfo/WarehouseInfoQuery.java | 13 +++++++++ .../warehouseinfo/WarehouseInfoService.java | 27 +++++-------------- .../biz/warehouserack/WarehouseRackQuery.java | 11 ++++++++ .../warehouserack/WarehouseRackService.java | 25 +++-------------- 12 files changed, 98 insertions(+), 100 deletions(-) diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseAreaRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseAreaRest.java index dcf6169..6a712e2 100644 --- a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseAreaRest.java +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseAreaRest.java @@ -1,5 +1,7 @@ package com.yxt.warehouse.apiadmin; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -17,7 +19,7 @@ import java.util.List; */ @Api(tags = "库区信息") @RestController -@RequestMapping("/apiadmin/base/wmswarehousearea") +@RequestMapping("/apiadmin/warehousearea") public class WarehouseAreaRest { @Autowired @@ -25,8 +27,8 @@ public class WarehouseAreaRest { @ApiOperation("分页列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq) { - return wmsWarehouseAreaService.listPage(pq); + public ResultBean> listPage(@RequestBody WarehouseAreaQuery query) { + return wmsWarehouseAreaService.listPage(query.getPage(),query.getQw()); } @ApiOperation("查询所有的库区") @GetMapping("/listAll") diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseAreaTypeRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseAreaTypeRest.java index df4cf7a..8155891 100644 --- a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseAreaTypeRest.java +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseAreaTypeRest.java @@ -1,24 +1,25 @@ package com.yxt.warehouse.apiadmin; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.warehouse.biz.warehouseareatype.WarehouseAreaTypeDto; -import com.yxt.warehouse.biz.warehouseareatype.WarehouseAreaTypeQuery; -import com.yxt.warehouse.biz.warehouseareatype.WarehouseAreaTypeService; -import com.yxt.warehouse.biz.warehouseareatype.WarehouseAreaTypeVo; +import com.yxt.warehouse.biz.warehouseareatype.*; import io.swagger.annotations.Api; 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/18 14:57 */ @Api(tags = "库区类型信息") @RestController -@RequestMapping("/apiadmin/base/wmswarehouseareatype") +@RequestMapping("/apiadmin/warehouseareatype") public class WarehouseAreaTypeRest { @Autowired @@ -26,13 +27,13 @@ public class WarehouseAreaTypeRest { @ApiOperation("分页列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq) { - return wmsWarehouseAreaTypeService.listPage(pq); + public ResultBean> listPage(@RequestBody WarehouseAreaTypeQuery query) { + return wmsWarehouseAreaTypeService.listPage(query.getPage(),query.getQw()); } @ApiOperation("查询所有的") - @GetMapping("/listAll") - public ResultBean listAll() { - return wmsWarehouseAreaTypeService.listAll(); + @GetMapping("/listAll/{useOrgSid}") + public ResultBean> listAll(@PathVariable("useOrgSid") String useOrgSid) { + return wmsWarehouseAreaTypeService.listAll(useOrgSid); } @ApiOperation("保存修改") diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java index e56a811..f22458e 100644 --- a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseInfoRest.java @@ -1,9 +1,12 @@ package com.yxt.warehouse.apiadmin; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.warehouse.biz.warehousearea.WarehouseAreaAllVo; +import com.yxt.warehouse.biz.warehouseareatype.WarehouseAreaType; import com.yxt.warehouse.biz.warehouseinfo.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -18,7 +21,7 @@ import java.util.List; */ @Api(tags = "仓库信息") @RestController -@RequestMapping("/apiadmin/base/wmswarehouseinfo") +@RequestMapping("/apiadmin/warehouseinfo") public class WarehouseInfoRest { @Autowired @@ -26,13 +29,13 @@ public class WarehouseInfoRest { @ApiOperation("分页列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq) { - return wmsWarehouseService.listPage(pq); + public ResultBean> listPage(@RequestBody WarehouseInfoQuery query) { + return wmsWarehouseService.listPage(query.getPage(), query.getQw()); } @ApiOperation("查询所有的仓库") - @GetMapping("/listAll") - public ResultBean listAll() { - return wmsWarehouseService.listAll(); + @GetMapping("/listAll/{useOrgSid}") + public ResultBean> listAll(@PathVariable("useOrgSid") String useOrgSid) { + return wmsWarehouseService.listAll(useOrgSid); } @ApiOperation("保存修改") diff --git a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseRackRest.java b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseRackRest.java index a75f6dc..b0a5835 100644 --- a/src/main/java/com/yxt/warehouse/apiadmin/WarehouseRackRest.java +++ b/src/main/java/com/yxt/warehouse/apiadmin/WarehouseRackRest.java @@ -1,12 +1,11 @@ package com.yxt.warehouse.apiadmin; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.warehouse.biz.warehouserack.WarehouseRackDto; -import com.yxt.warehouse.biz.warehouserack.WarehouseRackQuery; -import com.yxt.warehouse.biz.warehouserack.WarehouseRackService; -import com.yxt.warehouse.biz.warehouserack.WarehouseRackVo; +import com.yxt.warehouse.biz.warehouserack.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -18,7 +17,7 @@ import org.springframework.web.bind.annotation.*; */ @Api(tags = "货架信息") @RestController -@RequestMapping("/apiadmin/base/wmswarehouserack") +@RequestMapping("/apiadmin/warehouserack") public class WarehouseRackRest { @Autowired @@ -26,8 +25,8 @@ public class WarehouseRackRest { @ApiOperation("分页列表") @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq) { - return wmsWarehouseRackService.listPage(pq); + public ResultBean> listPage(@RequestBody WarehouseRackQuery query) { + return wmsWarehouseRackService.listPage(query); } @ApiOperation("查询所有的库区") @GetMapping("/getAllType") diff --git a/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaQuery.java b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaQuery.java index 357d594..bfc439e 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaQuery.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaQuery.java @@ -1,6 +1,9 @@ package com.yxt.warehouse.biz.warehousearea; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -13,4 +16,13 @@ public class WarehouseAreaQuery implements Query { private String code;//编码 private String warehouseSid;//仓库 private String areaTypeSid;//库区类型 + + @ApiModelProperty("菜单路由") + private String menuUrl; + @ApiModelProperty("组织全路径sid") + private String orgPath; + @ApiModelProperty("用户sid") + private String userSid; + private QueryWrapper qw; + private IPage page; } diff --git a/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaService.java b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaService.java index bf97b0e..8f2e58c 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehousearea/WarehouseAreaService.java @@ -11,6 +11,7 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.RequestBody; import java.util.Arrays; import java.util.Date; @@ -25,28 +26,10 @@ import java.util.stream.Collectors; public class WarehouseAreaService extends MybatisBaseService { - public ResultBean> listPage(PagerQuery pq) { + public ResultBean> listPage( IPage page , QueryWrapper qw) { ResultBean rb = ResultBean.fireFail(); - WarehouseAreaQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - if(StringUtils.isNotBlank(query.getName())){ - qw.like("areaName",query.getName()); - } - if(StringUtils.isNotBlank(query.getCode())){ - qw.like("areaCode",query.getCode()); - } - if(StringUtils.isNotBlank(query.getWarehouseSid())){ - qw.eq("b.sid",query.getWarehouseSid()); - } - if(StringUtils.isNotBlank(query.getAreaTypeSid())){ - qw.eq("c.sid",query.getAreaTypeSid()); - } - qw.ne("a.isDelete","1"); - IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.listPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - List records = pagging.getRecords(); - return rb.success().setData(p); + return rb.success().setData(pagging); } public ResultBean getAllType() { ResultBean rb = ResultBean.fireFail(); diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeQuery.java b/src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeQuery.java index 21308e3..802e4ee 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeQuery.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeQuery.java @@ -1,6 +1,9 @@ package com.yxt.warehouse.biz.warehouseareatype; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -10,4 +13,13 @@ import lombok.Data; @Data public class WarehouseAreaTypeQuery implements Query { private String name; + + @ApiModelProperty("菜单路由") + private String menuUrl; + @ApiModelProperty("组织全路径sid") + private String orgPath; + @ApiModelProperty("用户sid") + private String userSid; + private IPage page; + private QueryWrapper qw; } diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeService.java b/src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeService.java index 8f9ae77..b7542dd 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseareatype/WarehouseAreaTypeService.java @@ -11,6 +11,7 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.RequestBody; import java.util.Arrays; import java.util.Date; @@ -25,24 +26,15 @@ import java.util.stream.Collectors; public class WarehouseAreaTypeService extends MybatisBaseService { - public ResultBean> listPage(PagerQuery pq) { + public ResultBean> listPage(IPage page, QueryWrapper qw) { ResultBean rb = ResultBean.fireFail(); - WarehouseAreaTypeQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - if(StringUtils.isNotBlank(query.getName())){ - qw.like("warehouseAreaTypeName",query.getName()); - } - qw.ne("isDelete","1"); - IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.listPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - List records = pagging.getRecords(); - return rb.success().setData(p); + return rb.success().setData(pagging); } - public ResultBean listAll() { + public ResultBean> listAll(String useOrgSid) { ResultBean rb = ResultBean.fireFail(); List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1) - .ne("isDelete","1")); + .ne("isDelete","1").eq("useOrgSid",useOrgSid)); return rb.success().setData(pagging); } diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoQuery.java b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoQuery.java index 91906e4..bdee9b9 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoQuery.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoQuery.java @@ -1,6 +1,9 @@ package com.yxt.warehouse.biz.warehouseinfo; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -12,4 +15,14 @@ public class WarehouseInfoQuery implements Query { private String name; private String code; private String address; + @ApiModelProperty("菜单路由") + private String menuUrl; + @ApiModelProperty("组织全路径sid") + private String orgPath; + @ApiModelProperty("用户sid") + private String userSid; + + private IPage page; + + private QueryWrapper qw; } diff --git a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java index 58a2119..368e8aa 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouseinfo/WarehouseInfoService.java @@ -11,11 +11,13 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.warehouse.biz.warehousearea.WarehouseAreaAllVo; +import com.yxt.warehouse.biz.warehouseareatype.WarehouseAreaType; import com.yxt.warehouse.biz.warehouseextend.WarehouseExtend; import com.yxt.warehouse.biz.warehouseextend.WarehouseExtendService; import com.yxt.warehouse.biz.warehouseextend.WarehouseExtendVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.RequestBody; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -34,30 +36,15 @@ public class WarehouseInfoService extends MybatisBaseService> listPage(PagerQuery pq) { + public ResultBean> listPage(IPage page, QueryWrapper qw) { ResultBean rb = ResultBean.fireFail(); - WarehouseInfoQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - if(StringUtils.isNotBlank(query.getName())){ - qw.like("warehouseName",query.getName()); - } - if(StringUtils.isNotBlank(query.getCode())){ - qw.like("warehouseCode",query.getCode()); - } - if(StringUtils.isNotBlank(query.getAddress())){ - qw.like("address",query.getAddress()); - } - qw.ne("isDelete",1); - qw.orderByDesc("sortNo"); - IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.listPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - List records = pagging.getRecords(); - return rb.success().setData(p); + return rb.success().setData(pagging); } - public ResultBean listAll() { + public ResultBean> listAll(String useOrgSid) { ResultBean rb = ResultBean.fireFail(); - List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1)); + List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1) + .eq("useOrgSid",useOrgSid).eq("isDelete","0")); return rb.success().setData(pagging); } diff --git a/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackQuery.java b/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackQuery.java index 12930a2..21eb99c 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackQuery.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackQuery.java @@ -1,6 +1,9 @@ package com.yxt.warehouse.biz.warehouserack; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -13,4 +16,12 @@ public class WarehouseRackQuery implements Query { private String code;//编码 private String warehouseSid;//仓库 private String areaTypeSid;//库区类型 + @ApiModelProperty("菜单路由") + private String menuUrl; + @ApiModelProperty("组织全路径sid") + private String orgPath; + @ApiModelProperty("用户sid") + private String userSid; + private IPage page; + private QueryWrapper qw; } diff --git a/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackService.java b/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackService.java index 91bf70c..5a4466a 100644 --- a/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackService.java +++ b/src/main/java/com/yxt/warehouse/biz/warehouserack/WarehouseRackService.java @@ -11,6 +11,7 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Service; +import org.springframework.web.bind.annotation.RequestBody; import java.util.Arrays; import java.util.Date; @@ -25,28 +26,10 @@ import java.util.stream.Collectors; public class WarehouseRackService extends MybatisBaseService { - public ResultBean> listPage(PagerQuery pq) { + public ResultBean> listPage(WarehouseRackQuery query) { ResultBean rb = ResultBean.fireFail(); - WarehouseRackQuery query = pq.getParams(); - QueryWrapper qw = new QueryWrapper<>(); - if(StringUtils.isNotBlank(query.getName())){ - qw.like("rackName",query.getName()); - } - if(StringUtils.isNotBlank(query.getCode())){ - qw.like("rackCode",query.getCode()); - } - if(StringUtils.isNotBlank(query.getAreaTypeSid())){ - qw.eq("b.sid",query.getAreaTypeSid()); - } - if(StringUtils.isNotBlank(query.getWarehouseSid())){ - qw.eq("c.sid",query.getWarehouseSid()); - } - qw.ne("a.isDelete","1"); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.listPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - List records = pagging.getRecords(); - return rb.success().setData(p); + IPage pagging = baseMapper.listPage(query.getPage(), query.getQw()); + return rb.success().setData(pagging); } public ResultBean getAllType() { ResultBean rb = ResultBean.fireFail();