防止报错

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

@@ -76,13 +76,13 @@ public class StockService {
             return new ArrayList<>();
         }
         //List<String> shelves = streetService.check(street);
-        List<Stock> stocks = stockMapper.selectList(new QueryWrapper<Stock>().eq("street_id",streetId).orderByAsc("shelve_id", "`row`", "`column`"));
+        List<Stock> stocks = stockMapper.selectList(new QueryWrapper<Stock>().eq("street_id",streetId).orderByAsc("`row`", "`column`"));
         return stocks;
     }
 
     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);
 
     }
@@ -485,16 +485,15 @@ public class StockService {
                 stock.setOveroperationPic(stockLogs.get(0).getPic());
                 stock.setPreoperationPic(stockLogs.get(1).getPic());
             }
-        }
 
-        Street street = streetMapper.selectById(stock.getStreetId());
+            String ip ="http://"+ street.getPlcIp()+":9009/pic/"+stock.getCheckNum();
-        String ip ="http://"+ street.getPlcIp()+":9009/pic/"+stock.getCheckNum();
+            stock.setSidePic1(String.format("%s_1.JPEG",ip));
-        stock.setSidePic1(String.format("%s_1.JPEG",ip));
+            stock.setSidePic2(String.format("%s_5.JPEG",ip));
-        stock.setSidePic2(String.format("%s_5.JPEG",ip));
+            stock.setSidePic3(String.format("%s_6.JPEG",ip));
-        stock.setSidePic3(String.format("%s_6.JPEG",ip));
+            stock.setSidePic4(String.format("%s_4.JPEG",ip));
-        stock.setSidePic4(String.format("%s_4.JPEG",ip));
+            stock.setTopPic1(String.format("%s_2.JPEG",ip));
-        stock.setTopPic1(String.format("%s_2.JPEG",ip));
+            stock.setTopPic2(String.format("%s_3.JPEG",ip));
-        stock.setTopPic2(String.format("%s_3.JPEG",ip));
+        }
 
         return stock;
     }

web/src/main/java/com/zhehekeji/web/service/algorithm/AlgorithmClint.java

@@ -64,6 +64,7 @@ public class AlgorithmClint {
                 charCountMap.put(c, charCountMap.getOrDefault(c, 0) + 1);
             }
 
+            //1002,1002,1002,1002
             // 找出数量最多的字符及其次数
             String mostFrequentChar = null;
             int len = 0;