From 9dfb94433f23b637a4832c38aa50e419e83d4340 Mon Sep 17 00:00:00 2001
From: starrysky <838252223@qq.com>
Date: Sat, 3 Aug 2019 11:18:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=89=80=E6=9C=89=E4=BB=93?=
 =?UTF-8?q?=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/wms/bd/rest/WareHouseController.java   | 14 ++++++++++----
 .../modules/wms/bd/service/WareHouseService.java   |  5 ++++-
 .../wms/bd/service/impl/WareHouseServiceImpl.java  | 11 +++++++++--
 3 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/WareHouseController.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/WareHouseController.java
index 1a675cfe..a9b60afd 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/WareHouseController.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/rest/WareHouseController.java
@@ -4,7 +4,7 @@ import me.zhengjie.aop.log.Log;
 import me.zhengjie.exception.BadRequestException;
 import me.zhengjie.modules.wms.bd.domain.WareHouse;
 import me.zhengjie.modules.wms.bd.service.WareHouseService;
-import me.zhengjie.modules.wms.bd.service.dto.WareHouseDTO;
+import me.zhengjie.modules.wms.bd.service.dto.WareHouseQueryCriteria;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
@@ -48,9 +48,15 @@ public class WareHouseController {
         return new ResponseEntity(HttpStatus.OK);
     }
 
-    @Log("查询仓库")
+    @Log("分页查询仓库")
     @GetMapping(value = "/wareHouse")
-    public ResponseEntity getDicts(WareHouseDTO resources, Pageable pageable){
-        return new ResponseEntity(wareHouseService.queryAll(resources,pageable),HttpStatus.OK);
+    public ResponseEntity getWareHouses(WareHouseQueryCriteria wareHouseQueryCriteria, Pageable pageable){
+        return new ResponseEntity(wareHouseService.queryAll(wareHouseQueryCriteria,pageable),HttpStatus.OK);
+    }
+
+    @Log("查询仓库列表")
+    @GetMapping(value = "/wareHouse/all")
+    public ResponseEntity queryWareHouseList(WareHouseQueryCriteria wareHouseQueryCriteria){
+        return new ResponseEntity(wareHouseService.queryAll(wareHouseQueryCriteria),HttpStatus.OK);
     }
 }
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/WareHouseService.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/WareHouseService.java
index 68755a32..02fed683 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/WareHouseService.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/WareHouseService.java
@@ -2,6 +2,7 @@ package me.zhengjie.modules.wms.bd.service;
 
 import me.zhengjie.modules.wms.bd.domain.WareHouse;
 import me.zhengjie.modules.wms.bd.service.dto.WareHouseDTO;
+import me.zhengjie.modules.wms.bd.service.dto.WareHouseQueryCriteria;
 import org.springframework.data.domain.Pageable;
 
 
@@ -17,6 +18,8 @@ public interface WareHouseService {
 
     void delete(long id);
 
-    Object queryAll(WareHouseDTO wareHouse, Pageable pageable);
+    Object queryAll(WareHouseQueryCriteria wareHouseQueryCriteria, Pageable pageable);
+
+    Object queryAll(WareHouseQueryCriteria wareHouseQueryCriteria);
 
 }
diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/impl/WareHouseServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/impl/WareHouseServiceImpl.java
index bca2ed08..d1995e3c 100644
--- a/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/impl/WareHouseServiceImpl.java
+++ b/eladmin-system/src/main/java/me/zhengjie/modules/wms/bd/service/impl/WareHouseServiceImpl.java
@@ -5,6 +5,7 @@ import me.zhengjie.modules.wms.bd.domain.WareHouse;
 import me.zhengjie.modules.wms.bd.repository.WareHouseRepository;
 import me.zhengjie.modules.wms.bd.service.WareHouseService;
 import me.zhengjie.modules.wms.bd.service.dto.WareHouseDTO;
+import me.zhengjie.modules.wms.bd.service.dto.WareHouseQueryCriteria;
 import me.zhengjie.modules.wms.bd.service.mapper.WareHouseMapper;
 import me.zhengjie.utils.PageUtil;
 import me.zhengjie.utils.QueryHelp;
@@ -71,9 +72,15 @@ public class WareHouseServiceImpl implements WareHouseService {
     }
 
     @Override
-    public Object queryAll(WareHouseDTO wareHouse, Pageable pageable) {
-        Page<WareHouse> page = wareHouseRepository.findAll((root, query, cb) -> QueryHelp.getPredicate(root, wareHouse, cb), pageable);
+    public Object queryAll(WareHouseQueryCriteria wareHouseQueryCriteria, Pageable pageable) {
+        Page<WareHouse> page = wareHouseRepository.findAll((root, query, cb) -> QueryHelp.getPredicate(root, wareHouseQueryCriteria, cb), pageable);
         return PageUtil.toPage(page.map(wareHouseMapper::toDto));
     }
 
+    @Override
+    public Object queryAll(WareHouseQueryCriteria wareHouseQueryCriteria) {
+        List<WareHouse> wareHouseList = wareHouseRepository.findAll((root, query, cb) -> QueryHelp.getPredicate(root, wareHouseQueryCriteria, cb));
+        return wareHouseList;
+    }
+
 }