jidj 5 lat temu
rodzic
commit
638b34f9db

+ 1 - 1
src/main/java/com/chinaitop/HystrixClientFallback.java

@@ -26,7 +26,7 @@ public class HystrixClientFallback implements AgileHouseFeignClient, StorageHous
26
 
26
 
27
 
27
 
28
     @Override
28
     @Override
29
-    public JSONObject getList(HttpServletRequest request, Integer pageNum, Integer pageSize, String houseId, String searchStartDate, String searchEndDate) {
29
+    public JSONObject getNumberList(HttpServletRequest request, Integer pageNum, Integer pageSize) {
30
         logger.info("getList: " + request);
30
         logger.info("getList: " + request);
31
         return null;
31
         return null;
32
     }
32
     }

+ 2 - 4
src/main/java/com/chinaitop/depot/feign/StorageHouseFeignClient.java

@@ -14,8 +14,6 @@ import javax.servlet.http.HttpServletRequest;
14
 public interface StorageHouseFeignClient {
14
 public interface StorageHouseFeignClient {
15
 
15
 
16
 
16
 
17
-    @RequestMapping(value = "/StorageProductFcbgz/getProductList", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
18
-    JSONObject getList(@RequestParam(value = "request")HttpServletRequest request, @RequestParam(value = "pageNum")Integer pageNum, @RequestParam(value = "pageSize")Integer pageSize,
19
-                       @RequestParam(value = "houseId")String houseId, @RequestParam(value = "searchStartDate")String searchStartDate, @RequestParam(value = "searchEndDate")String searchEndDate);
20
-
17
+    @RequestMapping(value = "/StorageProductFcbgz/getNumberList", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
18
+    JSONObject getNumberList(@RequestParam(value = "request")HttpServletRequest request, @RequestParam(value = "pageNum")Integer pageNum, @RequestParam(value = "pageSize")Integer pageSize);
21
 }
19
 }

+ 1 - 1
src/main/java/com/chinaitop/depot/storage/service/impl/StorageQualitycheckServiceImpl.java

@@ -310,7 +310,7 @@ public class StorageQualitycheckServiceImpl implements StorageQualitycheckServic
310
         JSONObject crkobj =  agileHouseFeignClient.getList(1, 10, kcswStr, null);
310
         JSONObject crkobj =  agileHouseFeignClient.getList(1, 10, kcswStr, null);
311
 
311
 
312
         //调用depot-storage接口
312
         //调用depot-storage接口
313
-        JSONObject cpyobj =  storageHouseFeignClient.getList(request,1, 10, null, null, null);
313
+        JSONObject cpyobj =  storageHouseFeignClient.getNumberList(request,1, 10);
314
 
314
 
315
         JSONArray crkJson = crkobj.getJSONArray("list");
315
         JSONArray crkJson = crkobj.getJSONArray("list");
316
         JSONArray cpyJson = cpyobj.getJSONArray("list");
316
         JSONArray cpyJson = cpyobj.getJSONArray("list");