From 29ec0e25f6894bf6e1468f93ad545d586824f496 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?= Date: Mon, 23 Dec 2024 09:40:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9http=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E5=B7=B7=E9=81=93=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/zhehekeji/web/service/PlcService.java | 12 ++++++------ .../java/com/zhehekeji/web/service/StockService.java | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/web/src/main/java/com/zhehekeji/web/service/PlcService.java b/web/src/main/java/com/zhehekeji/web/service/PlcService.java index 8f8bf6e..3766e21 100644 --- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java +++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java @@ -819,8 +819,8 @@ public class PlcService { public static AlgorithmPojo sendHttp(Street street,Integer direction , String category ){ // 创建RestTemplate实例 SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory(); - factory.setConnectTimeout(5000); // 5 seconds - factory.setReadTimeout(5000); // 5 seconds + factory.setConnectTimeout(10000); // 5 seconds + factory.setReadTimeout(10000); // 5 seconds RestTemplate restTemplate = new RestTemplate(factory); // 定义请求URL String url = "http://"+street.getPlcIp()+":8097/hik/distinguish?streetNumber={streetNumber}&direction={direction}&category={category}"; @@ -856,8 +856,8 @@ public class PlcService { public static AlgorithmPojo sendHttp(Street street,Integer direction ){ // 创建RestTemplate实例 SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory(); - factory.setConnectTimeout(5000); // 5 seconds - factory.setReadTimeout(5000); // 5 seconds + factory.setConnectTimeout(10000); // 5 seconds + factory.setReadTimeout(10000); // 5 seconds RestTemplate restTemplate = new RestTemplate(factory); // 定义请求URL @@ -894,8 +894,8 @@ public class PlcService { Street street = streetService.getStreetByPlcId(streetNumber); // 创建RestTemplate实例 SimpleClientHttpRequestFactory factory = new SimpleClientHttpRequestFactory(); - factory.setConnectTimeout(5000); // 5 seconds - factory.setReadTimeout(5000); // 5 seconds + factory.setConnectTimeout(10000); // 5 seconds + factory.setReadTimeout(10000); // 5 seconds RestTemplate restTemplate = new RestTemplate(factory); // 定义 URL String url = "http://"+street.getPlcIp()+":8097/category/getBoxCountByCategory?streetId={streetNumber}&category={category}"; diff --git a/web/src/main/java/com/zhehekeji/web/service/StockService.java b/web/src/main/java/com/zhehekeji/web/service/StockService.java index b1c0cb8..d2d6da3 100644 --- a/web/src/main/java/com/zhehekeji/web/service/StockService.java +++ b/web/src/main/java/com/zhehekeji/web/service/StockService.java @@ -79,7 +79,7 @@ public class StockService { public PageInfo page(PageSearch pageSearch) { PageHelper.startPage(pageSearch.getPageNum(), pageSearch.getPageSize()); - List stocks = stockMapper.selectList(new QueryWrapper().orderByAsc("shelve_id", "`row`", "`column`")); + List stocks = stockMapper.selectList(new QueryWrapper().orderByAsc( "`row`", "`column`")); return new PageInfo<>(stocks); }