修改http查看巷道问题

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.setConnectTimeout(10000); // 5 seconds
-        factory.setReadTimeout(5000); // 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.setConnectTimeout(10000); // 5 seconds
-        factory.setReadTimeout(5000); // 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.setConnectTimeout(10000); // 5 seconds
-        factory.setReadTimeout(5000); // 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}";

web/src/main/java/com/zhehekeji/web/service/StockService.java

@@ -79,7 +79,7 @@ public class StockService {
 
     public PageInfo<Stock> page(PageSearch pageSearch) {
         PageHelper.startPage(pageSearch.getPageNum(), pageSearch.getPageSize());
-        List<Stock> stocks = stockMapper.selectList(new QueryWrapper<Stock>().orderByAsc("shelve_id", "`row`", "`column`"));
+        List<Stock> stocks = stockMapper.selectList(new QueryWrapper<Stock>().orderByAsc( "`row`", "`column`"));
         return new PageInfo<>(stocks);
     }