From 0330b89869c655d668d23d035b89268bdd38d6de Mon Sep 17 00:00:00 2001 From: lihongjie0209 Date: Tue, 11 Mar 2025 21:04:00 +0800 Subject: [PATCH] feat(warehouse): update copy method to return boolean and handle multiple IDs --- .../controller/WarehouseController.java | 6 +- .../warehouse/service/WarehouseService.java | 63 +++++++++---------- 2 files changed, 35 insertions(+), 34 deletions(-) diff --git a/src/main/java/cn/lihongjie/coal/warehouse/controller/WarehouseController.java b/src/main/java/cn/lihongjie/coal/warehouse/controller/WarehouseController.java index b1696e6d..ba020ffc 100644 --- a/src/main/java/cn/lihongjie/coal/warehouse/controller/WarehouseController.java +++ b/src/main/java/cn/lihongjie/coal/warehouse/controller/WarehouseController.java @@ -55,8 +55,10 @@ public class WarehouseController { @PostMapping("/copy") - public WarehouseDto copy(@RequestBody IdRequest request) { - return this.service.copy(request); + public Boolean copy(@RequestBody IdRequest request) { + this.service.copy(request); + + return true; } diff --git a/src/main/java/cn/lihongjie/coal/warehouse/service/WarehouseService.java b/src/main/java/cn/lihongjie/coal/warehouse/service/WarehouseService.java index 0cefaa21..f7c07adb 100644 --- a/src/main/java/cn/lihongjie/coal/warehouse/service/WarehouseService.java +++ b/src/main/java/cn/lihongjie/coal/warehouse/service/WarehouseService.java @@ -57,7 +57,6 @@ public class WarehouseService extends BaseService all = + warehouseShelveRepository.findAll( + new Specification() { + @Override + public Predicate toPredicate( + Root root, + CriteriaQuery query, + CriteriaBuilder criteriaBuilder) { - List all = warehouseShelveRepository.findAll(new Specification() { - @Override - public Predicate toPredicate(Root root, CriteriaQuery query, CriteriaBuilder criteriaBuilder) { - - return criteriaBuilder.and( - criteriaBuilder.equal(root.get("warehouse").get("id"), request.getId()) - ); + return criteriaBuilder.and( + criteriaBuilder.equal( + root.get("warehouse").get("id"), + id)); + } + }); + for (WarehouseShelveEntity shelveEntity : all) { + WarehouseShelveEntity copyShelve = new WarehouseShelveEntity(); + BeanUtil.copyProperties(shelveEntity, copyShelve); + copyShelve.setId(null); + copyShelve.setWarehouse(copy); + warehouseShelveRepository.save(copyShelve); } - }); - - - - for (WarehouseShelveEntity shelveEntity : all) { - WarehouseShelveEntity copyShelve = new WarehouseShelveEntity(); - BeanUtil.copyProperties(shelveEntity, copyShelve); - copyShelve.setId(null); - copyShelve.setWarehouse(copy); - warehouseShelveRepository.save(copyShelve); } - - - return this.getById(copy.getId()); - - } + }